diff --git a/GIS Base Map/Gun Run.qgs b/GIS Base Map/Gun Run.qgs
index 63616bb..e9a608e 100644
--- a/GIS Base Map/Gun Run.qgs	
+++ b/GIS Base Map/Gun Run.qgs	
@@ -19,157 +19,157 @@
   </projectCrs>
   <layer-tree-group>
     <customproperties/>
-    <layer-tree-group name="Marshals" checked="Qt::Unchecked" expanded="0">
+    <layer-tree-group checked="Qt::Unchecked" expanded="1" name="Marshals">
       <customproperties/>
-      <layer-tree-layer name="marshal_positions" checked="Qt::Unchecked" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" providerKey="ogr" expanded="1" source="./marshal_positions.shp|layername=marshal_positions">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="1" name="marshal_positions" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" source="./marshal_positions.shp|layername=marshal_positions" providerKey="ogr">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-layer name="extra_security" checked="Qt::Unchecked" id="extra_security20170921130834191" providerKey="ogr" expanded="1" source="./extra_security.shp">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="1" name="extra_security" id="extra_security20170921130834191" source="./extra_security.shp" providerKey="ogr">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="marshals_by_position" checked="Qt::Unchecked" id="marshals_by_position20161003112326575" providerKey="delimitedtext" expanded="1" source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="1" name="marshals_by_position" id="marshals_by_position20161003112326575" source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" providerKey="delimitedtext">
         <customproperties/>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Fencing and Cones" checked="Qt::Unchecked" expanded="0">
+    <layer-tree-group checked="Qt::Unchecked" expanded="0" name="Fencing and Cones">
       <customproperties/>
-      <layer-tree-layer name="fencing" checked="Qt::Checked" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" expanded="1" source="./fencing.shp|layername=fencing">
+      <layer-tree-layer checked="Qt::Checked" expanded="1" name="fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" source="./fencing.shp|layername=fencing" providerKey="ogr">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-layer name="fence_groups" checked="Qt::Unchecked" id="fence_groups_f376bd8f_41c6_452b_8e99_04d721ae7517" providerKey="virtual" expanded="1" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20fencing%20GROUP%20BY%20%22group%22">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="1" name="fence_groups" id="fence_groups_f376bd8f_41c6_452b_8e99_04d721ae7517" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20fencing%20GROUP%20BY%20%22group%22" providerKey="virtual">
         <customproperties/>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Routes" checked="Qt::Checked" expanded="1">
+    <layer-tree-group checked="Qt::Checked" expanded="1" name="Routes">
       <customproperties/>
-      <layer-tree-layer name="traffic timing labels" checked="Qt::Unchecked" id="m_5da75b14_824c_463d_b7f6_0ae6e9689403" providerKey="memory" expanded="1" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;index=yes&amp;field=Name:string(254,0)&amp;field=Distance:string(10,0)&amp;field=distance:(0,0):string(255,0)&amp;field=display:string(20,0)&amp;uid={84010829-7296-424e-b54e-63b78b9e01b0}">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="1" name="traffic timing labels" id="m_5da75b14_824c_463d_b7f6_0ae6e9689403" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;index=yes&amp;field=Name:string(254,0)&amp;field=Distance:string(10,0)&amp;field=distance:(0,0):string(255,0)&amp;field=display:string(20,0)&amp;uid={0de8d814-0f7d-43ce-9e5d-edc9154a9aa6}" providerKey="memory">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="timelapse" checked="Qt::Unchecked" id="timelapse_55fe61aa_52c4_42b5_a917_d0927767c9d7" providerKey="ogr" expanded="0" source="./timelapse.shp|layername=timelapse">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="0" name="timelapse" id="timelapse_55fe61aa_52c4_42b5_a917_d0927767c9d7" source="./timelapse.shp|layername=timelapse" providerKey="ogr">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-layer name="old timelapse" checked="Qt::Unchecked" id="m_bf4ea117_e806_41bf_b957_69930ecdd71f" providerKey="memory" expanded="0" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:Integer64(10,0)&amp;field=length_m:Real(10,10)&amp;field=length_km:Real(10,10)&amp;field=Source:String(20,0)&amp;field=org_fid:(0,0)&amp;field=distance:(0,0)&amp;field=first_runner:string(10,0)&amp;field=last_runner:string(10,0)&amp;uid={56c8eae5-e03d-4c21-8dd5-4262f15e704f}">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="0" name="old timelapse" id="m_bf4ea117_e806_41bf_b957_69930ecdd71f" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:Integer64(10,0)&amp;field=length_m:Real(10,10)&amp;field=length_km:Real(10,10)&amp;field=Source:String(20,0)&amp;field=org_fid:(0,0)&amp;field=distance:(0,0)&amp;field=first_runner:string(10,0)&amp;field=last_runner:string(10,0)&amp;uid={68416a51-be94-4542-9835-160b61cf68a5}" providerKey="memory">
         <customproperties>
-          <property value="1" key="showFeatureCount"/>
+          <property key="showFeatureCount" value="1"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-group name="Markers" checked="Qt::Checked" expanded="1">
+      <layer-tree-group checked="Qt::Checked" expanded="1" name="Markers">
         <customproperties/>
-        <layer-tree-layer name="route_markers" checked="Qt::Unchecked" id="route_markers_400718de_4c66_4725_81c9_caa6b73d2d82" providerKey="memory" expanded="1" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:Integer64(10,0)&amp;field=length_m:Real(10,10)&amp;field=length_km:Real(10,10)&amp;field=Source:String(20,0)&amp;field=org_fid:(0,0)&amp;field=distance:(0,0)&amp;uid={ead2df6c-8810-4c38-b731-8309e1bffc68}">
+        <layer-tree-layer checked="Qt::Unchecked" expanded="1" name="route_markers" id="route_markers_400718de_4c66_4725_81c9_caa6b73d2d82" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:Integer64(10,0)&amp;field=length_m:Real(10,10)&amp;field=length_km:Real(10,10)&amp;field=Source:String(20,0)&amp;field=org_fid:(0,0)&amp;field=distance:(0,0)&amp;uid={4b090403-4cbd-4b53-9f32-b72aa908e0f0}" providerKey="memory">
           <customproperties>
-            <property value="1" key="showFeatureCount"/>
+            <property key="showFeatureCount" value="1"/>
           </customproperties>
         </layer-tree-layer>
-        <layer-tree-layer name="proposed road markers" checked="Qt::Checked" id="proposed_road_markers_2b454f1d_6ad8_4b91_805f_f503490286b2" providerKey="memory" expanded="1" source="Point?crs=EPSG:4326&amp;uid={07e74641-6f37-4c3c-a793-6ee85d7572ae}">
+        <layer-tree-layer checked="Qt::Checked" expanded="1" name="proposed route markers" id="proposed_route_markers_b3dac0b0_ee05_431b_a89e_52cc9d9162b0" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:Integer64(10,0)&amp;field=length_m:Real(10,10)&amp;field=length_km:Real(10,10)&amp;field=Source:String(20,0)&amp;field=org_fid:(0,0)&amp;field=distance:(0,0)&amp;uid={73b6b412-12c5-4e71-aaaf-88e5e237c6ac}" providerKey="memory">
           <customproperties>
-            <property value="1" key="showFeatureCount"/>
+            <property key="showFeatureCount" value="1"/>
           </customproperties>
         </layer-tree-layer>
-        <layer-tree-layer name="old route_markers" checked="Qt::Unchecked" id="route_markers_5e72fa72_33f5_4bcc_9250_d316da503346" providerKey="memory" expanded="1" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:Integer64(10,0)&amp;field=length_m:Real(10,10)&amp;field=length_km:Real(10,10)&amp;field=Source:String(20,0)&amp;field=org_fid:(0,0)&amp;field=distance:(0,0)&amp;uid={bad88c45-57cd-4fd7-a0c5-7af73fa31b84}">
+        <layer-tree-layer checked="Qt::Unchecked" expanded="1" name="old route_markers" id="route_markers_5e72fa72_33f5_4bcc_9250_d316da503346" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:Integer64(10,0)&amp;field=length_m:Real(10,10)&amp;field=length_km:Real(10,10)&amp;field=Source:String(20,0)&amp;field=org_fid:(0,0)&amp;field=distance:(0,0)&amp;uid={4b0daf5d-5a5b-429a-b647-eb32a9f4febe}" providerKey="memory">
           <customproperties>
-            <property value="1" key="showFeatureCount"/>
+            <property key="showFeatureCount" value="1"/>
           </customproperties>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-layer name="proposed_routes" checked="Qt::Checked" id="proposed_routes_f10ccfbd_1547_42d0_8c19_862e4ffde38b" providerKey="ogr" expanded="1" source="./proposed_routes.shp|layername=proposed_routes">
+      <layer-tree-layer checked="Qt::Checked" expanded="1" name="proposed_routes" id="proposed_routes_f10ccfbd_1547_42d0_8c19_862e4ffde38b" source="./proposed_routes.shp|layername=proposed_routes" providerKey="ogr">
         <customproperties>
-          <property value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" key="expandedLegendNodes"/>
-          <property value="1" key="showFeatureCount"/>
+          <property key="expandedLegendNodes" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
+          <property key="showFeatureCount" value="1"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="all_routes" checked="Qt::Unchecked" id="all_routes20170907054841602" providerKey="ogr" expanded="1" source="./all_routes.shp">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="1" name="all_routes" id="all_routes20170907054841602" source="./all_routes.shp" providerKey="ogr">
         <customproperties>
           <property key="expandedLegendNodes">
             <value>{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}</value>
             <value>{5a375156-c44c-4982-93d6-82ae53deda3e}</value>
           </property>
-          <property value="1" key="overview"/>
-          <property value="0" key="showFeatureCount"/>
+          <property key="overview" value="1"/>
+          <property key="showFeatureCount" value="0"/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Feeding Stations" checked="Qt::Checked" expanded="1">
+    <layer-tree-group checked="Qt::Checked" expanded="1" name="Feeding Stations">
       <customproperties/>
-      <layer-tree-layer name="water_tables" checked="Qt::Checked" id="water_tables20170921142016467" providerKey="ogr" expanded="1" source="./water_tables.shp">
+      <layer-tree-layer checked="Qt::Checked" expanded="1" name="water_tables" id="water_tables20170921142016467" source="./water_tables.shp" providerKey="ogr">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Ask Me" checked="Qt::Unchecked" expanded="0">
+    <layer-tree-group checked="Qt::Unchecked" expanded="0" name="Ask Me">
       <customproperties/>
-      <layer-tree-layer name="poi_labels" checked="Qt::Unchecked" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" providerKey="ogr" expanded="0" source="./poi_labels.shp|layername=poi_labels">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="0" name="poi_labels" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" source="./poi_labels.shp|layername=poi_labels" providerKey="ogr">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-layer name="directions_to_start" checked="Qt::Unchecked" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" providerKey="ogr" expanded="1" source="./directions_to_start.shp|layername=directions_to_start">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="1" name="directions_to_start" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" source="./directions_to_start.shp|layername=directions_to_start" providerKey="ogr">
         <customproperties/>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Residents Access" checked="Qt::Unchecked" expanded="0">
+    <layer-tree-group checked="Qt::Unchecked" expanded="0" name="Residents Access">
       <customproperties/>
-      <layer-tree-layer name="residents_access_roads" checked="Qt::Unchecked" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" providerKey="ogr" expanded="1" source="./residents_access_roads.shp|layername=residents_access_roads">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="1" name="residents_access_roads" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" source="./residents_access_roads.shp|layername=residents_access_roads" providerKey="ogr">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="residents_access" checked="Qt::Unchecked" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" providerKey="ogr" expanded="1" source="./residents_access.shp|layername=residents_access">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="1" name="residents_access" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" source="./residents_access.shp|layername=residents_access" providerKey="ogr">
         <customproperties/>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="OSM data" checked="Qt::Checked" expanded="1">
+    <layer-tree-group checked="Qt::Checked" expanded="1" name="OSM data">
       <customproperties/>
-      <layer-tree-layer name="osm_roads" checked="Qt::Checked" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" providerKey="ogr" expanded="0" source="./osm_roads.shp">
+      <layer-tree-layer checked="Qt::Checked" expanded="0" name="osm_roads" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" source="./osm_roads.shp" providerKey="ogr">
         <customproperties>
           <property key="expandedLegendNodes"/>
-          <property value="1" key="showFeatureCount"/>
+          <property key="showFeatureCount" value="1"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="osm_places" checked="Qt::Checked" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" providerKey="ogr" expanded="1" source="./osm_places.shp|layername=osm_places">
+      <layer-tree-layer checked="Qt::Checked" expanded="1" name="osm_places" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" source="./osm_places.shp|layername=osm_places" providerKey="ogr">
         <customproperties>
           <property key="expandedLegendNodes"/>
-          <property value="1" key="showFeatureCount"/>
+          <property key="showFeatureCount" value="1"/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Marshal pages" checked="Qt::Unchecked" expanded="0">
+    <layer-tree-group checked="Qt::Unchecked" expanded="0" name="Marshal pages">
       <customproperties/>
-      <layer-tree-layer name="marshal overviews" checked="Qt::Unchecked" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" providerKey="ogr" expanded="1" source="./marshal overviews.shp|layername=marshal overviews">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="1" name="marshal overviews" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" source="./marshal overviews.shp|layername=marshal overviews" providerKey="ogr">
         <customproperties/>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Start and Finish pages" checked="Qt::Unchecked" expanded="0">
+    <layer-tree-group checked="Qt::Unchecked" expanded="0" name="Start and Finish pages">
       <customproperties/>
-      <layer-tree-layer name="data-comments" checked="Qt::Checked" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" providerKey="ogr" expanded="1" source="./data-comments.shp">
+      <layer-tree-layer checked="Qt::Checked" expanded="1" name="data-comments" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" source="./data-comments.shp" providerKey="ogr">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="start_finish_area" checked="Qt::Unchecked" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" providerKey="ogr" expanded="1" source="./start_finish_area.shp">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="1" name="start_finish_area" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" source="./start_finish_area.shp" providerKey="ogr">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Elevation" checked="Qt::Unchecked" expanded="0">
+    <layer-tree-group checked="Qt::Unchecked" expanded="0" name="Elevation">
       <customproperties/>
-      <layer-tree-layer name="capetownelevation-1m" checked="Qt::Unchecked" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" providerKey="ogr" expanded="1" source="./capetownelevation-1m.shp">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="1" name="capetownelevation-1m" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" source="./capetownelevation-1m.shp" providerKey="ogr">
         <customproperties>
-          <property value="1" key="showFeatureCount"/>
+          <property key="showFeatureCount" value="1"/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Map" checked="Qt::Checked" expanded="1">
+    <layer-tree-group checked="Qt::Checked" expanded="1" name="Map">
       <customproperties/>
-      <layer-tree-layer name="GDAL-City of Cape Town 2015 Aerial" checked="Qt::Unchecked" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" providerKey="gdal" expanded="1" source="./GDAL-City of Cape Town 2015 Aerial.xml">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="1" name="GDAL-City of Cape Town 2015 Aerial" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" source="./GDAL-City of Cape Town 2015 Aerial.xml" providerKey="gdal">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="Outlines" checked="Qt::Checked" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" providerKey="wms" 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">
+      <layer-tree-layer checked="Qt::Checked" expanded="1" name="Outlines" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" source="contextualWMSLegend=0&amp;crs=EPSG:3857&amp;dpiMode=7&amp;featureCount=10&amp;format=image/png&amp;layers=ciry26ojy003tgynmznkc1a6q&amp;styles=default&amp;tileMatrixSet=GoogleMapsCompatible&amp;url=https://api.mapbox.com/styles/v1/ragtagtag/ciry26ojy003tgynmznkc1a6q/wmts?access_token%3Dpk.eyJ1IjoicmFndGFndGFnIiwiYSI6ImNpcnh3bnowbTAwMDUyemw1enBtbm50bTgifQ.WXKQzAfdJjsuQ6P6-BLZhg%2314.88/-33.91505/18.39137" providerKey="wms">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
@@ -200,44 +200,44 @@
       <item>timelapse_55fe61aa_52c4_42b5_a917_d0927767c9d7</item>
       <item>data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12</item>
       <item>proposed_routes_f10ccfbd_1547_42d0_8c19_862e4ffde38b</item>
-      <item>proposed_road_markers_2b454f1d_6ad8_4b91_805f_f503490286b2</item>
+      <item>proposed_route_markers_b3dac0b0_ee05_431b_a89e_52cc9d9162b0</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings mode="3" unit="1" enabled="1" tolerance="10" type="1" intersection-snapping="1">
+  <snapping-settings type="1" unit="1" mode="3" enabled="0" intersection-snapping="1" tolerance="10">
     <individual-layer-settings>
-      <layer-setting id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" enabled="1" units="1" tolerance="20" type="2"/>
-      <layer-setting id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" enabled="0" units="1" tolerance="12" type="2"/>
-      <layer-setting id="proposed_road_markers_2b454f1d_6ad8_4b91_805f_f503490286b2" enabled="0" units="1" tolerance="12" type="2"/>
-      <layer-setting id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" enabled="0" units="1" tolerance="12" type="2"/>
-      <layer-setting id="fence_groups_f376bd8f_41c6_452b_8e99_04d721ae7517" enabled="0" units="1" tolerance="12" type="2"/>
-      <layer-setting id="route_markers_400718de_4c66_4725_81c9_caa6b73d2d82" enabled="0" units="1" tolerance="12" type="2"/>
-      <layer-setting id="route_markers_5e72fa72_33f5_4bcc_9250_d316da503346" enabled="0" units="1" tolerance="12" type="2"/>
-      <layer-setting id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" enabled="0" units="1" tolerance="12" type="2"/>
-      <layer-setting id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" enabled="0" units="1" tolerance="12" type="2"/>
-      <layer-setting id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" enabled="0" units="1" tolerance="12" type="2"/>
-      <layer-setting id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" enabled="0" units="1" tolerance="12" type="2"/>
-      <layer-setting id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" enabled="0" units="1" tolerance="12" type="2"/>
-      <layer-setting id="m_5da75b14_824c_463d_b7f6_0ae6e9689403" enabled="0" units="1" tolerance="12" type="2"/>
-      <layer-setting id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" enabled="0" units="1" tolerance="12" type="2"/>
-      <layer-setting id="water_tables20170921142016467" enabled="0" units="2" tolerance="0" type="2"/>
-      <layer-setting id="all_routes20170907054841602" enabled="0" units="2" tolerance="0" type="2"/>
-      <layer-setting id="proposed_routes_f10ccfbd_1547_42d0_8c19_862e4ffde38b" enabled="0" units="1" tolerance="12" type="2"/>
-      <layer-setting id="extra_security20170921130834191" enabled="0" units="2" tolerance="0" type="2"/>
-      <layer-setting id="timelapse_55fe61aa_52c4_42b5_a917_d0927767c9d7" enabled="0" units="1" tolerance="12" type="2"/>
-      <layer-setting id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" enabled="0" units="1" tolerance="12" type="2"/>
-      <layer-setting id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" enabled="0" units="1" tolerance="12" type="2"/>
-      <layer-setting id="m_bf4ea117_e806_41bf_b957_69930ecdd71f" enabled="0" units="1" tolerance="12" type="2"/>
-      <layer-setting id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" enabled="0" units="1" tolerance="12" type="2"/>
+      <layer-setting type="2" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" enabled="0" tolerance="12" units="1"/>
+      <layer-setting type="2" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" enabled="0" tolerance="12" units="1"/>
+      <layer-setting type="2" id="extra_security20170921130834191" enabled="0" tolerance="0" units="2"/>
+      <layer-setting type="2" id="all_routes20170907054841602" enabled="0" tolerance="0" units="2"/>
+      <layer-setting type="2" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" enabled="0" tolerance="12" units="1"/>
+      <layer-setting type="2" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" enabled="0" tolerance="12" units="1"/>
+      <layer-setting type="2" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" enabled="0" tolerance="12" units="1"/>
+      <layer-setting type="2" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" enabled="0" tolerance="12" units="1"/>
+      <layer-setting type="2" id="timelapse_55fe61aa_52c4_42b5_a917_d0927767c9d7" enabled="0" tolerance="12" units="1"/>
+      <layer-setting type="2" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" enabled="1" tolerance="20" units="1"/>
+      <layer-setting type="2" id="fence_groups_f376bd8f_41c6_452b_8e99_04d721ae7517" enabled="0" tolerance="12" units="1"/>
+      <layer-setting type="2" id="proposed_route_markers_b3dac0b0_ee05_431b_a89e_52cc9d9162b0" enabled="0" tolerance="12" units="1"/>
+      <layer-setting type="2" id="route_markers_400718de_4c66_4725_81c9_caa6b73d2d82" enabled="0" tolerance="12" units="1"/>
+      <layer-setting type="2" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" enabled="0" tolerance="12" units="1"/>
+      <layer-setting type="2" id="water_tables20170921142016467" enabled="0" tolerance="0" units="2"/>
+      <layer-setting type="2" id="m_bf4ea117_e806_41bf_b957_69930ecdd71f" enabled="0" tolerance="12" units="1"/>
+      <layer-setting type="2" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" enabled="0" tolerance="12" units="1"/>
+      <layer-setting type="2" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" enabled="0" tolerance="12" units="1"/>
+      <layer-setting type="2" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" enabled="0" tolerance="12" units="1"/>
+      <layer-setting type="2" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" enabled="0" tolerance="12" units="1"/>
+      <layer-setting type="2" id="proposed_routes_f10ccfbd_1547_42d0_8c19_862e4ffde38b" enabled="0" tolerance="12" units="1"/>
+      <layer-setting type="2" id="m_5da75b14_824c_463d_b7f6_0ae6e9689403" enabled="0" tolerance="12" units="1"/>
+      <layer-setting type="2" id="route_markers_5e72fa72_33f5_4bcc_9250_d316da503346" enabled="0" tolerance="12" units="1"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
   <mapcanvas name="theMapCanvas" annotationsVisible="1">
     <units>degrees</units>
     <extent>
-      <xmin>18.3745383070555377</xmin>
-      <ymin>-33.94453463403964832</ymin>
-      <xmax>18.42160847632861476</xmax>
-      <ymax>-33.89580312445267651</ymax>
+      <xmin>18.41546373356990074</xmin>
+      <ymin>-33.91060697802408441</ymin>
+      <xmax>18.42723127588813981</xmax>
+      <ymax>-33.8984241006273308</ymax>
     </extent>
     <rotation>0</rotation>
     <destinationsrs>
@@ -257,157 +257,157 @@
   </mapcanvas>
   <projectModels/>
   <legend updateDrawingOrder="true">
-    <legendgroup name="Marshals" checked="Qt::Unchecked" open="false">
-      <legendlayer showFeatureCount="0" name="marshal_positions" checked="Qt::Unchecked" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0"/>
+    <legendgroup open="true" checked="Qt::Unchecked" name="Marshals">
+      <legendlayer open="true" checked="Qt::Unchecked" drawingOrder="-1" name="marshal_positions" showFeatureCount="0">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="0" name="extra_security" checked="Qt::Unchecked" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="extra_security20170921130834191" visible="0"/>
+      <legendlayer open="true" checked="Qt::Unchecked" drawingOrder="-1" name="extra_security" showFeatureCount="0">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="extra_security20170921130834191" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="0" name="marshals_by_position" checked="Qt::Unchecked" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="marshals_by_position20161003112326575" visible="0"/>
+      <legendlayer open="true" checked="Qt::Unchecked" drawingOrder="-1" name="marshals_by_position" showFeatureCount="0">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="marshals_by_position20161003112326575" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Fencing and Cones" checked="Qt::Unchecked" open="false">
-      <legendlayer showFeatureCount="0" name="fencing" checked="Qt::Checked" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0"/>
+    <legendgroup open="false" checked="Qt::Unchecked" name="Fencing and Cones">
+      <legendlayer open="true" checked="Qt::Checked" drawingOrder="-1" name="fencing" showFeatureCount="0">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="0" name="fence_groups" checked="Qt::Unchecked" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="fence_groups_f376bd8f_41c6_452b_8e99_04d721ae7517" visible="0"/>
+      <legendlayer open="true" checked="Qt::Unchecked" drawingOrder="-1" name="fence_groups" showFeatureCount="0">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="fence_groups_f376bd8f_41c6_452b_8e99_04d721ae7517" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Routes" checked="Qt::Checked" open="true">
-      <legendlayer showFeatureCount="0" name="traffic timing labels" checked="Qt::Unchecked" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="m_5da75b14_824c_463d_b7f6_0ae6e9689403" visible="0"/>
+    <legendgroup open="true" checked="Qt::Checked" name="Routes">
+      <legendlayer open="true" checked="Qt::Unchecked" drawingOrder="-1" name="traffic timing labels" showFeatureCount="0">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="m_5da75b14_824c_463d_b7f6_0ae6e9689403" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="0" name="timelapse" checked="Qt::Unchecked" drawingOrder="-1" open="false">
-        <filegroup hidden="false" open="false">
-          <legendlayerfile isInOverview="0" layerid="timelapse_55fe61aa_52c4_42b5_a917_d0927767c9d7" visible="0"/>
+      <legendlayer open="false" checked="Qt::Unchecked" drawingOrder="-1" name="timelapse" showFeatureCount="0">
+        <filegroup open="false" hidden="false">
+          <legendlayerfile layerid="timelapse_55fe61aa_52c4_42b5_a917_d0927767c9d7" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="1" name="old timelapse" checked="Qt::Unchecked" drawingOrder="-1" open="false">
-        <filegroup hidden="false" open="false">
-          <legendlayerfile isInOverview="0" layerid="m_bf4ea117_e806_41bf_b957_69930ecdd71f" visible="0"/>
+      <legendlayer open="false" checked="Qt::Unchecked" drawingOrder="-1" name="old timelapse" showFeatureCount="1">
+        <filegroup open="false" hidden="false">
+          <legendlayerfile layerid="m_bf4ea117_e806_41bf_b957_69930ecdd71f" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendgroup name="Markers" checked="Qt::Checked" open="true">
-        <legendlayer showFeatureCount="1" name="route_markers" checked="Qt::Unchecked" drawingOrder="-1" open="true">
-          <filegroup hidden="false" open="true">
-            <legendlayerfile isInOverview="0" layerid="route_markers_400718de_4c66_4725_81c9_caa6b73d2d82" visible="0"/>
+      <legendgroup open="true" checked="Qt::Checked" name="Markers">
+        <legendlayer open="true" checked="Qt::Unchecked" drawingOrder="-1" name="route_markers" showFeatureCount="1">
+          <filegroup open="true" hidden="false">
+            <legendlayerfile layerid="route_markers_400718de_4c66_4725_81c9_caa6b73d2d82" isInOverview="0" visible="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer showFeatureCount="1" name="proposed road markers" checked="Qt::Checked" drawingOrder="-1" open="true">
-          <filegroup hidden="false" open="true">
-            <legendlayerfile isInOverview="0" layerid="proposed_road_markers_2b454f1d_6ad8_4b91_805f_f503490286b2" visible="1"/>
+        <legendlayer open="true" checked="Qt::Checked" drawingOrder="-1" name="proposed route markers" showFeatureCount="1">
+          <filegroup open="true" hidden="false">
+            <legendlayerfile layerid="proposed_route_markers_b3dac0b0_ee05_431b_a89e_52cc9d9162b0" isInOverview="0" visible="1"/>
           </filegroup>
         </legendlayer>
-        <legendlayer showFeatureCount="1" name="old route_markers" checked="Qt::Unchecked" drawingOrder="-1" open="true">
-          <filegroup hidden="false" open="true">
-            <legendlayerfile isInOverview="0" layerid="route_markers_5e72fa72_33f5_4bcc_9250_d316da503346" visible="0"/>
+        <legendlayer open="true" checked="Qt::Unchecked" drawingOrder="-1" name="old route_markers" showFeatureCount="1">
+          <filegroup open="true" hidden="false">
+            <legendlayerfile layerid="route_markers_5e72fa72_33f5_4bcc_9250_d316da503346" isInOverview="0" visible="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendlayer showFeatureCount="1" name="proposed_routes" checked="Qt::Checked" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="proposed_routes_f10ccfbd_1547_42d0_8c19_862e4ffde38b" visible="1"/>
+      <legendlayer open="true" checked="Qt::Checked" drawingOrder="-1" name="proposed_routes" showFeatureCount="1">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="proposed_routes_f10ccfbd_1547_42d0_8c19_862e4ffde38b" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="0" name="all_routes" checked="Qt::Unchecked" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="1" layerid="all_routes20170907054841602" visible="0"/>
+      <legendlayer open="true" checked="Qt::Unchecked" drawingOrder="-1" name="all_routes" showFeatureCount="0">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="all_routes20170907054841602" isInOverview="1" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Feeding Stations" checked="Qt::Checked" open="true">
-      <legendlayer showFeatureCount="0" name="water_tables" checked="Qt::Checked" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="water_tables20170921142016467" visible="1"/>
+    <legendgroup open="true" checked="Qt::Checked" name="Feeding Stations">
+      <legendlayer open="true" checked="Qt::Checked" drawingOrder="-1" name="water_tables" showFeatureCount="0">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="water_tables20170921142016467" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Ask Me" checked="Qt::Unchecked" open="false">
-      <legendlayer showFeatureCount="0" name="poi_labels" checked="Qt::Unchecked" drawingOrder="-1" open="false">
-        <filegroup hidden="false" open="false">
-          <legendlayerfile isInOverview="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" visible="0"/>
+    <legendgroup open="false" checked="Qt::Unchecked" name="Ask Me">
+      <legendlayer open="false" checked="Qt::Unchecked" drawingOrder="-1" name="poi_labels" showFeatureCount="0">
+        <filegroup open="false" hidden="false">
+          <legendlayerfile layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="0" name="directions_to_start" checked="Qt::Unchecked" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="0"/>
+      <legendlayer open="true" checked="Qt::Unchecked" drawingOrder="-1" name="directions_to_start" showFeatureCount="0">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Residents Access" checked="Qt::Unchecked" open="false">
-      <legendlayer showFeatureCount="0" name="residents_access_roads" checked="Qt::Unchecked" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="0"/>
+    <legendgroup open="false" checked="Qt::Unchecked" name="Residents Access">
+      <legendlayer open="true" checked="Qt::Unchecked" drawingOrder="-1" name="residents_access_roads" showFeatureCount="0">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="0" name="residents_access" checked="Qt::Unchecked" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" visible="0"/>
+      <legendlayer open="true" checked="Qt::Unchecked" drawingOrder="-1" name="residents_access" showFeatureCount="0">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="OSM data" checked="Qt::Checked" open="true">
-      <legendlayer showFeatureCount="1" name="osm_roads" checked="Qt::Checked" drawingOrder="-1" open="false">
-        <filegroup hidden="false" open="false">
-          <legendlayerfile isInOverview="0" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
+    <legendgroup open="true" checked="Qt::Checked" name="OSM data">
+      <legendlayer open="false" checked="Qt::Checked" drawingOrder="-1" name="osm_roads" showFeatureCount="1">
+        <filegroup open="false" hidden="false">
+          <legendlayerfile layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="1" name="osm_places" checked="Qt::Checked" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1"/>
+      <legendlayer open="true" checked="Qt::Checked" drawingOrder="-1" name="osm_places" showFeatureCount="1">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Marshal pages" checked="Qt::Unchecked" open="false">
-      <legendlayer showFeatureCount="0" name="marshal overviews" checked="Qt::Unchecked" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" visible="0"/>
+    <legendgroup open="false" checked="Qt::Unchecked" name="Marshal pages">
+      <legendlayer open="true" checked="Qt::Unchecked" drawingOrder="-1" name="marshal overviews" showFeatureCount="0">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Start and Finish pages" checked="Qt::Unchecked" open="false">
-      <legendlayer showFeatureCount="0" name="data-comments" checked="Qt::Checked" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" visible="0"/>
+    <legendgroup open="false" checked="Qt::Unchecked" name="Start and Finish pages">
+      <legendlayer open="true" checked="Qt::Checked" drawingOrder="-1" name="data-comments" showFeatureCount="0">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="0" name="start_finish_area" checked="Qt::Unchecked" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" visible="0"/>
+      <legendlayer open="true" checked="Qt::Unchecked" drawingOrder="-1" name="start_finish_area" showFeatureCount="0">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Elevation" checked="Qt::Unchecked" open="false">
-      <legendlayer showFeatureCount="1" name="capetownelevation-1m" checked="Qt::Unchecked" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" visible="0"/>
+    <legendgroup open="false" checked="Qt::Unchecked" name="Elevation">
+      <legendlayer open="true" checked="Qt::Unchecked" drawingOrder="-1" name="capetownelevation-1m" showFeatureCount="1">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Map" checked="Qt::Checked" open="true">
-      <legendlayer showFeatureCount="0" name="GDAL-City of Cape Town 2015 Aerial" checked="Qt::Unchecked" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="0"/>
+    <legendgroup open="true" checked="Qt::Checked" name="Map">
+      <legendlayer open="true" checked="Qt::Unchecked" drawingOrder="-1" name="GDAL-City of Cape Town 2015 Aerial" showFeatureCount="0">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="0" name="Outlines" checked="Qt::Checked" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1"/>
+      <legendlayer open="true" checked="Qt::Checked" drawingOrder="-1" name="Outlines" showFeatureCount="0">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
@@ -415,7 +415,7 @@
   <mapViewDocks/>
   <mapViewDocks3D/>
   <projectlayers>
-    <maplayer styleCategories="AllStyleCategories" minScale="1e+08" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" type="raster" autoRefreshTime="0">
+    <maplayer autoRefreshTime="0" maxScale="100000" type="raster" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="1e+08" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories">
       <extent>
         <xmin>-20037508.33999999985098839</xmin>
         <ymin>-20037508.33999999985098839</ymin>
@@ -472,7 +472,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" maxx="0" minz="0" miny="0" crs="" dimensions="2" maxz="0" minx="0"/>
+          <spatial maxy="0" maxz="0" maxx="0" minx="0" minz="0" dimensions="2" crs="" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -496,13 +496,13 @@
         <Searchable>0</Searchable>
       </flags>
       <customproperties>
-        <property value="false" key="WMSBackgroundLayer"/>
-        <property value="false" key="WMSPublishDataSourceUrl"/>
-        <property value="0" key="embeddedWidgets/count"/>
-        <property value="Value" key="identify/format"/>
+        <property key="WMSBackgroundLayer" value="false"/>
+        <property key="WMSPublishDataSourceUrl" value="false"/>
+        <property key="embeddedWidgets/count" value="0"/>
+        <property key="identify/format" value="Value"/>
       </customproperties>
       <pipe>
-        <rasterrenderer alphaBand="-1" opacity="0.75" redBand="1" blueBand="3" greenBand="2" type="multibandcolor">
+        <rasterrenderer greenBand="2" type="multibandcolor" opacity="0.75" blueBand="3" redBand="1" alphaBand="-1">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -513,13 +513,13 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast contrast="0" brightness="0"/>
-        <huesaturation saturation="0" colorizeOn="0" colorizeBlue="128" colorizeGreen="128" colorizeStrength="100" grayscaleMode="0" colorizeRed="255"/>
+        <brightnesscontrast brightness="0" contrast="0"/>
+        <huesaturation saturation="0" grayscaleMode="0" colorizeOn="0" colorizeRed="255" colorizeStrength="100" colorizeBlue="128" colorizeGreen="128"/>
         <rasterresampler maxOversampling="2"/>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer styleCategories="AllStyleCategories" minScale="1e+08" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" type="raster" autoRefreshTime="0">
+    <maplayer autoRefreshTime="0" maxScale="0" type="raster" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="1e+08" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories">
       <extent>
         <xmin>-20037508.34278924390673637</xmin>
         <ymin>-20037508.62692910060286522</ymin>
@@ -576,7 +576,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" maxx="0" minz="0" miny="0" crs="" dimensions="2" maxz="0" minx="0"/>
+          <spatial maxy="0" maxz="0" maxx="0" minx="0" minz="0" dimensions="2" crs="" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -598,13 +598,13 @@
         <Searchable>0</Searchable>
       </flags>
       <customproperties>
-        <property value="true" key="WMSBackgroundLayer"/>
-        <property value="false" key="WMSPublishDataSourceUrl"/>
-        <property value="0" key="embeddedWidgets/count"/>
-        <property value="Undefined" key="identify/format"/>
+        <property key="WMSBackgroundLayer" value="true"/>
+        <property key="WMSPublishDataSourceUrl" value="false"/>
+        <property key="embeddedWidgets/count" value="0"/>
+        <property key="identify/format" value="Undefined"/>
       </customproperties>
       <pipe>
-        <rasterrenderer alphaBand="-1" opacity="0.75" type="singlebandcolordata" band="1">
+        <rasterrenderer type="singlebandcolordata" band="1" opacity="0.75" alphaBand="-1">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -615,13 +615,13 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast contrast="0" brightness="0"/>
-        <huesaturation saturation="0" colorizeOn="0" colorizeBlue="128" colorizeGreen="128" colorizeStrength="100" grayscaleMode="0" colorizeRed="255"/>
+        <brightnesscontrast brightness="0" contrast="0"/>
+        <huesaturation saturation="0" grayscaleMode="0" colorizeOn="0" colorizeRed="255" colorizeStrength="100" colorizeBlue="128" colorizeGreen="128"/>
         <rasterresampler maxOversampling="2"/>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer autoRefreshTime="0" readOnly="0" maxScale="100000" type="vector" minScale="1e+08" simplifyLocal="1" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" geometry="Line" simplifyDrawingHints="0" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" labelsEnabled="0">
+    <maplayer simplifyDrawingTol="1" readOnly="0" maxScale="100000" simplifyLocal="1" simplifyDrawingHints="0" labelsEnabled="0" geometry="Line" type="vector" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" simplifyMaxScale="1" minScale="1e+08" autoRefreshEnabled="0" refreshOnNotifyMessage="" wkbType="MultiLineString">
       <extent>
         <xmin>18.37527226735897301</xmin>
         <ymin>-33.94586066151139647</ymin>
@@ -678,7 +678,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" maxx="0" minz="0" miny="0" crs="" dimensions="2" maxz="0" minx="0"/>
+          <spatial maxy="0" maxz="0" maxx="0" minx="0" minz="0" dimensions="2" crs="" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -702,127 +702,127 @@
         <Removable>0</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" forceraster="0" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" enableorderby="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule symbol="0" label="Active" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone|spac|constr)' )" key="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" description="Only show when active in Atlas" checkstate="0">
-            <rule symbol="1" label="21KM" filter="&quot;Distance&quot; = '21KM'" key="{13a555f1-0140-4584-9ca0-a5c3268249fa}" description="Only show when active in Atlas"/>
-            <rule symbol="2" label="10KM" filter="&quot;Distance&quot; = '10KM'" key="{3047fdca-b9ef-4659-af1a-dbbd7cd48473}" description="Only show when active in Atlas"/>
-            <rule symbol="3" label="5KM" filter="&quot;Distance&quot; = '5KM'" key="{915c5fda-fe09-44ca-bed3-6346c6df4966}" description="Only show when active in Atlas"/>
+          <rule symbol="0" key="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone|spac|constr)' )" checkstate="0" description="Only show when active in Atlas" label="Active">
+            <rule symbol="1" key="{13a555f1-0140-4584-9ca0-a5c3268249fa}" filter="&quot;Distance&quot; = '21KM'" description="Only show when active in Atlas" label="21KM"/>
+            <rule symbol="2" key="{3047fdca-b9ef-4659-af1a-dbbd7cd48473}" filter="&quot;Distance&quot; = '10KM'" description="Only show when active in Atlas" label="10KM"/>
+            <rule symbol="3" key="{915c5fda-fe09-44ca-bed3-6346c6df4966}" filter="&quot;Distance&quot; = '5KM'" description="Only show when active in Atlas" label="5KM"/>
           </rule>
-          <rule label="All Routes" key="{5a375156-c44c-4982-93d6-82ae53deda3e}" description="Only show when active in Atlas" checkstate="0">
-            <rule symbol="4" label="21KM" filter="&quot;Distance&quot; = '21KM'" key="{bdaba96f-7e1b-4d42-b7dd-7e0ac1c340de}" description="Only show when active in Atlas" checkstate="0"/>
-            <rule symbol="5" label="10KM" filter="&quot;Distance&quot; = '10KM'" key="{189f7600-691f-4bc6-a9c0-bc9a9a18e5fa}" description="Only show when active in Atlas" checkstate="0"/>
-            <rule symbol="6" label="5KM" filter="&quot;Distance&quot; = '5KM'" key="{b026320a-2fe6-4a3f-85ba-a22f63a10db1}" description="Only show when active in Atlas" checkstate="0"/>
+          <rule key="{5a375156-c44c-4982-93d6-82ae53deda3e}" checkstate="0" description="Only show when active in Atlas" label="All Routes">
+            <rule symbol="4" key="{bdaba96f-7e1b-4d42-b7dd-7e0ac1c340de}" filter="&quot;Distance&quot; = '21KM'" checkstate="0" description="Only show when active in Atlas" label="21KM"/>
+            <rule symbol="5" key="{189f7600-691f-4bc6-a9c0-bc9a9a18e5fa}" filter="&quot;Distance&quot; = '10KM'" checkstate="0" description="Only show when active in Atlas" label="10KM"/>
+            <rule symbol="6" key="{b026320a-2fe6-4a3f-85ba-a22f63a10db1}" filter="&quot;Distance&quot; = '5KM'" checkstate="0" description="Only show when active in Atlas" label="5KM"/>
           </rule>
         </rules>
         <symbols>
-          <symbol name="0" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.26" 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"/>
+          <symbol type="line" name="0" force_rhr="0" clip_to_extent="1" alpha="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,0,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.26"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" 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"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="250" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+          <symbol type="line" name="1" force_rhr="0" clip_to_extent="1" alpha="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="250"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <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 type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <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 type="Map" name="offsetAlongLine">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@1@0" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="FilledMarker" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="210,32,39,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol type="marker" name="@1@0" force_rhr="0" clip_to_extent="1" alpha="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="210,32,39,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@1@0@0" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-                    <layer enabled="1" pass="0" class="SimpleFill" locked="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="210,32,39,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="227,26,28,0" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol type="fill" name="@@1@0@0" force_rhr="0" clip_to_extent="1" alpha="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="210,32,39,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="227,26,28,0"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -830,212 +830,212 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MapUnit" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="210,32,39,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="MapUnit" 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"/>
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MapUnit"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="210,32,39,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.5"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="lastvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="lastvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@1@2" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="210,32,39,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol type="marker" name="@1@2" force_rhr="0" clip_to_extent="1" alpha="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="210,32,39,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="firstvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="firstvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@1@3" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="210,32,39,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol type="marker" name="@1@3" force_rhr="0" clip_to_extent="1" alpha="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="210,32,39,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="250" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+          <symbol type="line" name="2" force_rhr="0" clip_to_extent="1" alpha="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="250"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <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 type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <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 type="Map" name="offsetAlongLine">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@0" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="FilledMarker" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="103,34,144,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol type="marker" name="@2@0" force_rhr="0" clip_to_extent="1" alpha="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="103,34,144,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@2@0@0" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-                    <layer enabled="1" pass="0" class="SimpleFill" locked="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="103,34,144,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="26,0,201,0" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol type="fill" name="@@2@0@0" force_rhr="0" clip_to_extent="1" alpha="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="103,34,144,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="26,0,201,0"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1043,212 +1043,212 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MapUnit" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="103,34,144,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="MapUnit" 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"/>
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MapUnit"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="103,34,144,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.5"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="lastvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="lastvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@2" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="103,34,144,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol type="marker" name="@2@2" force_rhr="0" clip_to_extent="1" alpha="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="103,34,144,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="Point" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="firstvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="Point"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="firstvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@3" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="103,34,144,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol type="marker" name="@2@3" force_rhr="0" clip_to_extent="1" alpha="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="103,34,144,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="250" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+          <symbol type="line" name="3" force_rhr="0" clip_to_extent="1" alpha="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="250"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <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 type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <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 type="Map" name="offsetAlongLine">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@3@0" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="FilledMarker" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="145,211,55,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol type="marker" name="@3@0" force_rhr="0" clip_to_extent="1" alpha="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="145,211,55,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@3@0@0" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-                    <layer enabled="1" pass="0" class="SimpleFill" locked="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="145,211,55,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="51,160,44,0" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol type="fill" name="@@3@0@0" force_rhr="0" clip_to_extent="1" alpha="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="145,211,55,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="51,160,44,0"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1256,212 +1256,212 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="lastvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="lastvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@3@1" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="145,211,55,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol type="marker" name="@3@1" force_rhr="0" clip_to_extent="1" alpha="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="145,211,55,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="firstvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="firstvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@3@2" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="145,211,55,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol type="marker" name="@3@2" force_rhr="0" clip_to_extent="1" alpha="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="145,211,55,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="145,211,55,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.4" 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"/>
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="145,211,55,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.4"/>
+              <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"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="4" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="Pixel" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="250" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="Pixel" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="Pixel" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+          <symbol type="line" name="4" force_rhr="0" clip_to_extent="1" alpha="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="Pixel"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="250"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="Pixel"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="Pixel"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <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 type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <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 type="Map" name="offsetAlongLine">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@4@0" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="FilledMarker" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="210,32,39,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="Pixel" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="Pixel" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol type="marker" name="@4@0" force_rhr="0" clip_to_extent="1" alpha="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="210,32,39,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="Pixel"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="Pixel"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@4@0@0" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-                    <layer enabled="1" pass="0" class="SimpleFill" locked="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="210,32,39,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="227,26,28,0" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol type="fill" name="@@4@0@0" force_rhr="0" clip_to_extent="1" alpha="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="210,32,39,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="227,26,28,0"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1469,212 +1469,212 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="Pixel" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="210,32,39,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="2" k="line_width"/>
-              <prop v="Pixel" 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="Pixel" 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"/>
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="Pixel"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="210,32,39,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="2"/>
+              <prop k="line_width_unit" v="Pixel"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="Pixel"/>
+              <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"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="Pixel" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="Pixel" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="Pixel" k="offset_unit"/>
-              <prop v="lastvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="Pixel"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="Pixel"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="Pixel"/>
+              <prop k="placement" v="lastvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@4@2" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="210,32,39,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="Pixel" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="Pixel" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="Pixel" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol type="marker" name="@4@2" force_rhr="0" clip_to_extent="1" alpha="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="210,32,39,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="Pixel"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="Pixel"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="Pixel"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="Pixel" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="Pixel" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="Pixel" k="offset_unit"/>
-              <prop v="firstvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="Pixel"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="Pixel"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="Pixel"/>
+              <prop k="placement" v="firstvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@4@3" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="210,32,39,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="Pixel" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="Pixel" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="Pixel" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol type="marker" name="@4@3" force_rhr="0" clip_to_extent="1" alpha="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="210,32,39,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="Pixel"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="Pixel"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="Pixel"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol name="5" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="Pixel" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="250" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="Pixel" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="Pixel" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+          <symbol type="line" name="5" force_rhr="0" clip_to_extent="1" alpha="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="Pixel"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="250"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="Pixel"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="Pixel"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <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 type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <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 type="Map" name="offsetAlongLine">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@5@0" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="FilledMarker" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="103,34,144,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="Pixel" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="Pixel" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol type="marker" name="@5@0" force_rhr="0" clip_to_extent="1" alpha="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="103,34,144,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="Pixel"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="Pixel"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@5@0@0" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-                    <layer enabled="1" pass="0" class="SimpleFill" locked="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="103,34,144,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="26,0,201,0" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol type="fill" name="@@5@0@0" force_rhr="0" clip_to_extent="1" alpha="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="103,34,144,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="26,0,201,0"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1682,212 +1682,212 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="Pixel" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="103,34,144,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="2" k="line_width"/>
-              <prop v="Pixel" 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="Pixel" 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"/>
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="Pixel"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="103,34,144,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="2"/>
+              <prop k="line_width_unit" v="Pixel"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="Pixel"/>
+              <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"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="Pixel" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="Pixel" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="Pixel" k="offset_unit"/>
-              <prop v="lastvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="Pixel"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="Pixel"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="Pixel"/>
+              <prop k="placement" v="lastvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@5@2" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="103,34,144,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="Pixel" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="Pixel" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="Pixel" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol type="marker" name="@5@2" force_rhr="0" clip_to_extent="1" alpha="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="103,34,144,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="Pixel"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="Pixel"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="Pixel"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="Pixel" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="Pixel" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="Pixel" k="offset_unit"/>
-              <prop v="firstvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="Pixel"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="Pixel"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="Pixel"/>
+              <prop k="placement" v="firstvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@5@3" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="103,34,144,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="Pixel" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="Pixel" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="Pixel" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol type="marker" name="@5@3" force_rhr="0" clip_to_extent="1" alpha="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="103,34,144,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="Pixel"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="Pixel"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="Pixel"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol name="6" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="Pixel" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="250" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="Pixel" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="Pixel" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+          <symbol type="line" name="6" force_rhr="0" clip_to_extent="1" alpha="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="Pixel"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="250"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="Pixel"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="Pixel"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <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 type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <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 type="Map" name="offsetAlongLine">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@6@0" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="FilledMarker" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="145,211,55,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="Pixel" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="Pixel" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol type="marker" name="@6@0" force_rhr="0" clip_to_extent="1" alpha="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="145,211,55,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="Pixel"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="Pixel"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@6@0@0" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-                    <layer enabled="1" pass="0" class="SimpleFill" locked="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="145,211,55,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="51,160,44,0" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol type="fill" name="@@6@0@0" force_rhr="0" clip_to_extent="1" alpha="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="145,211,55,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="51,160,44,0"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1895,134 +1895,134 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="Pixel" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="Pixel" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="Pixel" k="offset_unit"/>
-              <prop v="lastvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="Pixel"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="Pixel"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="Pixel"/>
+              <prop k="placement" v="lastvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@6@1" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="145,211,55,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="Pixel" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="Pixel" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="Pixel" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol type="marker" name="@6@1" force_rhr="0" clip_to_extent="1" alpha="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="145,211,55,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="Pixel"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="Pixel"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="Pixel"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="Pixel" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="Pixel" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="Pixel" k="offset_unit"/>
-              <prop v="firstvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="Pixel"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="Pixel"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="Pixel"/>
+              <prop k="placement" v="firstvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@6@2" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="145,211,55,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="Pixel" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="Pixel" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="Pixel" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol type="marker" name="@6@2" force_rhr="0" clip_to_extent="1" alpha="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="145,211,55,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="Pixel"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="Pixel"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="Pixel"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="Pixel" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="145,211,55,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="2" k="line_width"/>
-              <prop v="Pixel" 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="Pixel" 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"/>
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="Pixel"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="145,211,55,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="2"/>
+              <prop k="line_width_unit" v="Pixel"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="Pixel"/>
+              <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"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -2033,26 +2033,26 @@
         </orderby>
       </renderer-v2>
       <customproperties>
-        <property value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="dualview/previewExpressions" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minimumSize="0" opacity="1" penAlpha="255" penColor="#000000" enabled="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeType="MM" diagramOrientation="Up" labelPlacementMethod="XHeight" scaleBasedVisibility="0" width="15" minScaleDenominator="100000" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" barWidth="5" backgroundAlpha="255" lineSizeType="MM" penWidth="0">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory diagramOrientation="Up" minScaleDenominator="100000" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penColor="#000000" backgroundAlpha="255" barWidth="5" backgroundColor="#ffffff" lineSizeType="MM" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" height="15" scaleBasedVisibility="0" minimumSize="0" penAlpha="255" maxScaleDenominator="1e+08" penWidth="0" enabled="0" width="15" rotationOffset="270" opacity="1">
           <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+          <attribute color="#000000" field="" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" priority="0" linePlacementFlags="2" placement="2" showAll="1" dist="0">
+      <DiagramLayerSettings placement="2" priority="0" linePlacementFlags="2" obstacle="0" dist="0" zIndex="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -2065,8 +2065,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -2075,8 +2075,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -2085,8 +2085,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -2095,8 +2095,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -2105,8 +2105,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -2115,8 +2115,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -2125,8 +2125,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -2135,8 +2135,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -2145,8 +2145,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -2155,80 +2155,80 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <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="Distance"/>
-        <alias index="6" name="" field="RouteLen"/>
-        <alias index="7" name="" field="length_m"/>
-        <alias index="8" name="" field="length_km"/>
-        <alias index="9" name="" field="Source"/>
+        <alias name="" field="Name" index="0"/>
+        <alias name="" field="descriptio" index="1"/>
+        <alias name="" field="timestamp" index="2"/>
+        <alias name="" field="begin" index="3"/>
+        <alias name="" field="end" index="4"/>
+        <alias name="" field="Distance" index="5"/>
+        <alias name="" field="RouteLen" index="6"/>
+        <alias name="" field="length_m" index="7"/>
+        <alias name="" field="length_km" index="8"/>
+        <alias name="" field="Source" index="9"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <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="Distance"/>
-        <default expression="" applyOnUpdate="0" field="RouteLen"/>
-        <default expression="" applyOnUpdate="0" field="length_m"/>
-        <default expression="" applyOnUpdate="0" field="length_km"/>
-        <default expression="" applyOnUpdate="0" field="Source"/>
+        <default applyOnUpdate="0" field="Name" expression=""/>
+        <default applyOnUpdate="0" field="descriptio" expression=""/>
+        <default applyOnUpdate="0" field="timestamp" expression=""/>
+        <default applyOnUpdate="0" field="begin" expression=""/>
+        <default applyOnUpdate="0" field="end" expression=""/>
+        <default applyOnUpdate="0" field="Distance" expression=""/>
+        <default applyOnUpdate="0" field="RouteLen" expression=""/>
+        <default applyOnUpdate="0" field="length_m" expression=""/>
+        <default applyOnUpdate="0" field="length_km" expression=""/>
+        <default applyOnUpdate="0" field="Source" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Name"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="descriptio"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="timestamp"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="begin"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="end"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Distance"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="RouteLen"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="length_m"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="length_km"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Source"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="Name"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="descriptio"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="timestamp"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="begin"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="end"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="Distance"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="RouteLen"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="length_m"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="length_km"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="Source"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="Name"/>
-        <constraint desc="" exp="" field="descriptio"/>
-        <constraint desc="" exp="" field="timestamp"/>
-        <constraint desc="" exp="" field="begin"/>
-        <constraint desc="" exp="" field="end"/>
-        <constraint desc="" exp="" field="Distance"/>
-        <constraint desc="" exp="" field="RouteLen"/>
-        <constraint desc="" exp="" field="length_m"/>
-        <constraint desc="" exp="" field="length_km"/>
-        <constraint desc="" exp="" field="Source"/>
+        <constraint desc="" field="Name" exp=""/>
+        <constraint desc="" field="descriptio" exp=""/>
+        <constraint desc="" field="timestamp" exp=""/>
+        <constraint desc="" field="begin" exp=""/>
+        <constraint desc="" field="end" exp=""/>
+        <constraint desc="" field="Distance" exp=""/>
+        <constraint desc="" field="RouteLen" exp=""/>
+        <constraint desc="" field="length_m" exp=""/>
+        <constraint desc="" field="length_km" exp=""/>
+        <constraint desc="" field="Source" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;Name&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;Name&quot;" sortOrder="0">
         <columns>
-          <column name="Name" width="-1" hidden="0" type="field"/>
-          <column name="descriptio" width="-1" hidden="0" type="field"/>
-          <column name="timestamp" width="-1" hidden="0" type="field"/>
-          <column name="begin" width="163" hidden="0" type="field"/>
-          <column name="end" width="-1" hidden="0" type="field"/>
-          <column name="Distance" width="-1" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column name="RouteLen" width="-1" hidden="0" type="field"/>
-          <column name="length_m" width="-1" hidden="0" type="field"/>
-          <column name="length_km" width="-1" hidden="0" type="field"/>
-          <column name="Source" width="-1" hidden="0" type="field"/>
+          <column type="field" name="Name" width="-1" hidden="0"/>
+          <column type="field" name="descriptio" width="-1" hidden="0"/>
+          <column type="field" name="timestamp" width="-1" hidden="0"/>
+          <column type="field" name="begin" width="163" hidden="0"/>
+          <column type="field" name="end" width="-1" hidden="0"/>
+          <column type="field" name="Distance" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="RouteLen" width="-1" hidden="0"/>
+          <column type="field" name="length_m" width="-1" hidden="0"/>
+          <column type="field" name="length_km" width="-1" hidden="0"/>
+          <column type="field" name="Source" width="-1" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -2259,16 +2259,16 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Source"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="end"/>
-        <field editable="1" name="length_km"/>
-        <field editable="1" name="length_m"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="begin" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="length_km" editable="1"/>
+        <field name="length_m" editable="1"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
         <field name="Distance" labelOnTop="0"/>
@@ -2286,7 +2286,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" readOnly="0" maxScale="0" type="vector" minScale="1e+08" simplifyLocal="1" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" geometry="Line" simplifyDrawingHints="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" labelsEnabled="0">
+    <maplayer simplifyDrawingTol="1" readOnly="0" maxScale="0" simplifyLocal="1" simplifyDrawingHints="1" labelsEnabled="0" geometry="Line" type="vector" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" simplifyMaxScale="1" minScale="1e+08" autoRefreshEnabled="0" refreshOnNotifyMessage="" wkbType="MultiLineString">
       <extent>
         <xmin>17.99958333333333371</xmin>
         <ymin>-34.00041666666666629</ymin>
@@ -2350,31 +2350,31 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" forceraster="0" enableorderby="0" type="singleSymbol">
+      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol name="0" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="183,72,75,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.26" 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"/>
+          <symbol type="line" name="0" force_rhr="0" clip_to_extent="1" alpha="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="183,72,75,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.26"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -2415,32 +2415,32 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="ID"/>
-        <alias index="1" name="" field="height"/>
-        <alias index="2" name="" field="elevation"/>
+        <alias name="" field="ID" index="0"/>
+        <alias name="" field="height" index="1"/>
+        <alias name="" field="elevation" index="2"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="ID"/>
-        <default expression="" applyOnUpdate="0" field="height"/>
-        <default expression="" applyOnUpdate="0" field="elevation"/>
+        <default applyOnUpdate="0" field="ID" expression=""/>
+        <default applyOnUpdate="0" field="height" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="ID"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="height"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="elevation"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="ID"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="height"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="elevation"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="ID"/>
-        <constraint desc="" exp="" field="height"/>
-        <constraint desc="" exp="" field="elevation"/>
+        <constraint desc="" field="ID" exp=""/>
+        <constraint desc="" field="height" exp=""/>
+        <constraint desc="" field="elevation" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -2460,7 +2460,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" readOnly="0" maxScale="0" type="vector" minScale="1e+08" simplifyLocal="1" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" geometry="Line" simplifyDrawingHints="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" labelsEnabled="1">
+    <maplayer simplifyDrawingTol="1" readOnly="0" maxScale="0" simplifyLocal="1" simplifyDrawingHints="1" labelsEnabled="1" geometry="Line" type="vector" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" simplifyMaxScale="1" minScale="1e+08" autoRefreshEnabled="0" refreshOnNotifyMessage="" wkbType="MultiLineString">
       <extent>
         <xmin>18.41275838185438474</xmin>
         <ymin>-33.90124710387746632</ymin>
@@ -2517,7 +2517,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" maxx="0" minz="0" miny="0" crs="" dimensions="2" maxz="0" minx="0"/>
+          <spatial maxy="0" maxz="0" maxx="0" minx="0" minz="0" dimensions="2" crs="" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -2541,31 +2541,31 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" forceraster="0" enableorderby="0" type="singleSymbol">
+      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol name="0" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,85,255,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="1" 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"/>
+          <symbol type="line" name="0" force_rhr="0" clip_to_extent="1" alpha="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,85,255,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="1"/>
+              <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"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -2576,45 +2576,45 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" fontSize="10" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="1" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="0" fontStrikeout="0" fieldName="Name" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-            <text-buffer bufferSizeUnits="MM" bufferDraw="1" bufferNoFill="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-            <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeJoinStyle="64" shapeRadiiY="0" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+          <text-style blendMode="0" fontSizeUnit="Point" isExpression="0" textOpacity="1" fontStrikeout="0" useSubstitutions="0" textColor="0,0,0,255" fontSize="10" fontUnderline="0" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fieldName="Name" fontFamily="Myriad Pro" fontLetterSpacing="0" multilineHeight="1" namedStyle="Semibold" fontWeight="63" fontCapitals="0">
+            <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferSize="1" bufferSizeUnits="MM" bufferBlendMode="0" bufferDraw="1" bufferOpacity="1" bufferColor="255,255,255,255"/>
+            <background shapeOffsetX="0" shapeSVGFile="" shapeSizeType="0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeX="0" shapeRotation="0" shapeRadiiUnit="MM" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeOpacity="1" shapeBorderWidthUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeType="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeBorderWidth="0"/>
+            <shadow shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowUnder="0" shadowBlendMode="6"/>
             <substitutions/>
           </text-style>
-          <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-          <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="2" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="LineGeometry" geometryGenerator="" priority="5" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MM" dist="2" maxCurvedCharAngleIn="25" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-          <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="0" displayAll="0" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="0" scaleVisibility="0" obstacleFactor="1" fontMaxPixelSize="10000" obstacleType="0"/>
+          <text-format wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" reverseDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0"/>
+          <placement fitInPolygonOnly="0" repeatDistance="0" placement="2" priority="5" centroidWhole="0" placementFlags="10" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" maxCurvedCharAngleIn="25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" maxCurvedCharAngleOut="-25" xOffset="0" yOffset="0" dist="2" centroidInside="0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" offsetUnits="MM" geometryGeneratorType="LineGeometry" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
+          <rendering scaleVisibility="0" maxNumLabels="2000" fontLimitPixelSize="0" minFeatureSize="0" upsidedownLabels="0" displayAll="0" mergeLines="0" fontMinPixelSize="3" limitNumLabels="0" scaleMin="0" obstacleFactor="1" drawLabels="1" zIndex="0" obstacleType="0" labelPerPart="0" fontMaxPixelSize="10000" scaleMax="0" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </settings>
       </labeling>
       <customproperties>
-        <property value="Name" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="dualview/previewExpressions" value="Name"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minimumSize="0" opacity="1" penAlpha="255" penColor="#000000" enabled="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeType="MM" diagramOrientation="Up" labelPlacementMethod="XHeight" scaleBasedVisibility="0" width="15" minScaleDenominator="0" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" barWidth="5" backgroundAlpha="255" lineSizeType="MM" penWidth="0">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory diagramOrientation="Up" minScaleDenominator="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penColor="#000000" backgroundAlpha="255" barWidth="5" backgroundColor="#ffffff" lineSizeType="MM" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" height="15" scaleBasedVisibility="0" minimumSize="0" penAlpha="255" maxScaleDenominator="1e+08" penWidth="0" enabled="0" width="15" rotationOffset="270" opacity="1">
           <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+          <attribute color="#000000" field="" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" priority="0" linePlacementFlags="18" placement="2" showAll="1" dist="0">
+      <DiagramLayerSettings placement="2" priority="0" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -2639,32 +2639,32 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="Name"/>
+        <alias name="" field="id" index="0"/>
+        <alias name="" field="Name" index="1"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="Name"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="Name" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="id"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Name"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="id"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="Name"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="Name"/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="Name" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column name="id" width="-1" hidden="0" type="field"/>
-          <column name="Name" width="-1" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
+          <column type="field" name="id" width="-1" hidden="0"/>
+          <column type="field" name="Name" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -2695,8 +2695,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="id"/>
+        <field name="Name" editable="1"/>
+        <field name="id" editable="1"/>
       </editable>
       <labelOnTop>
         <field name="Name" labelOnTop="0"/>
@@ -2706,7 +2706,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>Name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" readOnly="0" maxScale="100000" type="vector" minScale="1e+08" simplifyLocal="1" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" geometry="Line" simplifyDrawingHints="0" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" labelsEnabled="0">
+    <maplayer simplifyDrawingTol="1" readOnly="0" maxScale="100000" simplifyLocal="1" simplifyDrawingHints="0" labelsEnabled="0" geometry="Line" type="vector" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" simplifyMaxScale="1" minScale="1e+08" autoRefreshEnabled="0" refreshOnNotifyMessage="" wkbType="MultiLineString">
       <extent>
         <xmin>18.40809079999998588</xmin>
         <ymin>-33.90827185075657724</ymin>
@@ -2770,140 +2770,140 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" forceraster="0" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" enableorderby="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule symbol="0" label="21KM" filter="&quot;distance&quot; = '21KM'" key="{85adf11b-f941-44b6-8847-c828ab845cdc}" description="Only show when active in Atlas"/>
-          <rule symbol="1" label="10KM" filter="&quot;distance&quot; = '10KM'" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" description="Only show when active in Atlas"/>
-          <rule symbol="2" label="5KM" filter="&quot;distance&quot; = '5KM'" key="{cf733f0f-ab72-441e-b213-841aa39c1671}" description="Only show when active in Atlas"/>
+          <rule symbol="0" key="{85adf11b-f941-44b6-8847-c828ab845cdc}" filter="&quot;distance&quot; = '21KM'" description="Only show when active in Atlas" label="21KM"/>
+          <rule symbol="1" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" filter="&quot;distance&quot; = '10KM'" description="Only show when active in Atlas" label="10KM"/>
+          <rule symbol="2" key="{cf733f0f-ab72-441e-b213-841aa39c1671}" filter="&quot;distance&quot; = '5KM'" description="Only show when active in Atlas" label="5KM"/>
         </rules>
         <symbols>
-          <symbol name="0" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="lastvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+          <symbol type="line" name="0" force_rhr="0" clip_to_extent="1" alpha="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="placement" v="lastvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@0@0" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="210,32,39,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="miter" k="joinstyle"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="210,32,39,255" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0.5" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="area" k="scale_method"/>
-                  <prop v="3" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol type="marker" name="@0@0" force_rhr="0" clip_to_extent="1" alpha="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="210,32,39,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="miter"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="210,32,39,255"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0.5"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="area"/>
+                  <prop k="size" v="3"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="250" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MapUnit" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="100" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="250"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MapUnit"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="100"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MapUnit"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@0@1" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="FilledMarker" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="210,32,39,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol type="marker" name="@0@1" force_rhr="0" clip_to_extent="1" alpha="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="210,32,39,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="3"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@0@1@0" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-                    <layer enabled="1" pass="0" class="SimpleFill" locked="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="210,32,39,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="26,0,201,0" k="outline_color"/>
-                      <prop v="no" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol type="fill" name="@@0@1@0" force_rhr="0" clip_to_extent="1" alpha="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="210,32,39,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="26,0,201,0"/>
+                      <prop k="outline_style" v="no"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2911,106 +2911,106 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
-              <prop v="flat" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MapUnit" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="miter" k="joinstyle"/>
-              <prop v="210,32,39,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.75" 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="MapUnit" 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"/>
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
+              <prop k="capstyle" v="flat"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MapUnit"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="miter"/>
+              <prop k="line_color" v="210,32,39,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.75"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="lastvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+          <symbol type="line" name="1" force_rhr="0" clip_to_extent="1" alpha="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="lastvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@1@0" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="FilledMarker" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="103,34,144,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol type="marker" name="@1@0" force_rhr="0" clip_to_extent="1" alpha="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="103,34,144,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="3"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@1@0@0" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-                    <layer enabled="1" pass="0" class="SimpleFill" locked="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="103,34,144,255" k="color"/>
-                      <prop v="miter" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="103,34,144,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0.5" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol type="fill" name="@@1@0@0" force_rhr="0" clip_to_extent="1" alpha="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="103,34,144,255"/>
+                      <prop k="joinstyle" v="miter"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="103,34,144,255"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0.5"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3018,79 +3018,79 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="250" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="100" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="250"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="100"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@1@1" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="FilledMarker" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="103,34,144,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol type="marker" name="@1@1" force_rhr="0" clip_to_extent="1" alpha="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="103,34,144,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="3"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@1@1@0" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-                    <layer enabled="1" pass="0" class="SimpleFill" locked="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="103,34,144,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="26,0,201,0" k="outline_color"/>
-                      <prop v="no" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol type="fill" name="@@1@1@0" force_rhr="0" clip_to_extent="1" alpha="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="103,34,144,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="26,0,201,0"/>
+                      <prop k="outline_style" v="no"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3098,106 +3098,106 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
-              <prop v="flat" 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="miter" k="joinstyle"/>
-              <prop v="103,34,144,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.75" 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"/>
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
+              <prop k="capstyle" v="flat"/>
+              <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="miter"/>
+              <prop k="line_color" v="103,34,144,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.75"/>
+              <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"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MapUnit" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="lastvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+          <symbol type="line" name="2" force_rhr="0" clip_to_extent="1" alpha="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MapUnit"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MapUnit"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="placement" v="lastvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@0" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="FilledMarker" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="69,100,25,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol type="marker" name="@2@0" force_rhr="0" clip_to_extent="1" alpha="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="69,100,25,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="3"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@2@0@0" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-                    <layer enabled="1" pass="0" class="SimpleFill" locked="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="69,100,25,255" k="color"/>
-                      <prop v="miter" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="69,100,25,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0.5" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol type="fill" name="@@2@0@0" force_rhr="0" clip_to_extent="1" alpha="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="69,100,25,255"/>
+                      <prop k="joinstyle" v="miter"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="69,100,25,255"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0.5"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3205,79 +3205,79 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="250" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MapUnit" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="100" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="250"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MapUnit"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="100"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MapUnit"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@1" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="FilledMarker" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="69,100,25,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol type="marker" name="@2@1" force_rhr="0" clip_to_extent="1" alpha="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="69,100,25,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="3"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@2@1@0" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-                    <layer enabled="1" pass="0" class="SimpleFill" locked="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="69,100,25,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="26,0,201,0" k="outline_color"/>
-                      <prop v="no" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol type="fill" name="@@2@1@0" force_rhr="0" clip_to_extent="1" alpha="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="69,100,25,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="26,0,201,0"/>
+                      <prop k="outline_style" v="no"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3285,28 +3285,28 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
-              <prop v="flat" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MapUnit" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="miter" k="joinstyle"/>
-              <prop v="69,100,25,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.75" 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="MapUnit" 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"/>
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
+              <prop k="capstyle" v="flat"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MapUnit"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="miter"/>
+              <prop k="line_color" v="69,100,25,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.75"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -3317,26 +3317,26 @@ def my_form_open(dialog, layer, feature):
         </orderby>
       </renderer-v2>
       <customproperties>
-        <property value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="dualview/previewExpressions" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minimumSize="0" opacity="1" penAlpha="255" penColor="#000000" enabled="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeType="MM" diagramOrientation="Up" labelPlacementMethod="XHeight" scaleBasedVisibility="0" width="15" minScaleDenominator="100000" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" barWidth="5" backgroundAlpha="255" lineSizeType="MM" penWidth="0">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory diagramOrientation="Up" minScaleDenominator="100000" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penColor="#000000" backgroundAlpha="255" barWidth="5" backgroundColor="#ffffff" lineSizeType="MM" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" height="15" scaleBasedVisibility="0" minimumSize="0" penAlpha="255" maxScaleDenominator="1e+08" penWidth="0" enabled="0" width="15" rotationOffset="270" opacity="1">
           <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+          <attribute color="#000000" field="" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" priority="0" linePlacementFlags="2" placement="2" showAll="1" dist="0">
+      <DiagramLayerSettings placement="2" priority="0" linePlacementFlags="2" obstacle="0" dist="0" zIndex="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -3356,40 +3356,40 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="Distance"/>
+        <alias name="" field="id" index="0"/>
+        <alias name="" field="Distance" index="1"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="Distance"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="Distance" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="id"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Distance"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="id"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="Distance"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="Distance"/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="Distance" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;Distance&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;Distance&quot;" sortOrder="0">
         <columns>
-          <column name="Distance" width="-1" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column name="id" width="-1" hidden="0" type="field"/>
+          <column type="field" name="Distance" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="id" width="-1" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3420,17 +3420,17 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Source"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="end"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="length_km"/>
-        <field editable="1" name="length_m"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="begin" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="length_km" editable="1"/>
+        <field name="length_m" editable="1"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
         <field name="Distance" labelOnTop="0"/>
@@ -3449,7 +3449,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" readOnly="0" maxScale="100000" type="vector" minScale="1e+08" simplifyLocal="1" wkbType="Point" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" geometry="Point" simplifyDrawingHints="0" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" labelsEnabled="1">
+    <maplayer simplifyDrawingTol="1" readOnly="0" maxScale="100000" simplifyLocal="1" simplifyDrawingHints="0" labelsEnabled="1" geometry="Point" type="vector" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" simplifyMaxScale="1" minScale="1e+08" autoRefreshEnabled="0" refreshOnNotifyMessage="" wkbType="Point">
       <extent>
         <xmin>18.38517016505928936</xmin>
         <ymin>-33.91987011678683217</ymin>
@@ -3513,39 +3513,39 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" forceraster="0" enableorderby="0" type="singleSymbol">
+      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol name="0" alpha="0.796078" force_rhr="0" clip_to_extent="1" type="marker">
-            <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
-              <prop v="0" k="angle"/>
-              <prop v="227,0,185,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,0" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="1" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol type="marker" name="0" force_rhr="0" clip_to_extent="1" alpha="0.796078">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="227,0,185,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="circle"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="0,0,0,0"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="1"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <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 type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="size">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="expression" value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -3556,89 +3556,89 @@ 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 key="{9ea624c1-7179-4746-8777-84b8008475a1}" filter="'marshal' = attribute( $atlasfeature , 'type' )" description="Show in marshal maps">
             <settings>
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" fontSize="8" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="1" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="0" fontStrikeout="0" fieldName="position" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-                <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="0,0,0,255" shapeType="3" shapeJoinStyle="64" shapeRadiiY="0" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="0" shapeBorderWidth="0.4" shapeSizeY="0.2" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="0.2" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+              <text-style blendMode="0" fontSizeUnit="Point" isExpression="0" textOpacity="1" fontStrikeout="0" useSubstitutions="0" textColor="0,0,0,255" fontSize="8" fontUnderline="0" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fieldName="position" fontFamily="Myriad Pro" fontLetterSpacing="0" multilineHeight="1" namedStyle="Semibold" fontWeight="63" fontCapitals="0">
+                <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferSizeUnits="MM" bufferBlendMode="0" bufferDraw="0" bufferOpacity="1" bufferColor="255,255,255,255"/>
+                <background shapeOffsetX="0" shapeSVGFile="" shapeSizeType="0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeX="0.2" shapeRotation="0" shapeRadiiUnit="MM" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.2" shapeOpacity="1" shapeBorderWidthUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeType="3" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeBorderWidth="0.4"/>
+                <shadow shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowUnder="0" shadowBlendMode="6"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-              <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="1" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="8" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="0" maxCurvedCharAngleIn="20" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-              <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="1" scaleVisibility="0" obstacleFactor="1" fontMaxPixelSize="10000" obstacleType="0"/>
+              <text-format wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" reverseDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0"/>
+              <placement fitInPolygonOnly="0" repeatDistance="0" placement="1" priority="8" centroidWhole="0" placementFlags="10" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" maxCurvedCharAngleOut="-20" xOffset="0" yOffset="0" dist="0" centroidInside="0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
+              <rendering scaleVisibility="0" maxNumLabels="2000" fontLimitPixelSize="0" minFeatureSize="0" upsidedownLabels="0" displayAll="1" mergeLines="0" fontMinPixelSize="3" limitNumLabels="0" scaleMin="1" obstacleFactor="1" drawLabels="1" zIndex="0" obstacleType="0" labelPerPart="0" fontMaxPixelSize="10000" scaleMax="10000000" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="FontStyle" type="Map">
-                      <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 type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="FontStyle">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="ObstacleFactor" type="Map">
-                      <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 type="Map" name="ObstacleFactor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="Priority" type="Map">
-                      <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 type="Map" name="Priority">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <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 type="Map" name="ShapeFillColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="Size" type="Map">
-                      <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 type="Map" name="Size">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="ZIndex" type="Map">
-                      <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 type="Map" name="ZIndex">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </settings>
           </rule>
-          <rule filter="'marshal plan' = attribute( $atlasfeature , 'type' )" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}" description="Show in marshal overview">
+          <rule key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}" filter="'marshal plan' = attribute( $atlasfeature , 'type' )" description="Show in marshal overview">
             <settings>
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="227,0,185,255" fontSize="4" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="0.9" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="0" fontStrikeout="0" fieldName="position" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-                <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="0,0,0,255" shapeType="3" shapeJoinStyle="64" shapeRadiiY="0" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="0" shapeBorderWidth="0.1" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="0.5" shapeSVGFile="" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+              <text-style blendMode="0" fontSizeUnit="Point" isExpression="0" textOpacity="0.9" fontStrikeout="0" useSubstitutions="0" textColor="227,0,185,255" fontSize="4" fontUnderline="0" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fieldName="position" fontFamily="Myriad Pro" fontLetterSpacing="0" multilineHeight="1" namedStyle="Semibold" fontWeight="63" fontCapitals="0">
+                <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferSizeUnits="MM" bufferBlendMode="0" bufferDraw="0" bufferOpacity="1" bufferColor="255,255,255,255"/>
+                <background shapeOffsetX="0" shapeSVGFile="" shapeSizeType="0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeX="0" shapeRotation="0" shapeRadiiUnit="MM" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeOpacity="0.5" shapeBorderWidthUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeType="3" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeBorderWidth="0.1"/>
+                <shadow shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowUnder="0" shadowBlendMode="6"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-              <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="6" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="10" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="1" maxCurvedCharAngleIn="20" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-              <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="2" fontMinPixelSize="3" limitNumLabels="0" obstacle="0" scaleMin="1" scaleVisibility="0" obstacleFactor="1" fontMaxPixelSize="10000" obstacleType="0"/>
+              <text-format wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" reverseDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0"/>
+              <placement fitInPolygonOnly="0" repeatDistance="0" placement="6" priority="10" centroidWhole="0" placementFlags="10" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" maxCurvedCharAngleOut="-20" xOffset="0" yOffset="0" dist="1" centroidInside="0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
+              <rendering scaleVisibility="0" maxNumLabels="2000" fontLimitPixelSize="0" minFeatureSize="0" upsidedownLabels="0" displayAll="1" mergeLines="0" fontMinPixelSize="3" limitNumLabels="0" scaleMin="1" obstacleFactor="1" drawLabels="1" zIndex="2" obstacleType="0" labelPerPart="0" fontMaxPixelSize="10000" scaleMax="10000000" obstacle="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="FontStyle" type="Map">
-                      <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 type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="FontStyle">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <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 type="Map" name="ShapeFillColor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="Size" type="Map">
-                      <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 type="Map" name="Size">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </settings>
@@ -3646,160 +3646,160 @@ def my_form_open(dialog, layer, feature):
         </rules>
       </labeling>
       <customproperties>
-        <property value="0" key="embeddedWidgets/count"/>
-        <property value="false" key="labeling/addDirectionSymbol"/>
-        <property value="0" key="labeling/angleOffset"/>
-        <property value="0" key="labeling/blendMode"/>
-        <property value="0" key="labeling/bufferBlendMode"/>
-        <property value="255" key="labeling/bufferColorA"/>
-        <property value="255" key="labeling/bufferColorB"/>
-        <property value="255" key="labeling/bufferColorG"/>
-        <property value="255" key="labeling/bufferColorR"/>
-        <property value="false" key="labeling/bufferDraw"/>
-        <property value="64" key="labeling/bufferJoinStyle"/>
-        <property value="false" key="labeling/bufferNoFill"/>
-        <property value="1" key="labeling/bufferSize"/>
-        <property value="false" key="labeling/bufferSizeInMapUnits"/>
-        <property value="0,0,0,0,0,0" key="labeling/bufferSizeMapUnitScale"/>
-        <property value="0" key="labeling/bufferTransp"/>
-        <property value="false" key="labeling/centroidInside"/>
-        <property value="false" key="labeling/centroidWhole"/>
-        <property value="3" key="labeling/decimals"/>
-        <property value="false" key="labeling/displayAll"/>
-        <property value="0" key="labeling/dist"/>
-        <property value="false" key="labeling/distInMapUnits"/>
-        <property value="0,0,0,0,0,0" key="labeling/distMapUnitScale"/>
-        <property value="false" key="labeling/drawLabels"/>
-        <property value="false" key="labeling/enabled"/>
-        <property value="position" key="labeling/fieldName"/>
-        <property value="false" key="labeling/fitInPolygonOnly"/>
-        <property value="0" key="labeling/fontCapitals"/>
-        <property value="Myriad Pro" key="labeling/fontFamily"/>
-        <property value="false" key="labeling/fontItalic"/>
-        <property value="0" key="labeling/fontLetterSpacing"/>
-        <property value="false" key="labeling/fontLimitPixelSize"/>
-        <property value="10000" key="labeling/fontMaxPixelSize"/>
-        <property value="3" key="labeling/fontMinPixelSize"/>
-        <property value="10" key="labeling/fontSize"/>
-        <property value="false" key="labeling/fontSizeInMapUnits"/>
-        <property value="0,0,0,0,0,0" key="labeling/fontSizeMapUnitScale"/>
-        <property value="false" key="labeling/fontStrikeout"/>
-        <property value="false" key="labeling/fontUnderline"/>
-        <property value="63" key="labeling/fontWeight"/>
-        <property value="0" key="labeling/fontWordSpacing"/>
-        <property value="false" key="labeling/formatNumbers"/>
-        <property value="false" key="labeling/isExpression"/>
-        <property value="true" key="labeling/labelOffsetInMapUnits"/>
-        <property value="0,0,0,0,0,0" key="labeling/labelOffsetMapUnitScale"/>
-        <property value="false" key="labeling/labelPerPart"/>
-        <property value="&lt;" key="labeling/leftDirectionSymbol"/>
-        <property value="false" key="labeling/limitNumLabels"/>
-        <property value="20" key="labeling/maxCurvedCharAngleIn"/>
-        <property value="-20" key="labeling/maxCurvedCharAngleOut"/>
-        <property value="2000" key="labeling/maxNumLabels"/>
-        <property value="false" key="labeling/mergeLines"/>
-        <property value="0" key="labeling/minFeatureSize"/>
-        <property value="0" key="labeling/multilineAlign"/>
-        <property value="1" key="labeling/multilineHeight"/>
-        <property value="Semibold" key="labeling/namedStyle"/>
-        <property value="true" key="labeling/obstacle"/>
-        <property value="1" key="labeling/obstacleFactor"/>
-        <property value="0" key="labeling/obstacleType"/>
-        <property value="0" key="labeling/offsetType"/>
-        <property value="0" key="labeling/placeDirectionSymbol"/>
-        <property value="0" key="labeling/placement"/>
-        <property value="10" key="labeling/placementFlags"/>
-        <property value="false" key="labeling/plussign"/>
-        <property value="TR,TL,BR,BL,R,L,TSR,BSR" key="labeling/predefinedPositionOrder"/>
-        <property value="true" key="labeling/preserveRotation"/>
-        <property value="#ffffff" key="labeling/previewBkgrdColor"/>
-        <property value="5" key="labeling/priority"/>
-        <property value="4" key="labeling/quadOffset"/>
-        <property value="0" key="labeling/repeatDistance"/>
-        <property value="0,0,0,0,0,0" key="labeling/repeatDistanceMapUnitScale"/>
-        <property value="1" key="labeling/repeatDistanceUnit"/>
-        <property value="false" key="labeling/reverseDirectionSymbol"/>
-        <property value=">" key="labeling/rightDirectionSymbol"/>
-        <property value="10000000" key="labeling/scaleMax"/>
-        <property value="1" key="labeling/scaleMin"/>
-        <property value="false" key="labeling/scaleVisibility"/>
-        <property value="6" key="labeling/shadowBlendMode"/>
-        <property value="0" key="labeling/shadowColorB"/>
-        <property value="0" key="labeling/shadowColorG"/>
-        <property value="0" key="labeling/shadowColorR"/>
-        <property value="false" key="labeling/shadowDraw"/>
-        <property value="135" key="labeling/shadowOffsetAngle"/>
-        <property value="1" key="labeling/shadowOffsetDist"/>
-        <property value="true" key="labeling/shadowOffsetGlobal"/>
-        <property value="0,0,0,0,0,0" key="labeling/shadowOffsetMapUnitScale"/>
-        <property value="1" key="labeling/shadowOffsetUnits"/>
-        <property value="1.5" key="labeling/shadowRadius"/>
-        <property value="false" key="labeling/shadowRadiusAlphaOnly"/>
-        <property value="0,0,0,0,0,0" key="labeling/shadowRadiusMapUnitScale"/>
-        <property value="1" key="labeling/shadowRadiusUnits"/>
-        <property value="100" key="labeling/shadowScale"/>
-        <property value="30" key="labeling/shadowTransparency"/>
-        <property value="0" key="labeling/shadowUnder"/>
-        <property value="0" key="labeling/shapeBlendMode"/>
-        <property value="255" key="labeling/shapeBorderColorA"/>
-        <property value="128" key="labeling/shapeBorderColorB"/>
-        <property value="128" key="labeling/shapeBorderColorG"/>
-        <property value="128" key="labeling/shapeBorderColorR"/>
-        <property value="0" key="labeling/shapeBorderWidth"/>
-        <property value="0,0,0,0,0,0" key="labeling/shapeBorderWidthMapUnitScale"/>
-        <property value="1" key="labeling/shapeBorderWidthUnits"/>
-        <property value="true" key="labeling/shapeDraw"/>
-        <property value="255" key="labeling/shapeFillColorA"/>
-        <property value="138" key="labeling/shapeFillColorB"/>
-        <property value="0" key="labeling/shapeFillColorG"/>
-        <property value="101" key="labeling/shapeFillColorR"/>
-        <property value="64" key="labeling/shapeJoinStyle"/>
-        <property value="0,0,0,0,0,0" key="labeling/shapeOffsetMapUnitScale"/>
-        <property value="1" key="labeling/shapeOffsetUnits"/>
-        <property value="0" key="labeling/shapeOffsetX"/>
-        <property value="0" key="labeling/shapeOffsetY"/>
-        <property value="0,0,0,0,0,0" key="labeling/shapeRadiiMapUnitScale"/>
-        <property value="1" key="labeling/shapeRadiiUnits"/>
-        <property value="0" key="labeling/shapeRadiiX"/>
-        <property value="0" key="labeling/shapeRadiiY"/>
-        <property value="0" key="labeling/shapeRotation"/>
-        <property value="0" key="labeling/shapeRotationType"/>
-        <property value="" key="labeling/shapeSVGFile"/>
-        <property value="0,0,0,0,0,0" key="labeling/shapeSizeMapUnitScale"/>
-        <property value="0" key="labeling/shapeSizeType"/>
-        <property value="1" key="labeling/shapeSizeUnits"/>
-        <property value="0" key="labeling/shapeSizeX"/>
-        <property value="0" key="labeling/shapeSizeY"/>
-        <property value="0" key="labeling/shapeTransparency"/>
-        <property value="0" key="labeling/shapeType"/>
-        <property value="255" key="labeling/textColorA"/>
-        <property value="255" key="labeling/textColorB"/>
-        <property value="255" key="labeling/textColorG"/>
-        <property value="255" key="labeling/textColorR"/>
-        <property value="0" key="labeling/textTransp"/>
-        <property value="0" key="labeling/upsidedownLabels"/>
-        <property value="" key="labeling/wrapChar"/>
-        <property value="0" key="labeling/xOffset"/>
-        <property value="0" key="labeling/yOffset"/>
-        <property value="0" key="labeling/zIndex"/>
+        <property key="embeddedWidgets/count" value="0"/>
+        <property key="labeling/addDirectionSymbol" value="false"/>
+        <property key="labeling/angleOffset" value="0"/>
+        <property key="labeling/blendMode" value="0"/>
+        <property key="labeling/bufferBlendMode" value="0"/>
+        <property key="labeling/bufferColorA" value="255"/>
+        <property key="labeling/bufferColorB" value="255"/>
+        <property key="labeling/bufferColorG" value="255"/>
+        <property key="labeling/bufferColorR" value="255"/>
+        <property key="labeling/bufferDraw" value="false"/>
+        <property key="labeling/bufferJoinStyle" value="64"/>
+        <property key="labeling/bufferNoFill" value="false"/>
+        <property key="labeling/bufferSize" value="1"/>
+        <property key="labeling/bufferSizeInMapUnits" value="false"/>
+        <property key="labeling/bufferSizeMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/bufferTransp" value="0"/>
+        <property key="labeling/centroidInside" value="false"/>
+        <property key="labeling/centroidWhole" value="false"/>
+        <property key="labeling/decimals" value="3"/>
+        <property key="labeling/displayAll" value="false"/>
+        <property key="labeling/dist" value="0"/>
+        <property key="labeling/distInMapUnits" value="false"/>
+        <property key="labeling/distMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/drawLabels" value="false"/>
+        <property key="labeling/enabled" value="false"/>
+        <property key="labeling/fieldName" value="position"/>
+        <property key="labeling/fitInPolygonOnly" value="false"/>
+        <property key="labeling/fontCapitals" value="0"/>
+        <property key="labeling/fontFamily" value="Myriad Pro"/>
+        <property key="labeling/fontItalic" value="false"/>
+        <property key="labeling/fontLetterSpacing" value="0"/>
+        <property key="labeling/fontLimitPixelSize" value="false"/>
+        <property key="labeling/fontMaxPixelSize" value="10000"/>
+        <property key="labeling/fontMinPixelSize" value="3"/>
+        <property key="labeling/fontSize" value="10"/>
+        <property key="labeling/fontSizeInMapUnits" value="false"/>
+        <property key="labeling/fontSizeMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/fontStrikeout" value="false"/>
+        <property key="labeling/fontUnderline" value="false"/>
+        <property key="labeling/fontWeight" value="63"/>
+        <property key="labeling/fontWordSpacing" value="0"/>
+        <property key="labeling/formatNumbers" value="false"/>
+        <property key="labeling/isExpression" value="false"/>
+        <property key="labeling/labelOffsetInMapUnits" value="true"/>
+        <property key="labeling/labelOffsetMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/labelPerPart" value="false"/>
+        <property key="labeling/leftDirectionSymbol" value="&lt;"/>
+        <property key="labeling/limitNumLabels" value="false"/>
+        <property key="labeling/maxCurvedCharAngleIn" value="20"/>
+        <property key="labeling/maxCurvedCharAngleOut" value="-20"/>
+        <property key="labeling/maxNumLabels" value="2000"/>
+        <property key="labeling/mergeLines" value="false"/>
+        <property key="labeling/minFeatureSize" value="0"/>
+        <property key="labeling/multilineAlign" value="0"/>
+        <property key="labeling/multilineHeight" value="1"/>
+        <property key="labeling/namedStyle" value="Semibold"/>
+        <property key="labeling/obstacle" value="true"/>
+        <property key="labeling/obstacleFactor" value="1"/>
+        <property key="labeling/obstacleType" value="0"/>
+        <property key="labeling/offsetType" value="0"/>
+        <property key="labeling/placeDirectionSymbol" value="0"/>
+        <property key="labeling/placement" value="0"/>
+        <property key="labeling/placementFlags" value="10"/>
+        <property key="labeling/plussign" value="false"/>
+        <property key="labeling/predefinedPositionOrder" value="TR,TL,BR,BL,R,L,TSR,BSR"/>
+        <property key="labeling/preserveRotation" value="true"/>
+        <property key="labeling/previewBkgrdColor" value="#ffffff"/>
+        <property key="labeling/priority" value="5"/>
+        <property key="labeling/quadOffset" value="4"/>
+        <property key="labeling/repeatDistance" value="0"/>
+        <property key="labeling/repeatDistanceMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/repeatDistanceUnit" value="1"/>
+        <property key="labeling/reverseDirectionSymbol" value="false"/>
+        <property key="labeling/rightDirectionSymbol" value=">"/>
+        <property key="labeling/scaleMax" value="10000000"/>
+        <property key="labeling/scaleMin" value="1"/>
+        <property key="labeling/scaleVisibility" value="false"/>
+        <property key="labeling/shadowBlendMode" value="6"/>
+        <property key="labeling/shadowColorB" value="0"/>
+        <property key="labeling/shadowColorG" value="0"/>
+        <property key="labeling/shadowColorR" value="0"/>
+        <property key="labeling/shadowDraw" value="false"/>
+        <property key="labeling/shadowOffsetAngle" value="135"/>
+        <property key="labeling/shadowOffsetDist" value="1"/>
+        <property key="labeling/shadowOffsetGlobal" value="true"/>
+        <property key="labeling/shadowOffsetMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/shadowOffsetUnits" value="1"/>
+        <property key="labeling/shadowRadius" value="1.5"/>
+        <property key="labeling/shadowRadiusAlphaOnly" value="false"/>
+        <property key="labeling/shadowRadiusMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/shadowRadiusUnits" value="1"/>
+        <property key="labeling/shadowScale" value="100"/>
+        <property key="labeling/shadowTransparency" value="30"/>
+        <property key="labeling/shadowUnder" value="0"/>
+        <property key="labeling/shapeBlendMode" value="0"/>
+        <property key="labeling/shapeBorderColorA" value="255"/>
+        <property key="labeling/shapeBorderColorB" value="128"/>
+        <property key="labeling/shapeBorderColorG" value="128"/>
+        <property key="labeling/shapeBorderColorR" value="128"/>
+        <property key="labeling/shapeBorderWidth" value="0"/>
+        <property key="labeling/shapeBorderWidthMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/shapeBorderWidthUnits" value="1"/>
+        <property key="labeling/shapeDraw" value="true"/>
+        <property key="labeling/shapeFillColorA" value="255"/>
+        <property key="labeling/shapeFillColorB" value="138"/>
+        <property key="labeling/shapeFillColorG" value="0"/>
+        <property key="labeling/shapeFillColorR" value="101"/>
+        <property key="labeling/shapeJoinStyle" value="64"/>
+        <property key="labeling/shapeOffsetMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/shapeOffsetUnits" value="1"/>
+        <property key="labeling/shapeOffsetX" value="0"/>
+        <property key="labeling/shapeOffsetY" value="0"/>
+        <property key="labeling/shapeRadiiMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/shapeRadiiUnits" value="1"/>
+        <property key="labeling/shapeRadiiX" value="0"/>
+        <property key="labeling/shapeRadiiY" value="0"/>
+        <property key="labeling/shapeRotation" value="0"/>
+        <property key="labeling/shapeRotationType" value="0"/>
+        <property key="labeling/shapeSVGFile" value=""/>
+        <property key="labeling/shapeSizeMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/shapeSizeType" value="0"/>
+        <property key="labeling/shapeSizeUnits" value="1"/>
+        <property key="labeling/shapeSizeX" value="0"/>
+        <property key="labeling/shapeSizeY" value="0"/>
+        <property key="labeling/shapeTransparency" value="0"/>
+        <property key="labeling/shapeType" value="0"/>
+        <property key="labeling/textColorA" value="255"/>
+        <property key="labeling/textColorB" value="255"/>
+        <property key="labeling/textColorG" value="255"/>
+        <property key="labeling/textColorR" value="255"/>
+        <property key="labeling/textTransp" value="0"/>
+        <property key="labeling/upsidedownLabels" value="0"/>
+        <property key="labeling/wrapChar" value=""/>
+        <property key="labeling/xOffset" value="0"/>
+        <property key="labeling/yOffset" value="0"/>
+        <property key="labeling/zIndex" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minimumSize="0" opacity="1" penAlpha="255" penColor="#000000" enabled="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeType="MM" diagramOrientation="Up" labelPlacementMethod="XHeight" scaleBasedVisibility="0" width="15" minScaleDenominator="100000" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" barWidth="5" backgroundAlpha="255" lineSizeType="MM" penWidth="0">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory diagramOrientation="Up" minScaleDenominator="100000" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penColor="#000000" backgroundAlpha="255" barWidth="5" backgroundColor="#ffffff" lineSizeType="MM" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" height="15" scaleBasedVisibility="0" minimumSize="0" penAlpha="255" maxScaleDenominator="1e+08" penWidth="0" enabled="0" width="15" rotationOffset="270" opacity="1">
           <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+          <attribute color="#000000" field="" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" priority="0" linePlacementFlags="10" placement="0" showAll="1" dist="0">
+      <DiagramLayerSettings placement="0" priority="0" linePlacementFlags="10" obstacle="0" dist="0" zIndex="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -3812,8 +3812,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -3822,8 +3822,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -3832,45 +3832,45 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="position"/>
-        <alias index="2" name="" field="type"/>
+        <alias name="" field="id" index="0"/>
+        <alias name="" field="position" index="1"/>
+        <alias name="" field="type" index="2"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="position"/>
-        <default expression="" applyOnUpdate="0" field="type"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="position" expression=""/>
+        <default applyOnUpdate="0" field="type" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="id"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="position"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="type"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="id"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="position"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="type"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="position"/>
-        <constraint desc="" exp="" field="type"/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="position" exp=""/>
+        <constraint desc="" field="type" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;position&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;position&quot;" sortOrder="0">
         <columns>
-          <column name="id" width="-1" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column name="position" width="-1" hidden="0" type="field"/>
-          <column name="type" width="-1" hidden="0" type="field"/>
+          <column type="field" name="id" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="position" width="-1" hidden="0"/>
+          <column type="field" name="type" width="-1" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3943,7 +3943,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" readOnly="0" maxScale="0" type="vector" minScale="1e+08" simplifyLocal="1" wkbType="Polygon" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" geometry="Polygon" simplifyDrawingHints="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" labelsEnabled="0">
+    <maplayer simplifyDrawingTol="1" readOnly="0" maxScale="0" simplifyLocal="1" simplifyDrawingHints="1" labelsEnabled="0" geometry="Polygon" type="vector" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" simplifyMaxScale="1" minScale="1e+08" autoRefreshEnabled="0" refreshOnNotifyMessage="" wkbType="Polygon">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94583431338720203</ymin>
@@ -4009,26 +4009,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" forceraster="0" enableorderby="0" type="singleSymbol">
+      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol name="0" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-            <layer enabled="1" pass="0" class="SimpleFill" locked="0">
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="56,128,54,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="56,128,54,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="f_diagonal" k="style"/>
+          <symbol type="fill" name="0" force_rhr="0" clip_to_extent="1" alpha="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="color" v="56,128,54,255"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="56,128,54,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0.2"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="style" v="f_diagonal"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -4038,26 +4038,26 @@ def my_form_open(dialog, layer, feature):
         <sizescale/>
       </renderer-v2>
       <customproperties>
-        <property value="name" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="dualview/previewExpressions" value="name"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minimumSize="0" opacity="1" penAlpha="255" penColor="#000000" enabled="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeType="MM" diagramOrientation="Up" labelPlacementMethod="XHeight" scaleBasedVisibility="0" width="15" minScaleDenominator="0" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" barWidth="5" backgroundAlpha="255" lineSizeType="MM" penWidth="0">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory diagramOrientation="Up" minScaleDenominator="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penColor="#000000" backgroundAlpha="255" barWidth="5" backgroundColor="#ffffff" lineSizeType="MM" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" height="15" scaleBasedVisibility="0" minimumSize="0" penAlpha="255" maxScaleDenominator="1e+08" penWidth="0" enabled="0" width="15" rotationOffset="270" opacity="1">
           <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+          <attribute color="#000000" field="" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" priority="0" linePlacementFlags="18" placement="1" showAll="1" dist="0">
+      <DiagramLayerSettings placement="1" priority="0" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -4117,57 +4117,57 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <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 name="" field="id" index="0"/>
+        <alias name="" field="group" index="1"/>
+        <alias name="" field="comment" index="2"/>
+        <alias name="" field="moveable" index="3"/>
+        <alias name="" field="type" index="4"/>
+        <alias name="" field="name" index="5"/>
+        <alias name="" field="hidden" index="6"/>
       </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 applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="group" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="moveable" expression=""/>
+        <default applyOnUpdate="0" field="type" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="hidden" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="id"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="group"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="comment"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="moveable"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="type"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="name"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="hidden"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="id"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="group"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="comment"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="moveable"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="type"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="name"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="hidden"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="group"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="moveable"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="hidden"/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="group" exp=""/>
+        <constraint desc="" field="comment" exp=""/>
+        <constraint desc="" field="moveable" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="name" exp=""/>
+        <constraint desc="" field="hidden" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;group&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;group&quot;" sortOrder="0">
         <columns>
-          <column width="-1" hidden="1" type="actions"/>
-          <column name="group" width="-1" hidden="0" type="field"/>
-          <column name="name" width="-1" hidden="0" type="field"/>
-          <column name="id" width="-1" hidden="0" type="field"/>
-          <column name="comment" width="-1" hidden="0" type="field"/>
-          <column name="moveable" width="-1" hidden="0" type="field"/>
-          <column name="type" width="-1" hidden="0" type="field"/>
-          <column name="hidden" width="-1" hidden="0" type="field"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="group" width="-1" hidden="0"/>
+          <column type="field" name="name" width="-1" hidden="0"/>
+          <column type="field" name="id" width="-1" hidden="0"/>
+          <column type="field" name="comment" width="-1" hidden="0"/>
+          <column type="field" name="moveable" width="-1" hidden="0"/>
+          <column type="field" name="type" width="-1" hidden="0"/>
+          <column type="field" name="hidden" width="-1" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -4198,13 +4198,13 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="comment"/>
-        <field editable="1" name="group"/>
-        <field editable="1" name="hidden"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="moveable"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="type"/>
+        <field name="comment" editable="1"/>
+        <field name="group" editable="1"/>
+        <field name="hidden" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="moveable" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
         <field name="comment" labelOnTop="0"/>
@@ -4219,7 +4219,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" readOnly="0" maxScale="0" type="vector" minScale="1e+08" simplifyLocal="1" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" geometry="Line" simplifyDrawingHints="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" labelsEnabled="1">
+    <maplayer simplifyDrawingTol="1" readOnly="0" maxScale="0" simplifyLocal="1" simplifyDrawingHints="1" labelsEnabled="1" geometry="Line" type="vector" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" simplifyMaxScale="1" minScale="1e+08" autoRefreshEnabled="0" refreshOnNotifyMessage="" wkbType="MultiLineString">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94583431338720203</ymin>
@@ -4276,7 +4276,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" maxx="0" minz="0" miny="0" crs="" dimensions="2" maxz="0" minx="0"/>
+          <spatial maxy="0" maxz="0" maxx="0" minx="0" minz="0" dimensions="2" crs="" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -4300,170 +4300,170 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="1" forceraster="0" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="1" enableorderby="0">
         <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-          <rule symbol="0" label="Cones" filter="regexp_match(&quot;type&quot;, '^cone')" key="{b3b38ee9-c245-4839-b078-3b966a2a5c4e}"/>
-          <rule symbol="1" label="Moveable fences" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1'" key="{9da1c54c-0ca9-4db9-a722-ce3f53ccd358}"/>
-          <rule symbol="2" label="Fixed fences" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1'" key="{bb4463e8-e33a-4475-878c-fd2d7b636418}"/>
-          <rule symbol="3" label="Construction" filter="regexp_match(&quot;type&quot;, '^constr')" key="{bb4463e8-e33a-4475-878c-fd2d7b636418}"/>
-          <rule symbol="4" label="Visible" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}"/>
+          <rule symbol="0" key="{b3b38ee9-c245-4839-b078-3b966a2a5c4e}" filter="regexp_match(&quot;type&quot;, '^cone')" label="Cones"/>
+          <rule symbol="1" key="{9da1c54c-0ca9-4db9-a722-ce3f53ccd358}" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1'" label="Moveable fences"/>
+          <rule symbol="2" key="{bb4463e8-e33a-4475-878c-fd2d7b636418}" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1'" label="Fixed fences"/>
+          <rule symbol="3" key="{bb4463e8-e33a-4475-878c-fd2d7b636418}" filter="regexp_match(&quot;type&quot;, '^constr')" label="Construction"/>
+          <rule symbol="4" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" label="Visible"/>
         </rules>
         <symbols>
-          <symbol name="0" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
-              <prop v="round" k="capstyle"/>
-              <prop v="1;4" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="Point" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="round" k="joinstyle"/>
-              <prop v="255,255,0,255" k="line_color"/>
-              <prop v="dot" k="line_style"/>
-              <prop v="1" 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="1" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol type="line" name="0" force_rhr="0" clip_to_extent="1" alpha="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
+              <prop k="capstyle" v="round"/>
+              <prop k="customdash" v="1;4"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="Point"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="round"/>
+              <prop k="line_color" v="255,255,0,255"/>
+              <prop k="line_style" v="dot"/>
+              <prop k="line_width" v="1"/>
+              <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="1"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#64ffff00', '#ffffff00' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#64ffff00', '#ffffff00' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
-              <prop v="round" k="capstyle"/>
-              <prop v="4;3" 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="round" k="joinstyle"/>
-              <prop v="255,255,0,255" k="line_color"/>
-              <prop v="dash" k="line_style"/>
-              <prop v="0.8" 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"/>
+          <symbol type="line" name="1" force_rhr="0" clip_to_extent="1" alpha="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
+              <prop k="capstyle" v="round"/>
+              <prop k="customdash" v="4;3"/>
+              <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="round"/>
+              <prop k="line_color" v="255,255,0,255"/>
+              <prop k="line_style" v="dash"/>
+              <prop k="line_width" v="0.8"/>
+              <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"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#64ffff00', '#ffffff00' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#64ffff00', '#ffffff00' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <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.8" 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"/>
+          <symbol type="line" name="2" force_rhr="0" clip_to_extent="1" alpha="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="255,255,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.8"/>
+              <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"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#64ffff00', '#ffffff00' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#64ffff00', '#ffffff00' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0,255,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.8" 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"/>
+          <symbol type="line" name="3" force_rhr="0" clip_to_extent="1" alpha="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,0,255,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.8"/>
+              <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"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="4" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <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.26" 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"/>
+          <symbol type="line" name="4" force_rhr="0" clip_to_extent="1" alpha="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="255,255,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.26"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -4472,42 +4472,42 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{64e74156-92e1-4467-bc99-bfb62ea5d763}">
-          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{6b07fb50-64b4-4036-9b56-608851603e72}">
+          <rule key="{6b07fb50-64b4-4036-9b56-608851603e72}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
             <settings>
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" fontSize="11" namedStyle="Regular" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="0.8" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="0" fontStrikeout="0" fieldName="comment" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="50" useSubstitutions="0">
-                <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="255,0,0,255" shapeType="0" shapeJoinStyle="128" shapeRadiiY="1" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="1" shapeBorderWidth="0.6" shapeSizeY="1" shapeOffsetUnit="MM" shapeOpacity="0.6" shapeSVGFile="" shapeSizeX="1" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+              <text-style blendMode="0" fontSizeUnit="Point" isExpression="0" textOpacity="0.8" fontStrikeout="0" useSubstitutions="0" textColor="0,0,0,255" fontSize="11" fontUnderline="0" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fieldName="comment" fontFamily="Myriad Pro" fontLetterSpacing="0" multilineHeight="1" namedStyle="Regular" fontWeight="50" fontCapitals="0">
+                <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferSize="1" bufferSizeUnits="MM" bufferBlendMode="0" bufferDraw="0" bufferOpacity="1" bufferColor="255,255,255,255"/>
+                <background shapeOffsetX="0" shapeSVGFile="" shapeSizeType="0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeRadiiY="1" shapeSizeX="1" shapeRotation="0" shapeRadiiUnit="MM" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeOpacity="0.6" shapeBorderWidthUnit="MM" shapeJoinStyle="128" shapeBlendMode="0" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="255,0,0,255" shapeType="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeBorderWidth="0.6"/>
+                <shadow shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowUnder="0" shadowBlendMode="6"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="4294967295" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-              <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="2" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="2" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="5" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MM" dist="5" maxCurvedCharAngleIn="25" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-              <rendering drawLabels="1" maxNumLabels="2000" mergeLines="1" labelPerPart="0" scaleMax="0" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="0" scaleVisibility="0" obstacleFactor="1" fontMaxPixelSize="10000" obstacleType="0"/>
+              <text-format wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" reverseDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="4294967295" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0"/>
+              <placement fitInPolygonOnly="0" repeatDistance="0" placement="2" priority="5" centroidWhole="0" placementFlags="2" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" maxCurvedCharAngleIn="25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" maxCurvedCharAngleOut="-25" xOffset="0" yOffset="0" dist="5" centroidInside="0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" offsetUnits="MM" geometryGeneratorType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
+              <rendering scaleVisibility="0" maxNumLabels="2000" fontLimitPixelSize="0" minFeatureSize="0" upsidedownLabels="0" displayAll="1" mergeLines="1" fontMinPixelSize="3" limitNumLabels="0" scaleMin="0" obstacleFactor="1" drawLabels="1" zIndex="0" obstacleType="0" labelPerPart="0" fontMaxPixelSize="10000" scaleMax="0" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </settings>
           </rule>
-          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{41e7a99c-d385-4b8e-9484-4c3d8f4a12cf}">
+          <rule key="{41e7a99c-d385-4b8e-9484-4c3d8f4a12cf}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^(fenc|cone)')">
             <settings>
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" fontSize="12" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="1" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="1" fontStrikeout="0" fieldName="round( $length, 0) || 'm'" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-                <text-buffer bufferSizeUnits="MM" bufferDraw="1" bufferNoFill="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeJoinStyle="64" shapeRadiiY="0" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+              <text-style blendMode="0" fontSizeUnit="Point" isExpression="1" textOpacity="1" fontStrikeout="0" useSubstitutions="0" textColor="0,0,0,255" fontSize="12" fontUnderline="0" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fieldName="round( $length, 0) || 'm'" fontFamily="Myriad Pro" fontLetterSpacing="0" multilineHeight="1" namedStyle="Semibold" fontWeight="63" fontCapitals="0">
+                <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferSize="1" bufferSizeUnits="MM" bufferBlendMode="0" bufferDraw="1" bufferOpacity="1" bufferColor="255,255,255,255"/>
+                <background shapeOffsetX="0" shapeSVGFile="" shapeSizeType="0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeX="0" shapeRotation="0" shapeRadiiUnit="MM" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeOpacity="1" shapeBorderWidthUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeType="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeBorderWidth="0"/>
+                <shadow shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowUnder="0" shadowBlendMode="6"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="4294967295" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-              <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="2" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="15" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="5" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MM" dist="1" maxCurvedCharAngleIn="25" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-              <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="0" displayAll="0" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="0" scaleVisibility="0" obstacleFactor="1" fontMaxPixelSize="10000" obstacleType="0"/>
+              <text-format wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" reverseDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="4294967295" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0"/>
+              <placement fitInPolygonOnly="0" repeatDistance="0" placement="2" priority="5" centroidWhole="0" placementFlags="15" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" maxCurvedCharAngleIn="25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" maxCurvedCharAngleOut="-25" xOffset="0" yOffset="0" dist="1" centroidInside="0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" offsetUnits="MM" geometryGeneratorType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
+              <rendering scaleVisibility="0" maxNumLabels="2000" fontLimitPixelSize="0" minFeatureSize="0" upsidedownLabels="0" displayAll="0" mergeLines="0" fontMinPixelSize="3" limitNumLabels="0" scaleMin="0" obstacleFactor="1" drawLabels="1" zIndex="0" obstacleType="0" labelPerPart="0" fontMaxPixelSize="10000" scaleMax="0" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </settings>
@@ -4515,26 +4515,26 @@ def my_form_open(dialog, layer, feature):
         </rules>
       </labeling>
       <customproperties>
-        <property value="id" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="dualview/previewExpressions" value="id"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minimumSize="0" opacity="1" penAlpha="255" penColor="#000000" enabled="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeType="MM" diagramOrientation="Up" labelPlacementMethod="XHeight" scaleBasedVisibility="0" width="15" minScaleDenominator="0" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" barWidth="5" backgroundAlpha="255" lineSizeType="MM" penWidth="0">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory diagramOrientation="Up" minScaleDenominator="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penColor="#000000" backgroundAlpha="255" barWidth="5" backgroundColor="#ffffff" lineSizeType="MM" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" height="15" scaleBasedVisibility="0" minimumSize="0" penAlpha="255" maxScaleDenominator="1e+08" penWidth="0" enabled="0" width="15" rotationOffset="270" opacity="1">
           <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+          <attribute color="#000000" field="" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" priority="0" linePlacementFlags="18" placement="2" showAll="1" dist="0">
+      <DiagramLayerSettings placement="2" priority="0" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -4594,57 +4594,57 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <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 name="" field="id" index="0"/>
+        <alias name="" field="group" index="1"/>
+        <alias name="" field="comment" index="2"/>
+        <alias name="" field="moveable" index="3"/>
+        <alias name="" field="type" index="4"/>
+        <alias name="" field="name" index="5"/>
+        <alias name="" field="hidden" index="6"/>
       </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 applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="group" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="moveable" expression=""/>
+        <default applyOnUpdate="0" field="type" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="hidden" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="id"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="group"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="comment"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="moveable"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="type"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="name"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="hidden"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="id"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="group"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="comment"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="moveable"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="type"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="name"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="hidden"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="group"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="moveable"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="hidden"/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="group" exp=""/>
+        <constraint desc="" field="comment" exp=""/>
+        <constraint desc="" field="moveable" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="name" exp=""/>
+        <constraint desc="" field="hidden" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;group&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;group&quot;" sortOrder="0">
         <columns>
-          <column name="id" width="-1" hidden="0" type="field"/>
-          <column name="group" width="-1" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column name="comment" width="223" hidden="0" type="field"/>
-          <column name="moveable" width="-1" hidden="0" type="field"/>
-          <column name="type" width="-1" hidden="0" type="field"/>
-          <column name="name" width="414" hidden="0" type="field"/>
-          <column name="hidden" width="-1" hidden="0" type="field"/>
+          <column type="field" name="id" width="-1" hidden="0"/>
+          <column type="field" name="group" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="comment" width="223" hidden="0"/>
+          <column type="field" name="moveable" width="-1" hidden="0"/>
+          <column type="field" name="type" width="-1" hidden="0"/>
+          <column type="field" name="name" width="414" hidden="0"/>
+          <column type="field" name="hidden" width="-1" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -4675,13 +4675,13 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="comment"/>
-        <field editable="1" name="group"/>
-        <field editable="1" name="hidden"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="moveable"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="type"/>
+        <field name="comment" editable="1"/>
+        <field name="group" editable="1"/>
+        <field name="hidden" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="moveable" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
         <field name="comment" labelOnTop="0"/>
@@ -4696,7 +4696,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" readOnly="0" maxScale="0" type="vector" minScale="1e+08" simplifyLocal="1" wkbType="Point" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" geometry="Point" simplifyDrawingHints="0" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" labelsEnabled="1">
+    <maplayer simplifyDrawingTol="1" readOnly="0" maxScale="0" simplifyLocal="1" simplifyDrawingHints="0" labelsEnabled="1" geometry="Point" type="vector" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" simplifyMaxScale="1" minScale="1e+08" autoRefreshEnabled="0" refreshOnNotifyMessage="" wkbType="Point">
       <extent>
         <xmin>18.39857058409652169</xmin>
         <ymin>-33.90687934774654622</ymin>
@@ -4753,7 +4753,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" maxx="0" minz="0" miny="0" crs="" dimensions="2" maxz="0" minx="0"/>
+          <spatial maxy="0" maxz="0" maxx="0" minx="0" minz="0" dimensions="2" crs="" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -4777,153 +4777,153 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" forceraster="0" enableorderby="0" type="singleSymbol">
+      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol name="0" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-            <layer enabled="1" pass="0" class="GeometryGenerator" locked="0">
-              <prop v="Line" k="SymbolType"/>
-              <prop v="make_line(&#xa;  make_point($x, $y),&#xa;  make_point( &quot;auxiliary_storage_labeling_positionx&quot; , &quot;auxiliary_storage_labeling_positiony&quot; )&#xa;)" k="geometryModifier"/>
+          <symbol type="marker" name="0" force_rhr="0" clip_to_extent="1" alpha="1">
+            <layer class="GeometryGenerator" enabled="1" locked="0" pass="0">
+              <prop k="SymbolType" v="Line"/>
+              <prop k="geometryModifier" v="make_line(&#xa;  make_point($x, $y),&#xa;  make_point( &quot;auxiliary_storage_labeling_positionx&quot; , &quot;auxiliary_storage_labeling_positiony&quot; )&#xa;)"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="enabled" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="&quot;Distance&quot; IS attribute( @atlas_feature, 'Distance' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="enabled">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="&quot;Distance&quot; IS attribute( @atlas_feature, 'Distance' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@0@0" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-                <layer enabled="1" pass="0" class="ArrowLine" locked="0">
-                  <prop v="1" k="arrow_start_width"/>
-                  <prop v="MM" k="arrow_start_width_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="arrow_start_width_unit_scale"/>
-                  <prop v="0" k="arrow_type"/>
-                  <prop v="1" k="arrow_width"/>
-                  <prop v="MM" k="arrow_width_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="arrow_width_unit_scale"/>
-                  <prop v="1.5" k="head_length"/>
-                  <prop v="MM" k="head_length_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="head_length_unit_scale"/>
-                  <prop v="1.5" k="head_thickness"/>
-                  <prop v="MM" k="head_thickness_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="head_thickness_unit_scale"/>
-                  <prop v="1" k="head_type"/>
-                  <prop v="1" k="is_curved"/>
-                  <prop v="0" k="is_repeated"/>
-                  <prop v="1" k="offset"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_unit_scale"/>
-                  <prop v="0" k="ring_filter"/>
-                  <effect enabled="0" type="effectStack">
+              <symbol type="line" name="@0@0" force_rhr="0" clip_to_extent="1" alpha="1">
+                <layer class="ArrowLine" enabled="1" locked="0" pass="0">
+                  <prop k="arrow_start_width" v="1"/>
+                  <prop k="arrow_start_width_unit" v="MM"/>
+                  <prop k="arrow_start_width_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="arrow_type" v="0"/>
+                  <prop k="arrow_width" v="1"/>
+                  <prop k="arrow_width_unit" v="MM"/>
+                  <prop k="arrow_width_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="head_length" v="1.5"/>
+                  <prop k="head_length_unit" v="MM"/>
+                  <prop k="head_length_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="head_thickness" v="1.5"/>
+                  <prop k="head_thickness_unit" v="MM"/>
+                  <prop k="head_thickness_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="head_type" v="1"/>
+                  <prop k="is_curved" v="1"/>
+                  <prop k="is_repeated" v="0"/>
+                  <prop k="offset" v="1"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="offset_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="ring_filter" v="0"/>
+                  <effect type="effectStack" enabled="0">
                     <effect type="dropShadow">
-                      <prop v="13" k="blend_mode"/>
-                      <prop v="2.645" k="blur_level"/>
-                      <prop v="MM" k="blur_unit"/>
-                      <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-                      <prop v="0,0,0,255" k="color"/>
-                      <prop v="2" k="draw_mode"/>
-                      <prop v="0" k="enabled"/>
-                      <prop v="135" k="offset_angle"/>
-                      <prop v="2" k="offset_distance"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_unit_scale"/>
-                      <prop v="1" k="opacity"/>
+                      <prop k="blend_mode" v="13"/>
+                      <prop k="blur_level" v="2.645"/>
+                      <prop k="blur_unit" v="MM"/>
+                      <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="0,0,0,255"/>
+                      <prop k="draw_mode" v="2"/>
+                      <prop k="enabled" v="0"/>
+                      <prop k="offset_angle" v="135"/>
+                      <prop k="offset_distance" v="2"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="offset_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="opacity" v="1"/>
                     </effect>
                     <effect type="outerGlow">
-                      <prop v="0" k="blend_mode"/>
-                      <prop v="2.645" k="blur_level"/>
-                      <prop v="MM" k="blur_unit"/>
-                      <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-                      <prop v="0,0,255,255" k="color1"/>
-                      <prop v="0,255,0,255" k="color2"/>
-                      <prop v="0" k="color_type"/>
-                      <prop v="0" k="discrete"/>
-                      <prop v="2" k="draw_mode"/>
-                      <prop v="0" k="enabled"/>
-                      <prop v="0.5" k="opacity"/>
-                      <prop v="gradient" k="rampType"/>
-                      <prop v="255,255,255,255" k="single_color"/>
-                      <prop v="2" k="spread"/>
-                      <prop v="MM" k="spread_unit"/>
-                      <prop v="3x:0,0,0,0,0,0" k="spread_unit_scale"/>
+                      <prop k="blend_mode" v="0"/>
+                      <prop k="blur_level" v="2.645"/>
+                      <prop k="blur_unit" v="MM"/>
+                      <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color1" v="0,0,255,255"/>
+                      <prop k="color2" v="0,255,0,255"/>
+                      <prop k="color_type" v="0"/>
+                      <prop k="discrete" v="0"/>
+                      <prop k="draw_mode" v="2"/>
+                      <prop k="enabled" v="0"/>
+                      <prop k="opacity" v="0.5"/>
+                      <prop k="rampType" v="gradient"/>
+                      <prop k="single_color" v="255,255,255,255"/>
+                      <prop k="spread" v="2"/>
+                      <prop k="spread_unit" v="MM"/>
+                      <prop k="spread_unit_scale" v="3x:0,0,0,0,0,0"/>
                     </effect>
                     <effect type="transform">
-                      <prop v="2" k="draw_mode"/>
-                      <prop v="1" k="enabled"/>
-                      <prop v="0" k="reflect_x"/>
-                      <prop v="0" k="reflect_y"/>
-                      <prop v="0" k="rotation"/>
-                      <prop v="1" k="scale_x"/>
-                      <prop v="1" k="scale_y"/>
-                      <prop v="0" k="shear_x"/>
-                      <prop v="0" k="shear_y"/>
-                      <prop v="MM" k="translate_unit"/>
-                      <prop v="3x:0,0,0,0,0,0" k="translate_unit_scale"/>
-                      <prop v="0" k="translate_x"/>
-                      <prop v="0" k="translate_y"/>
+                      <prop k="draw_mode" v="2"/>
+                      <prop k="enabled" v="1"/>
+                      <prop k="reflect_x" v="0"/>
+                      <prop k="reflect_y" v="0"/>
+                      <prop k="rotation" v="0"/>
+                      <prop k="scale_x" v="1"/>
+                      <prop k="scale_y" v="1"/>
+                      <prop k="shear_x" v="0"/>
+                      <prop k="shear_y" v="0"/>
+                      <prop k="translate_unit" v="MM"/>
+                      <prop k="translate_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="translate_x" v="0"/>
+                      <prop k="translate_y" v="0"/>
                     </effect>
                     <effect type="innerShadow">
-                      <prop v="13" k="blend_mode"/>
-                      <prop v="2.645" k="blur_level"/>
-                      <prop v="MM" k="blur_unit"/>
-                      <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-                      <prop v="0,0,0,255" k="color"/>
-                      <prop v="2" k="draw_mode"/>
-                      <prop v="0" k="enabled"/>
-                      <prop v="135" k="offset_angle"/>
-                      <prop v="2" k="offset_distance"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_unit_scale"/>
-                      <prop v="1" k="opacity"/>
+                      <prop k="blend_mode" v="13"/>
+                      <prop k="blur_level" v="2.645"/>
+                      <prop k="blur_unit" v="MM"/>
+                      <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="0,0,0,255"/>
+                      <prop k="draw_mode" v="2"/>
+                      <prop k="enabled" v="0"/>
+                      <prop k="offset_angle" v="135"/>
+                      <prop k="offset_distance" v="2"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="offset_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="opacity" v="1"/>
                     </effect>
                     <effect type="innerGlow">
-                      <prop v="0" k="blend_mode"/>
-                      <prop v="2.645" k="blur_level"/>
-                      <prop v="MM" k="blur_unit"/>
-                      <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-                      <prop v="0,0,255,255" k="color1"/>
-                      <prop v="0,255,0,255" k="color2"/>
-                      <prop v="0" k="color_type"/>
-                      <prop v="0" k="discrete"/>
-                      <prop v="2" k="draw_mode"/>
-                      <prop v="0" k="enabled"/>
-                      <prop v="0.5" k="opacity"/>
-                      <prop v="gradient" k="rampType"/>
-                      <prop v="255,255,255,255" k="single_color"/>
-                      <prop v="2" k="spread"/>
-                      <prop v="MM" k="spread_unit"/>
-                      <prop v="3x:0,0,0,0,0,0" k="spread_unit_scale"/>
+                      <prop k="blend_mode" v="0"/>
+                      <prop k="blur_level" v="2.645"/>
+                      <prop k="blur_unit" v="MM"/>
+                      <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color1" v="0,0,255,255"/>
+                      <prop k="color2" v="0,255,0,255"/>
+                      <prop k="color_type" v="0"/>
+                      <prop k="discrete" v="0"/>
+                      <prop k="draw_mode" v="2"/>
+                      <prop k="enabled" v="0"/>
+                      <prop k="opacity" v="0.5"/>
+                      <prop k="rampType" v="gradient"/>
+                      <prop k="single_color" v="255,255,255,255"/>
+                      <prop k="spread" v="2"/>
+                      <prop k="spread_unit" v="MM"/>
+                      <prop k="spread_unit_scale" v="3x:0,0,0,0,0,0"/>
                     </effect>
                   </effect>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@0@0@0" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-                    <layer enabled="1" pass="0" class="SimpleFill" locked="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="0,0,255,255" k="color"/>
-                      <prop v="round" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="35,35,35,0" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol type="fill" name="@@0@0@0" force_rhr="0" clip_to_extent="1" alpha="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="0,0,255,255"/>
+                      <prop k="joinstyle" v="round"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="35,35,35,0"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -4938,48 +4938,48 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{ec06de39-9a7b-40bf-968d-6abbbec23d8a}">
-          <rule filter="&quot;Distance&quot; IS attribute( @atlas_feature, 'Distance')" key="{966f1ab1-4d4c-4ff0-997b-e53f6ca5855d}">
+          <rule key="{966f1ab1-4d4c-4ff0-997b-e53f6ca5855d}" filter="&quot;Distance&quot; IS attribute( @atlas_feature, 'Distance')">
             <settings>
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,255,255" fontSize="9" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="0.8" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="0" fontStrikeout="0" fieldName="display" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-                <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="0,0,255,255" shapeType="0" shapeJoinStyle="128" shapeRadiiY="0.5" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="0.5" shapeBorderWidth="0.2" shapeSizeY="1" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="1" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+              <text-style blendMode="0" fontSizeUnit="Point" isExpression="0" textOpacity="0.8" fontStrikeout="0" useSubstitutions="0" textColor="0,0,255,255" fontSize="9" fontUnderline="0" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fieldName="display" fontFamily="Myriad Pro" fontLetterSpacing="0" multilineHeight="1" namedStyle="Semibold" fontWeight="63" fontCapitals="0">
+                <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferSize="1" bufferSizeUnits="MM" bufferBlendMode="0" bufferDraw="0" bufferOpacity="1" bufferColor="255,255,255,255"/>
+                <background shapeOffsetX="0" shapeSVGFile="" shapeSizeType="0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeRadiiY="0.5" shapeSizeX="1" shapeRotation="0" shapeRadiiUnit="MM" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeOpacity="1" shapeBorderWidthUnit="MM" shapeJoinStyle="128" shapeBlendMode="0" shapeRadiiX="0.5" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,255,255" shapeType="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeBorderWidth="0.2"/>
+                <shadow shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowUnder="0" shadowBlendMode="6"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="17" useMaxLineLengthForAutoWrap="1" multilineAlign="2" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-              <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="0" repeatDistanceUnits="MM" preserveRotation="0" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="LineGeometry" geometryGenerator="" priority="10" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MM" dist="0" maxCurvedCharAngleIn="25" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-              <rendering drawLabels="1" maxNumLabels="2" mergeLines="0" labelPerPart="0" scaleMax="0" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="0" scaleVisibility="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacleType="0"/>
+              <text-format wrapChar="" placeDirectionSymbol="0" autoWrapLength="17" reverseDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="2" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0"/>
+              <placement fitInPolygonOnly="0" repeatDistance="0" placement="0" priority="10" centroidWhole="0" placementFlags="10" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" maxCurvedCharAngleIn="25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" maxCurvedCharAngleOut="-25" xOffset="0" yOffset="0" dist="0" centroidInside="0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" offsetUnits="MM" geometryGeneratorType="LineGeometry" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
+              <rendering scaleVisibility="0" maxNumLabels="2" fontLimitPixelSize="0" minFeatureSize="0" upsidedownLabels="0" displayAll="1" mergeLines="0" fontMinPixelSize="3" limitNumLabels="0" scaleMin="0" obstacleFactor="2" drawLabels="1" zIndex="0" obstacleType="0" labelPerPart="0" fontMaxPixelSize="10000" scaleMax="0" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="AlwaysShow" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="AlwaysShow">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="Hali" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="'Center'" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="Hali">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="'Center'"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="PositionX" type="Map">
-                      <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 type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="auxiliary_storage_labeling_positionx"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <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 type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="auxiliary_storage_labeling_positiony"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
-                    <Option name="Vali" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="'Half'" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="Vali">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="'Half'"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </settings>
@@ -4997,25 +4997,25 @@ def my_form_open(dialog, layer, feature):
           <value>COALESCE( "display", '&lt;NULL>' )</value>
           <value>Name</value>
         </property>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>0.6</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minimumSize="0" opacity="1" penAlpha="255" penColor="#000000" enabled="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeType="MM" diagramOrientation="Up" labelPlacementMethod="XHeight" scaleBasedVisibility="0" width="15" minScaleDenominator="0" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" barWidth="5" backgroundAlpha="255" lineSizeType="MM" penWidth="0">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory diagramOrientation="Up" minScaleDenominator="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penColor="#000000" backgroundAlpha="255" barWidth="5" backgroundColor="#ffffff" lineSizeType="MM" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" height="15" scaleBasedVisibility="0" minimumSize="0" penAlpha="255" maxScaleDenominator="1e+08" penWidth="0" enabled="0" width="15" rotationOffset="270" opacity="1">
           <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+          <attribute color="#000000" field="" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" priority="0" linePlacementFlags="18" placement="0" showAll="1" dist="0">
+      <DiagramLayerSettings placement="0" priority="0" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -5028,8 +5028,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -5038,8 +5038,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -5074,52 +5074,52 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="Name"/>
-        <alias index="1" name="" field="Distance"/>
-        <alias index="2" name="" field="distance:(0,0)"/>
-        <alias index="3" name="" field="display"/>
-        <alias index="4" name="" field="auxiliary_storage_labeling_positionx"/>
-        <alias index="5" name="" field="auxiliary_storage_labeling_positiony"/>
+        <alias name="" field="Name" index="0"/>
+        <alias name="" field="Distance" index="1"/>
+        <alias name="" field="distance:(0,0)" index="2"/>
+        <alias name="" field="display" index="3"/>
+        <alias name="" field="auxiliary_storage_labeling_positionx" index="4"/>
+        <alias name="" field="auxiliary_storage_labeling_positiony" index="5"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="Name"/>
-        <default expression="" applyOnUpdate="0" field="Distance"/>
-        <default expression="" applyOnUpdate="0" field="distance:(0,0)"/>
-        <default expression="" applyOnUpdate="0" field="display"/>
-        <default expression="" applyOnUpdate="0" field="auxiliary_storage_labeling_positionx"/>
-        <default expression="" applyOnUpdate="0" field="auxiliary_storage_labeling_positiony"/>
+        <default applyOnUpdate="0" field="Name" expression=""/>
+        <default applyOnUpdate="0" field="Distance" expression=""/>
+        <default applyOnUpdate="0" field="distance:(0,0)" expression=""/>
+        <default applyOnUpdate="0" field="display" expression=""/>
+        <default applyOnUpdate="0" field="auxiliary_storage_labeling_positionx" expression=""/>
+        <default applyOnUpdate="0" field="auxiliary_storage_labeling_positiony" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Name"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Distance"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="distance:(0,0)"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="display"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="auxiliary_storage_labeling_positionx"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="auxiliary_storage_labeling_positiony"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="Name"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="Distance"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="distance:(0,0)"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="display"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="auxiliary_storage_labeling_positionx"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="auxiliary_storage_labeling_positiony"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="Name"/>
-        <constraint desc="" exp="" field="Distance"/>
-        <constraint desc="" exp="" field="distance:(0,0)"/>
-        <constraint desc="" exp="" field="display"/>
-        <constraint desc="" exp="" field="auxiliary_storage_labeling_positionx"/>
-        <constraint desc="" exp="" field="auxiliary_storage_labeling_positiony"/>
+        <constraint desc="" field="Name" exp=""/>
+        <constraint desc="" field="Distance" exp=""/>
+        <constraint desc="" field="distance:(0,0)" exp=""/>
+        <constraint desc="" field="display" exp=""/>
+        <constraint desc="" field="auxiliary_storage_labeling_positionx" exp=""/>
+        <constraint desc="" field="auxiliary_storage_labeling_positiony" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;display&quot;" sortOrder="1" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;display&quot;" sortOrder="1">
         <columns>
-          <column name="Name" width="-1" hidden="0" type="field"/>
-          <column name="Distance" width="-1" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column name="display" width="203" hidden="0" type="field"/>
-          <column name="distance:(0,0)" width="-1" hidden="0" type="field"/>
-          <column name="auxiliary_storage_labeling_positionx" width="-1" hidden="1" type="field"/>
-          <column name="auxiliary_storage_labeling_positiony" width="-1" hidden="1" type="field"/>
+          <column type="field" name="Name" width="-1" hidden="0"/>
+          <column type="field" name="Distance" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="display" width="203" hidden="0"/>
+          <column type="field" name="distance:(0,0)" width="-1" hidden="0"/>
+          <column type="field" name="auxiliary_storage_labeling_positionx" width="-1" hidden="1"/>
+          <column type="field" name="auxiliary_storage_labeling_positiony" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5150,26 +5150,26 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Source"/>
-        <field editable="0" name="auxiliary_storage_labeling_positionx"/>
-        <field editable="0" name="auxiliary_storage_labeling_positiony"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="display"/>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="distance:(0,0)"/>
-        <field editable="1" name="end"/>
-        <field editable="1" name="first_runner"/>
-        <field editable="1" name="first_runner_s"/>
-        <field editable="1" name="last_runner"/>
-        <field editable="1" name="last_runner_s"/>
-        <field editable="1" name="length_km"/>
-        <field editable="1" name="length_m"/>
-        <field editable="1" name="org_fid"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="auxiliary_storage_labeling_positionx" editable="0"/>
+        <field name="auxiliary_storage_labeling_positiony" editable="0"/>
+        <field name="begin" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="display" editable="1"/>
+        <field name="distance" editable="1"/>
+        <field name="distance:(0,0)" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="first_runner" editable="1"/>
+        <field name="first_runner_s" editable="1"/>
+        <field name="last_runner" editable="1"/>
+        <field name="last_runner_s" editable="1"/>
+        <field name="length_km" editable="1"/>
+        <field name="length_m" editable="1"/>
+        <field name="org_fid" editable="1"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
         <field name="Distance" labelOnTop="0"/>
@@ -5197,7 +5197,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" readOnly="0" maxScale="0" type="vector" minScale="1e+08" simplifyLocal="1" wkbType="Point" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" geometry="Point" simplifyDrawingHints="0" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" labelsEnabled="0">
+    <maplayer simplifyDrawingTol="1" readOnly="0" maxScale="0" simplifyLocal="1" simplifyDrawingHints="0" labelsEnabled="0" geometry="Point" type="vector" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" simplifyMaxScale="1" minScale="1e+08" autoRefreshEnabled="0" refreshOnNotifyMessage="" wkbType="Point">
       <extent>
         <xmin>18.375272840127721</xmin>
         <ymin>-33.94586040837086927</ymin>
@@ -5261,114 +5261,114 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" forceraster="0" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" enableorderby="0">
         <rules key="{01115dc1-cc6e-4980-a968-7ef94a3b9df6}">
-          <rule symbol="0" filter="&quot;Distance&quot; = '21KM'" key="{71dc0866-b893-48a0-be36-e2b65a581610}"/>
-          <rule symbol="1" filter="&quot;Distance&quot; = '10KM'" key="{405230e7-6e6f-4e87-b9bc-b89e44296582}"/>
-          <rule symbol="2" filter="&quot;Distance&quot; = '5KM'" key="{c5d85d4d-6b78-403d-ab66-ecd04556e7d7}"/>
+          <rule symbol="0" key="{71dc0866-b893-48a0-be36-e2b65a581610}" filter="&quot;Distance&quot; = '21KM'"/>
+          <rule symbol="1" key="{405230e7-6e6f-4e87-b9bc-b89e44296582}" filter="&quot;Distance&quot; = '10KM'"/>
+          <rule symbol="2" key="{c5d85d4d-6b78-403d-ab66-ecd04556e7d7}" filter="&quot;Distance&quot; = '5KM'"/>
         </rules>
         <symbols>
-          <symbol name="0" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-            <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
-              <prop v="0" k="angle"/>
-              <prop v="210,32,39,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,0" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="0.5" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol type="marker" name="0" force_rhr="0" clip_to_extent="1" alpha="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="210,32,39,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="circle"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="35,35,35,0"/>
+              <prop k="outline_style" v="no"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="0.5"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="size">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="0.8" force_rhr="0" clip_to_extent="1" type="marker">
-            <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
-              <prop v="0" k="angle"/>
-              <prop v="103,34,144,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,0" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="0.5" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol type="marker" name="1" force_rhr="0" clip_to_extent="1" alpha="0.8">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="103,34,144,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="circle"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="35,35,35,0"/>
+              <prop k="outline_style" v="no"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="0.5"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="size">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="0.8" force_rhr="0" clip_to_extent="1" type="marker">
-            <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
-              <prop v="0" k="angle"/>
-              <prop v="145,211,55,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,0" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="0.5" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol type="marker" name="2" force_rhr="0" clip_to_extent="1" alpha="0.8">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="145,211,55,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="circle"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="35,35,35,0"/>
+              <prop k="outline_style" v="no"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="0.5"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="size">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -5377,46 +5377,46 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,255,255" fontSize="9" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="0.8" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="1" fontStrikeout="0" fieldName="IF(&quot;Distance&quot; IS attribute( @atlas_feature, 'Distance' ), display, '')" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-            <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-            <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="0,0,255,255" shapeType="0" shapeJoinStyle="128" shapeRadiiY="0.5" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="0.5" shapeBorderWidth="0.2" shapeSizeY="1" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="1" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+          <text-style blendMode="0" fontSizeUnit="Point" isExpression="1" textOpacity="0.8" fontStrikeout="0" useSubstitutions="0" textColor="0,0,255,255" fontSize="9" fontUnderline="0" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fieldName="IF(&quot;Distance&quot; IS attribute( @atlas_feature, 'Distance' ), display, '')" fontFamily="Myriad Pro" fontLetterSpacing="0" multilineHeight="1" namedStyle="Semibold" fontWeight="63" fontCapitals="0">
+            <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferSize="1" bufferSizeUnits="MM" bufferBlendMode="0" bufferDraw="0" bufferOpacity="1" bufferColor="255,255,255,255"/>
+            <background shapeOffsetX="0" shapeSVGFile="" shapeSizeType="0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeRadiiY="0.5" shapeSizeX="1" shapeRotation="0" shapeRadiiUnit="MM" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeOpacity="1" shapeBorderWidthUnit="MM" shapeJoinStyle="128" shapeBlendMode="0" shapeRadiiX="0.5" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,255,255" shapeType="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeBorderWidth="0.2"/>
+            <shadow shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowUnder="0" shadowBlendMode="6"/>
             <substitutions/>
           </text-style>
-          <text-format formatNumbers="0" autoWrapLength="17" useMaxLineLengthForAutoWrap="1" multilineAlign="2" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-          <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="0" repeatDistanceUnits="MM" preserveRotation="0" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="LineGeometry" geometryGenerator="" priority="10" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MM" dist="0" maxCurvedCharAngleIn="25" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-          <rendering drawLabels="1" maxNumLabels="2" mergeLines="0" labelPerPart="0" scaleMax="0" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="0" scaleVisibility="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacleType="0"/>
+          <text-format wrapChar="" placeDirectionSymbol="0" autoWrapLength="17" reverseDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="2" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0"/>
+          <placement fitInPolygonOnly="0" repeatDistance="0" placement="0" priority="10" centroidWhole="0" placementFlags="10" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" maxCurvedCharAngleIn="25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" maxCurvedCharAngleOut="-25" xOffset="0" yOffset="0" dist="0" centroidInside="0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" offsetUnits="MM" geometryGeneratorType="LineGeometry" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
+          <rendering scaleVisibility="0" maxNumLabels="2" fontLimitPixelSize="0" minFeatureSize="0" upsidedownLabels="0" displayAll="1" mergeLines="0" fontMinPixelSize="3" limitNumLabels="0" scaleMin="0" obstacleFactor="2" drawLabels="1" zIndex="0" obstacleType="0" labelPerPart="0" fontMaxPixelSize="10000" scaleMax="0" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="AlwaysShow" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="type" value="1" type="int"/>
-                  <Option name="val" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="AlwaysShow">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="int" name="type" value="1"/>
+                  <Option type="QString" name="val" value=""/>
                 </Option>
-                <Option name="Hali" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="'Center'" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="Hali">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="'Center'"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="PositionX" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="field" value="" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                <Option type="Map" name="PositionX">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="field" value=""/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
-                <Option name="PositionY" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="field" value="" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                <Option type="Map" name="PositionY">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="field" value=""/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
-                <Option name="Vali" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="'Half'" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="Vali">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="'Half'"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </settings>
@@ -5428,25 +5428,25 @@ def my_form_open(dialog, layer, feature):
           <value>COALESCE( "display", '&lt;NULL>' )</value>
           <value>Name</value>
         </property>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minimumSize="0" opacity="1" penAlpha="255" penColor="#000000" enabled="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeType="MM" diagramOrientation="Up" labelPlacementMethod="XHeight" scaleBasedVisibility="0" width="15" minScaleDenominator="0" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" barWidth="5" backgroundAlpha="255" lineSizeType="MM" penWidth="0">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory diagramOrientation="Up" minScaleDenominator="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penColor="#000000" backgroundAlpha="255" barWidth="5" backgroundColor="#ffffff" lineSizeType="MM" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" height="15" scaleBasedVisibility="0" minimumSize="0" penAlpha="255" maxScaleDenominator="1e+08" penWidth="0" enabled="0" width="15" rotationOffset="270" opacity="1">
           <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+          <attribute color="#000000" field="" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" priority="0" linePlacementFlags="18" placement="0" showAll="1" dist="0">
+      <DiagramLayerSettings placement="0" priority="0" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -5459,8 +5459,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -5469,8 +5469,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -5479,8 +5479,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -5489,8 +5489,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -5499,8 +5499,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -5509,8 +5509,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -5519,8 +5519,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -5529,8 +5529,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -5539,8 +5539,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -5549,8 +5549,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -5585,90 +5585,90 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <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="Distance"/>
-        <alias index="6" name="" field="RouteLen"/>
-        <alias index="7" name="" field="length_m"/>
-        <alias index="8" name="" field="length_km"/>
-        <alias index="9" name="" field="Source"/>
-        <alias index="10" name="" field="org_fid"/>
-        <alias index="11" name="" field="distance"/>
-        <alias index="12" name="" field="first_runner"/>
-        <alias index="13" name="" field="last_runner"/>
+        <alias name="" field="Name" index="0"/>
+        <alias name="" field="descriptio" index="1"/>
+        <alias name="" field="timestamp" index="2"/>
+        <alias name="" field="begin" index="3"/>
+        <alias name="" field="end" index="4"/>
+        <alias name="" field="Distance" index="5"/>
+        <alias name="" field="RouteLen" index="6"/>
+        <alias name="" field="length_m" index="7"/>
+        <alias name="" field="length_km" index="8"/>
+        <alias name="" field="Source" index="9"/>
+        <alias name="" field="org_fid" index="10"/>
+        <alias name="" field="distance" index="11"/>
+        <alias name="" field="first_runner" index="12"/>
+        <alias name="" field="last_runner" index="13"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <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="Distance"/>
-        <default expression="" applyOnUpdate="0" field="RouteLen"/>
-        <default expression="" applyOnUpdate="0" field="length_m"/>
-        <default expression="" applyOnUpdate="0" field="length_km"/>
-        <default expression="" applyOnUpdate="0" field="Source"/>
-        <default expression="" applyOnUpdate="0" field="org_fid"/>
-        <default expression="" applyOnUpdate="0" field="distance"/>
-        <default expression="" applyOnUpdate="0" field="first_runner"/>
-        <default expression="" applyOnUpdate="0" field="last_runner"/>
+        <default applyOnUpdate="0" field="Name" expression=""/>
+        <default applyOnUpdate="0" field="descriptio" expression=""/>
+        <default applyOnUpdate="0" field="timestamp" expression=""/>
+        <default applyOnUpdate="0" field="begin" expression=""/>
+        <default applyOnUpdate="0" field="end" expression=""/>
+        <default applyOnUpdate="0" field="Distance" expression=""/>
+        <default applyOnUpdate="0" field="RouteLen" expression=""/>
+        <default applyOnUpdate="0" field="length_m" expression=""/>
+        <default applyOnUpdate="0" field="length_km" expression=""/>
+        <default applyOnUpdate="0" field="Source" expression=""/>
+        <default applyOnUpdate="0" field="org_fid" expression=""/>
+        <default applyOnUpdate="0" field="distance" expression=""/>
+        <default applyOnUpdate="0" field="first_runner" expression=""/>
+        <default applyOnUpdate="0" field="last_runner" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Name"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="descriptio"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="timestamp"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="begin"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="end"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Distance"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="RouteLen"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="length_m"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="length_km"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Source"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="org_fid"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="distance"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="first_runner"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="last_runner"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="Name"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="descriptio"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="timestamp"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="begin"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="end"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="Distance"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="RouteLen"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="length_m"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="length_km"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="Source"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="org_fid"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="distance"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="first_runner"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="last_runner"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="Name"/>
-        <constraint desc="" exp="" field="descriptio"/>
-        <constraint desc="" exp="" field="timestamp"/>
-        <constraint desc="" exp="" field="begin"/>
-        <constraint desc="" exp="" field="end"/>
-        <constraint desc="" exp="" field="Distance"/>
-        <constraint desc="" exp="" field="RouteLen"/>
-        <constraint desc="" exp="" field="length_m"/>
-        <constraint desc="" exp="" field="length_km"/>
-        <constraint desc="" exp="" field="Source"/>
-        <constraint desc="" exp="" field="org_fid"/>
-        <constraint desc="" exp="" field="distance"/>
-        <constraint desc="" exp="" field="first_runner"/>
-        <constraint desc="" exp="" field="last_runner"/>
+        <constraint desc="" field="Name" exp=""/>
+        <constraint desc="" field="descriptio" exp=""/>
+        <constraint desc="" field="timestamp" exp=""/>
+        <constraint desc="" field="begin" exp=""/>
+        <constraint desc="" field="end" exp=""/>
+        <constraint desc="" field="Distance" exp=""/>
+        <constraint desc="" field="RouteLen" exp=""/>
+        <constraint desc="" field="length_m" exp=""/>
+        <constraint desc="" field="length_km" exp=""/>
+        <constraint desc="" field="Source" exp=""/>
+        <constraint desc="" field="org_fid" exp=""/>
+        <constraint desc="" field="distance" exp=""/>
+        <constraint desc="" field="first_runner" exp=""/>
+        <constraint desc="" field="last_runner" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;display&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;display&quot;" sortOrder="0">
         <columns>
-          <column name="Name" width="-1" hidden="0" type="field"/>
-          <column name="descriptio" width="-1" hidden="0" type="field"/>
-          <column name="timestamp" width="-1" hidden="0" type="field"/>
-          <column name="begin" width="179" hidden="0" type="field"/>
-          <column name="end" width="-1" hidden="0" type="field"/>
-          <column name="Distance" width="-1" hidden="0" type="field"/>
-          <column name="RouteLen" width="-1" hidden="0" type="field"/>
-          <column name="length_m" width="-1" hidden="0" type="field"/>
-          <column name="length_km" width="-1" hidden="0" type="field"/>
-          <column name="Source" width="-1" hidden="0" type="field"/>
-          <column name="org_fid" width="-1" hidden="0" type="field"/>
-          <column name="distance" width="177" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
+          <column type="field" name="Name" width="-1" hidden="0"/>
+          <column type="field" name="descriptio" width="-1" hidden="0"/>
+          <column type="field" name="timestamp" width="-1" hidden="0"/>
+          <column type="field" name="begin" width="179" hidden="0"/>
+          <column type="field" name="end" width="-1" hidden="0"/>
+          <column type="field" name="Distance" width="-1" hidden="0"/>
+          <column type="field" name="RouteLen" width="-1" hidden="0"/>
+          <column type="field" name="length_m" width="-1" hidden="0"/>
+          <column type="field" name="length_km" width="-1" hidden="0"/>
+          <column type="field" name="Source" width="-1" hidden="0"/>
+          <column type="field" name="org_fid" width="-1" hidden="0"/>
+          <column type="field" name="distance" width="177" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5699,25 +5699,25 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Source"/>
-        <field editable="0" name="auxiliary_storage_labeling_positionx"/>
-        <field editable="0" name="auxiliary_storage_labeling_positiony"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="display"/>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="end"/>
-        <field editable="1" name="first_runner"/>
-        <field editable="1" name="first_runner_s"/>
-        <field editable="1" name="last_runner"/>
-        <field editable="1" name="last_runner_s"/>
-        <field editable="1" name="length_km"/>
-        <field editable="1" name="length_m"/>
-        <field editable="1" name="org_fid"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="auxiliary_storage_labeling_positionx" editable="0"/>
+        <field name="auxiliary_storage_labeling_positiony" editable="0"/>
+        <field name="begin" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="display" editable="1"/>
+        <field name="distance" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="first_runner" editable="1"/>
+        <field name="first_runner_s" editable="1"/>
+        <field name="last_runner" editable="1"/>
+        <field name="last_runner_s" editable="1"/>
+        <field name="length_km" editable="1"/>
+        <field name="length_m" editable="1"/>
+        <field name="org_fid" editable="1"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
         <field name="Distance" labelOnTop="0"/>
@@ -5744,7 +5744,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" readOnly="0" maxScale="100000" type="vector" minScale="1e+08" simplifyLocal="1" wkbType="MultiPolygon" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" geometry="Polygon" simplifyDrawingHints="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" labelsEnabled="0">
+    <maplayer simplifyDrawingTol="1" readOnly="0" maxScale="100000" simplifyLocal="1" simplifyDrawingHints="1" labelsEnabled="0" geometry="Polygon" type="vector" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" simplifyMaxScale="1" minScale="1e+08" autoRefreshEnabled="0" refreshOnNotifyMessage="" wkbType="MultiPolygon">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.94678832168284544</ymin>
@@ -5808,26 +5808,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>0</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" forceraster="0" enableorderby="0" type="singleSymbol">
+      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol name="0" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-            <layer enabled="1" pass="0" class="SimpleFill" locked="0">
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="26,0,201,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="dot" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="b_diagonal" k="style"/>
+          <symbol type="fill" name="0" force_rhr="0" clip_to_extent="1" alpha="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="color" v="26,0,201,255"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="0,0,0,255"/>
+              <prop k="outline_style" v="dot"/>
+              <prop k="outline_width" v="0.26"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="style" v="b_diagonal"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -5837,32 +5837,32 @@ def my_form_open(dialog, layer, feature):
         <sizescale/>
       </renderer-v2>
       <customproperties>
-        <property value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="dualview/previewExpressions" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minimumSize="0" opacity="1" penAlpha="255" penColor="#000000" enabled="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeType="MM" diagramOrientation="Up" labelPlacementMethod="XHeight" scaleBasedVisibility="0" width="15" minScaleDenominator="100000" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" barWidth="5" backgroundAlpha="255" lineSizeType="MM" penWidth="0">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory diagramOrientation="Up" minScaleDenominator="100000" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penColor="#000000" backgroundAlpha="255" barWidth="5" backgroundColor="#ffffff" lineSizeType="MM" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" height="15" scaleBasedVisibility="0" minimumSize="0" penAlpha="255" maxScaleDenominator="1e+08" penWidth="0" enabled="0" width="15" rotationOffset="270" opacity="1">
           <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+          <attribute color="#000000" field="" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" priority="0" linePlacementFlags="2" placement="0" showAll="1" dist="0">
+      <DiagramLayerSettings placement="0" priority="0" linePlacementFlags="2" obstacle="0" dist="0" zIndex="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" value="true" type="bool"/>
-                <Option name="field" value="id" type="QString"/>
-                <Option name="type" value="2" type="int"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option name="type" value="collection" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -5875,8 +5875,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -5885,8 +5885,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -5895,45 +5895,45 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="type"/>
-        <alias index="2" name="" field="page"/>
+        <alias name="" field="id" index="0"/>
+        <alias name="" field="type" index="1"/>
+        <alias name="" field="page" index="2"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="type"/>
-        <default expression="" applyOnUpdate="0" field="page"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="type" expression=""/>
+        <default applyOnUpdate="0" field="page" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="id"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="type"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="page"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="id"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="type"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="page"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="page"/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="page" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column width="-1" hidden="1" type="actions"/>
-          <column name="id" width="-1" hidden="0" type="field"/>
-          <column name="type" width="-1" hidden="0" type="field"/>
-          <column name="page" width="-1" hidden="0" type="field"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="id" width="-1" hidden="0"/>
+          <column type="field" name="type" width="-1" hidden="0"/>
+          <column type="field" name="page" width="-1" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5964,9 +5964,9 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="page"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="page" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
         <field name="id" labelOnTop="0"/>
@@ -5977,7 +5977,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" readOnly="0" maxScale="100000" type="vector" minScale="1e+08" simplifyLocal="1" wkbType="Point" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" geometry="Point" simplifyDrawingHints="0" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" labelsEnabled="1">
+    <maplayer simplifyDrawingTol="1" readOnly="0" maxScale="100000" simplifyLocal="1" simplifyDrawingHints="0" labelsEnabled="1" geometry="Point" type="vector" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" simplifyMaxScale="1" minScale="1e+08" autoRefreshEnabled="0" refreshOnNotifyMessage="" wkbType="Point">
       <extent>
         <xmin>18.37523075794307204</xmin>
         <ymin>-33.94592961896692884</ymin>
@@ -6041,66 +6041,66 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" forceraster="0" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" enableorderby="0">
         <rules key="{436a5e05-3485-477a-80b7-cf4d12d6dcec}">
-          <rule symbol="0" label="Show in marshal overview" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" key="{308d81eb-cefa-4627-8afb-3baa8363f863}" description="Show in marshal overview"/>
-          <rule symbol="1" label="Show in marshal maps" filter="'marshal' = attribute( @atlas_feature , 'type' )" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" description="Show in marshal overview"/>
+          <rule symbol="0" key="{308d81eb-cefa-4627-8afb-3baa8363f863}" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" description="Show in marshal overview" label="Show in marshal overview"/>
+          <rule symbol="1" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" filter="'marshal' = attribute( @atlas_feature , 'type' )" description="Show in marshal overview" label="Show in marshal maps"/>
         </rules>
         <symbols>
-          <symbol name="0" alpha="0.792157" force_rhr="0" clip_to_extent="1" type="marker">
-            <layer enabled="1" pass="1" class="SimpleMarker" locked="0">
-              <prop v="0" k="angle"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="1" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol type="marker" name="0" force_rhr="0" clip_to_extent="1" alpha="0.792157">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="1">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="0,0,0,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="circle"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="0,0,0,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="1"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="0.01" force_rhr="0" clip_to_extent="1" type="marker">
-            <layer enabled="1" pass="1" class="SimpleMarker" locked="0">
-              <prop v="0" k="angle"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="0.1" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol type="marker" name="1" force_rhr="0" clip_to_extent="1" alpha="0.01">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="1">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="0,0,0,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="circle"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="0,0,0,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="0.1"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -6109,236 +6109,236 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{2ae987df-5ca1-46ae-98ed-9200336255e4}">
-          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' )" key="{e54a508a-81a6-4cf6-8730-e26900c5eed4}" description="Show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)">
+          <rule key="{e54a508a-81a6-4cf6-8730-e26900c5eed4}" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" description="Show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)">
             <settings>
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" fontSize="6" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="0.9" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="0" fontStrikeout="0" fieldName="position" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-                <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="0,0,0,255" shapeType="3" shapeJoinStyle="64" shapeRadiiY="0" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="0" shapeBorderWidth="0.1" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="0.5" shapeSVGFile="" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+              <text-style blendMode="0" fontSizeUnit="Point" isExpression="0" textOpacity="0.9" fontStrikeout="0" useSubstitutions="0" textColor="0,0,0,255" fontSize="6" fontUnderline="0" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fieldName="position" fontFamily="Myriad Pro" fontLetterSpacing="0" multilineHeight="1" namedStyle="Semibold" fontWeight="63" fontCapitals="0">
+                <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferSizeUnits="MM" bufferBlendMode="0" bufferDraw="0" bufferOpacity="1" bufferColor="255,255,255,255"/>
+                <background shapeOffsetX="0" shapeSVGFile="" shapeSizeType="0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeX="0" shapeRotation="0" shapeRadiiUnit="MM" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeOpacity="0.5" shapeBorderWidthUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeType="3" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeBorderWidth="0.1"/>
+                <shadow shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowUnder="0" shadowBlendMode="6"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-              <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="6" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="10" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="1" maxCurvedCharAngleIn="20" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-              <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="2" fontMinPixelSize="3" limitNumLabels="0" obstacle="0" scaleMin="1" scaleVisibility="0" obstacleFactor="1" fontMaxPixelSize="10000" obstacleType="0"/>
+              <text-format wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" reverseDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0"/>
+              <placement fitInPolygonOnly="0" repeatDistance="0" placement="6" priority="10" centroidWhole="0" placementFlags="10" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" maxCurvedCharAngleOut="-20" xOffset="0" yOffset="0" dist="1" centroidInside="0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
+              <rendering scaleVisibility="0" maxNumLabels="2000" fontLimitPixelSize="0" minFeatureSize="0" upsidedownLabels="0" displayAll="1" mergeLines="0" fontMinPixelSize="3" limitNumLabels="0" scaleMin="1" obstacleFactor="1" drawLabels="1" zIndex="2" obstacleType="0" labelPerPart="0" fontMaxPixelSize="10000" scaleMax="10000000" obstacle="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="FontStyle" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="FontStyle">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="ShapeFillColor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="Size" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="Size">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </settings>
           </rule>
-          <rule filter="'marshal' = attribute( @atlas_feature , 'type' )" key="{15f6f6e7-28e2-4602-9324-aa281e0f75d2}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" active="0">
+          <rule active="0" key="{15f6f6e7-28e2-4602-9324-aa281e0f75d2}" filter="'marshal' = attribute( @atlas_feature , 'type' )" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index">
             <settings>
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" fontSize="6" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="0.5" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="0" fontStrikeout="0" fieldName="position" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-                <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="0,0,0,255" shapeType="3" shapeJoinStyle="64" shapeRadiiY="0" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="0" shapeBorderWidth="0.4" shapeSizeY="0.2" shapeOffsetUnit="MM" shapeOpacity="0.5" shapeSVGFile="" shapeSizeX="0.2" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+              <text-style blendMode="0" fontSizeUnit="Point" isExpression="0" textOpacity="0.5" fontStrikeout="0" useSubstitutions="0" textColor="0,0,0,255" fontSize="6" fontUnderline="0" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fieldName="position" fontFamily="Myriad Pro" fontLetterSpacing="0" multilineHeight="1" namedStyle="Semibold" fontWeight="63" fontCapitals="0">
+                <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferSizeUnits="MM" bufferBlendMode="0" bufferDraw="0" bufferOpacity="1" bufferColor="255,255,255,255"/>
+                <background shapeOffsetX="0" shapeSVGFile="" shapeSizeType="0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeX="0.2" shapeRotation="0" shapeRadiiUnit="MM" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.2" shapeOpacity="0.5" shapeBorderWidthUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeType="3" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeBorderWidth="0.4"/>
+                <shadow shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowUnder="0" shadowBlendMode="6"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="1" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-              <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="6" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="8" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="0" maxCurvedCharAngleIn="20" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-              <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="5" fontMinPixelSize="3" limitNumLabels="0" obstacle="0" scaleMin="1" scaleVisibility="0" obstacleFactor="1.8" fontMaxPixelSize="10000" obstacleType="0"/>
+              <text-format wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" reverseDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0"/>
+              <placement fitInPolygonOnly="0" repeatDistance="0" placement="6" priority="8" centroidWhole="0" placementFlags="10" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" maxCurvedCharAngleOut="-20" xOffset="0" yOffset="0" dist="0" centroidInside="0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
+              <rendering scaleVisibility="0" maxNumLabels="2000" fontLimitPixelSize="0" minFeatureSize="0" upsidedownLabels="0" displayAll="1" mergeLines="0" fontMinPixelSize="3" limitNumLabels="0" scaleMin="1" obstacleFactor="1.8" drawLabels="1" zIndex="5" obstacleType="0" labelPerPart="0" fontMaxPixelSize="10000" scaleMax="10000000" obstacle="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="AlwaysShow" type="Map">
-                      <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 type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="AlwaysShow">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if ( @atlasfeature_id = $id, 1, 0)"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="FontOpacity" type="Map">
-                      <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 type="Map" name="FontOpacity">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="FontStyle" type="Map">
-                      <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 type="Map" name="FontStyle">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="ObstacleFactor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="ObstacleFactor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="Priority" type="Map">
-                      <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 type="Map" name="Priority">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 10.0, 8.0 )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <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 type="Map" name="ShapeFillColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="ShapeOpacity" type="Map">
-                      <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 type="Map" name="ShapeOpacity">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="Size" type="Map">
-                      <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 type="Map" name="Size">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 8, 6 )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="ZIndex" type="Map">
-                      <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 type="Map" name="ZIndex">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if ( @atlasfeature_id = $id, 15, 5 )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </settings>
           </rule>
-          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id" key="{cdcebdea-db24-4c71-ba1d-d8b1969c795e}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label">
+          <rule key="{cdcebdea-db24-4c71-ba1d-d8b1969c795e}" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label">
             <settings>
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" fontSize="6" namedStyle="Regular" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="0.6" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="0" fontStrikeout="0" fieldName="position" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="50" useSubstitutions="0">
-                <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="0,0,0,255" shapeType="3" shapeJoinStyle="64" shapeRadiiY="0" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="0" shapeBorderWidth="0.4" shapeSizeY="0.2" shapeOffsetUnit="MM" shapeOpacity="0.6" shapeSVGFile="" shapeSizeX="0.2" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+              <text-style blendMode="0" fontSizeUnit="Point" isExpression="0" textOpacity="0.6" fontStrikeout="0" useSubstitutions="0" textColor="0,0,0,255" fontSize="6" fontUnderline="0" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fieldName="position" fontFamily="Myriad Pro" fontLetterSpacing="0" multilineHeight="1" namedStyle="Regular" fontWeight="50" fontCapitals="0">
+                <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferSizeUnits="MM" bufferBlendMode="0" bufferDraw="0" bufferOpacity="1" bufferColor="255,255,255,255"/>
+                <background shapeOffsetX="0" shapeSVGFile="" shapeSizeType="0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeX="0.2" shapeRotation="0" shapeRadiiUnit="MM" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.2" shapeOpacity="0.6" shapeBorderWidthUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeType="3" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeBorderWidth="0.4"/>
+                <shadow shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowUnder="0" shadowBlendMode="6"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="1" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-              <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="6" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="8" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="0" maxCurvedCharAngleIn="20" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-              <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="5" fontMinPixelSize="3" limitNumLabels="0" obstacle="0" scaleMin="1" scaleVisibility="0" obstacleFactor="1.8" fontMaxPixelSize="10000" obstacleType="0"/>
+              <text-format wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" reverseDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0"/>
+              <placement fitInPolygonOnly="0" repeatDistance="0" placement="6" priority="8" centroidWhole="0" placementFlags="10" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" maxCurvedCharAngleOut="-20" xOffset="0" yOffset="0" dist="0" centroidInside="0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
+              <rendering scaleVisibility="0" maxNumLabels="2000" fontLimitPixelSize="0" minFeatureSize="0" upsidedownLabels="0" displayAll="1" mergeLines="0" fontMinPixelSize="3" limitNumLabels="0" scaleMin="1" obstacleFactor="1.8" drawLabels="1" zIndex="5" obstacleType="0" labelPerPart="0" fontMaxPixelSize="10000" scaleMax="10000000" obstacle="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="AlwaysShow" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="AlwaysShow">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="FontOpacity" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="FontOpacity">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="FontStyle" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="FontStyle">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="ObstacleFactor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="ObstacleFactor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="Priority" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="Priority">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="ShapeFillColor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="ShapeOpacity" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="ShapeOpacity">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="Size" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="Size">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="ZIndex" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="ZIndex">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </settings>
           </rule>
-          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" key="{6c4b06ee-4bb1-473c-9f00-dd1edfdcfcc8}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top">
+          <rule key="{6c4b06ee-4bb1-473c-9f00-dd1edfdcfcc8}" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top">
             <settings>
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" fontSize="8" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="0.9" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="0" fontStrikeout="0" fieldName="position" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-                <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="0,0,0,255" shapeType="3" shapeJoinStyle="64" shapeRadiiY="0" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,0,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="0" shapeBorderWidth="0.4" shapeSizeY="0.2" shapeOffsetUnit="MM" shapeOpacity="0.9" shapeSVGFile="" shapeSizeX="0.2" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+              <text-style blendMode="0" fontSizeUnit="Point" isExpression="0" textOpacity="0.9" fontStrikeout="0" useSubstitutions="0" textColor="0,0,0,255" fontSize="8" fontUnderline="0" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fieldName="position" fontFamily="Myriad Pro" fontLetterSpacing="0" multilineHeight="1" namedStyle="Semibold" fontWeight="63" fontCapitals="0">
+                <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferSizeUnits="MM" bufferBlendMode="0" bufferDraw="0" bufferOpacity="1" bufferColor="255,255,255,255"/>
+                <background shapeOffsetX="0" shapeSVGFile="" shapeSizeType="0" shapeSizeUnit="MM" shapeFillColor="255,255,0,255" shapeRadiiY="0" shapeSizeX="0.2" shapeRotation="0" shapeRadiiUnit="MM" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.2" shapeOpacity="0.9" shapeBorderWidthUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeType="3" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeBorderWidth="0.4"/>
+                <shadow shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowUnder="0" shadowBlendMode="6"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="1" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-              <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="0" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="10" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="0" maxCurvedCharAngleIn="20" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-              <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="10" fontMinPixelSize="3" limitNumLabels="0" obstacle="0" scaleMin="1" scaleVisibility="0" obstacleFactor="1.8" fontMaxPixelSize="10000" obstacleType="0"/>
+              <text-format wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" reverseDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0"/>
+              <placement fitInPolygonOnly="0" repeatDistance="0" placement="0" priority="10" centroidWhole="0" placementFlags="10" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" maxCurvedCharAngleOut="-20" xOffset="0" yOffset="0" dist="0" centroidInside="0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
+              <rendering scaleVisibility="0" maxNumLabels="2000" fontLimitPixelSize="0" minFeatureSize="0" upsidedownLabels="0" displayAll="1" mergeLines="0" fontMinPixelSize="3" limitNumLabels="0" scaleMin="1" obstacleFactor="1.8" drawLabels="1" zIndex="10" obstacleType="0" labelPerPart="0" fontMaxPixelSize="10000" scaleMax="10000000" obstacle="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="AlwaysShow" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="AlwaysShow">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="FontOpacity" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="FontOpacity">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="FontStyle" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="FontStyle">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="ObstacleFactor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="ObstacleFactor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="Priority" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="Priority">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="ShapeFillColor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="ShapeOpacity" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="ShapeOpacity">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="Size" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="Size">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="ZIndex" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="ZIndex">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </settings>
@@ -6346,161 +6346,161 @@ def my_form_open(dialog, layer, feature):
         </rules>
       </labeling>
       <customproperties>
-        <property value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
-        <property value="false" key="labeling/addDirectionSymbol"/>
-        <property value="0" key="labeling/angleOffset"/>
-        <property value="0" key="labeling/blendMode"/>
-        <property value="0" key="labeling/bufferBlendMode"/>
-        <property value="255" key="labeling/bufferColorA"/>
-        <property value="255" key="labeling/bufferColorB"/>
-        <property value="255" key="labeling/bufferColorG"/>
-        <property value="255" key="labeling/bufferColorR"/>
-        <property value="false" key="labeling/bufferDraw"/>
-        <property value="64" key="labeling/bufferJoinStyle"/>
-        <property value="false" key="labeling/bufferNoFill"/>
-        <property value="1" key="labeling/bufferSize"/>
-        <property value="false" key="labeling/bufferSizeInMapUnits"/>
-        <property value="0,0,0,0,0,0" key="labeling/bufferSizeMapUnitScale"/>
-        <property value="0" key="labeling/bufferTransp"/>
-        <property value="false" key="labeling/centroidInside"/>
-        <property value="false" key="labeling/centroidWhole"/>
-        <property value="3" key="labeling/decimals"/>
-        <property value="false" key="labeling/displayAll"/>
-        <property value="0" key="labeling/dist"/>
-        <property value="false" key="labeling/distInMapUnits"/>
-        <property value="0,0,0,0,0,0" key="labeling/distMapUnitScale"/>
-        <property value="false" key="labeling/drawLabels"/>
-        <property value="false" key="labeling/enabled"/>
-        <property value="position" key="labeling/fieldName"/>
-        <property value="false" key="labeling/fitInPolygonOnly"/>
-        <property value="0" key="labeling/fontCapitals"/>
-        <property value="Myriad Pro" key="labeling/fontFamily"/>
-        <property value="false" key="labeling/fontItalic"/>
-        <property value="0" key="labeling/fontLetterSpacing"/>
-        <property value="false" key="labeling/fontLimitPixelSize"/>
-        <property value="10000" key="labeling/fontMaxPixelSize"/>
-        <property value="3" key="labeling/fontMinPixelSize"/>
-        <property value="10" key="labeling/fontSize"/>
-        <property value="false" key="labeling/fontSizeInMapUnits"/>
-        <property value="0,0,0,0,0,0" key="labeling/fontSizeMapUnitScale"/>
-        <property value="false" key="labeling/fontStrikeout"/>
-        <property value="false" key="labeling/fontUnderline"/>
-        <property value="63" key="labeling/fontWeight"/>
-        <property value="0" key="labeling/fontWordSpacing"/>
-        <property value="false" key="labeling/formatNumbers"/>
-        <property value="false" key="labeling/isExpression"/>
-        <property value="true" key="labeling/labelOffsetInMapUnits"/>
-        <property value="0,0,0,0,0,0" key="labeling/labelOffsetMapUnitScale"/>
-        <property value="false" key="labeling/labelPerPart"/>
-        <property value="&lt;" key="labeling/leftDirectionSymbol"/>
-        <property value="false" key="labeling/limitNumLabels"/>
-        <property value="20" key="labeling/maxCurvedCharAngleIn"/>
-        <property value="-20" key="labeling/maxCurvedCharAngleOut"/>
-        <property value="2000" key="labeling/maxNumLabels"/>
-        <property value="false" key="labeling/mergeLines"/>
-        <property value="0" key="labeling/minFeatureSize"/>
-        <property value="0" key="labeling/multilineAlign"/>
-        <property value="1" key="labeling/multilineHeight"/>
-        <property value="Semibold" key="labeling/namedStyle"/>
-        <property value="true" key="labeling/obstacle"/>
-        <property value="1" key="labeling/obstacleFactor"/>
-        <property value="0" key="labeling/obstacleType"/>
-        <property value="0" key="labeling/offsetType"/>
-        <property value="0" key="labeling/placeDirectionSymbol"/>
-        <property value="0" key="labeling/placement"/>
-        <property value="10" key="labeling/placementFlags"/>
-        <property value="false" key="labeling/plussign"/>
-        <property value="TR,TL,BR,BL,R,L,TSR,BSR" key="labeling/predefinedPositionOrder"/>
-        <property value="true" key="labeling/preserveRotation"/>
-        <property value="#ffffff" key="labeling/previewBkgrdColor"/>
-        <property value="5" key="labeling/priority"/>
-        <property value="4" key="labeling/quadOffset"/>
-        <property value="0" key="labeling/repeatDistance"/>
-        <property value="0,0,0,0,0,0" key="labeling/repeatDistanceMapUnitScale"/>
-        <property value="1" key="labeling/repeatDistanceUnit"/>
-        <property value="false" key="labeling/reverseDirectionSymbol"/>
-        <property value=">" key="labeling/rightDirectionSymbol"/>
-        <property value="10000000" key="labeling/scaleMax"/>
-        <property value="1" key="labeling/scaleMin"/>
-        <property value="false" key="labeling/scaleVisibility"/>
-        <property value="6" key="labeling/shadowBlendMode"/>
-        <property value="0" key="labeling/shadowColorB"/>
-        <property value="0" key="labeling/shadowColorG"/>
-        <property value="0" key="labeling/shadowColorR"/>
-        <property value="false" key="labeling/shadowDraw"/>
-        <property value="135" key="labeling/shadowOffsetAngle"/>
-        <property value="1" key="labeling/shadowOffsetDist"/>
-        <property value="true" key="labeling/shadowOffsetGlobal"/>
-        <property value="0,0,0,0,0,0" key="labeling/shadowOffsetMapUnitScale"/>
-        <property value="1" key="labeling/shadowOffsetUnits"/>
-        <property value="1.5" key="labeling/shadowRadius"/>
-        <property value="false" key="labeling/shadowRadiusAlphaOnly"/>
-        <property value="0,0,0,0,0,0" key="labeling/shadowRadiusMapUnitScale"/>
-        <property value="1" key="labeling/shadowRadiusUnits"/>
-        <property value="100" key="labeling/shadowScale"/>
-        <property value="30" key="labeling/shadowTransparency"/>
-        <property value="0" key="labeling/shadowUnder"/>
-        <property value="0" key="labeling/shapeBlendMode"/>
-        <property value="255" key="labeling/shapeBorderColorA"/>
-        <property value="128" key="labeling/shapeBorderColorB"/>
-        <property value="128" key="labeling/shapeBorderColorG"/>
-        <property value="128" key="labeling/shapeBorderColorR"/>
-        <property value="0" key="labeling/shapeBorderWidth"/>
-        <property value="0,0,0,0,0,0" key="labeling/shapeBorderWidthMapUnitScale"/>
-        <property value="1" key="labeling/shapeBorderWidthUnits"/>
-        <property value="true" key="labeling/shapeDraw"/>
-        <property value="255" key="labeling/shapeFillColorA"/>
-        <property value="138" key="labeling/shapeFillColorB"/>
-        <property value="0" key="labeling/shapeFillColorG"/>
-        <property value="101" key="labeling/shapeFillColorR"/>
-        <property value="64" key="labeling/shapeJoinStyle"/>
-        <property value="0,0,0,0,0,0" key="labeling/shapeOffsetMapUnitScale"/>
-        <property value="1" key="labeling/shapeOffsetUnits"/>
-        <property value="0" key="labeling/shapeOffsetX"/>
-        <property value="0" key="labeling/shapeOffsetY"/>
-        <property value="0,0,0,0,0,0" key="labeling/shapeRadiiMapUnitScale"/>
-        <property value="1" key="labeling/shapeRadiiUnits"/>
-        <property value="0" key="labeling/shapeRadiiX"/>
-        <property value="0" key="labeling/shapeRadiiY"/>
-        <property value="0" key="labeling/shapeRotation"/>
-        <property value="0" key="labeling/shapeRotationType"/>
-        <property value="" key="labeling/shapeSVGFile"/>
-        <property value="0,0,0,0,0,0" key="labeling/shapeSizeMapUnitScale"/>
-        <property value="0" key="labeling/shapeSizeType"/>
-        <property value="1" key="labeling/shapeSizeUnits"/>
-        <property value="0" key="labeling/shapeSizeX"/>
-        <property value="0" key="labeling/shapeSizeY"/>
-        <property value="0" key="labeling/shapeTransparency"/>
-        <property value="0" key="labeling/shapeType"/>
-        <property value="255" key="labeling/textColorA"/>
-        <property value="255" key="labeling/textColorB"/>
-        <property value="255" key="labeling/textColorG"/>
-        <property value="255" key="labeling/textColorR"/>
-        <property value="0" key="labeling/textTransp"/>
-        <property value="0" key="labeling/upsidedownLabels"/>
-        <property value="" key="labeling/wrapChar"/>
-        <property value="0" key="labeling/xOffset"/>
-        <property value="0" key="labeling/yOffset"/>
-        <property value="0" key="labeling/zIndex"/>
+        <property key="dualview/previewExpressions" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+        <property key="embeddedWidgets/count" value="0"/>
+        <property key="labeling/addDirectionSymbol" value="false"/>
+        <property key="labeling/angleOffset" value="0"/>
+        <property key="labeling/blendMode" value="0"/>
+        <property key="labeling/bufferBlendMode" value="0"/>
+        <property key="labeling/bufferColorA" value="255"/>
+        <property key="labeling/bufferColorB" value="255"/>
+        <property key="labeling/bufferColorG" value="255"/>
+        <property key="labeling/bufferColorR" value="255"/>
+        <property key="labeling/bufferDraw" value="false"/>
+        <property key="labeling/bufferJoinStyle" value="64"/>
+        <property key="labeling/bufferNoFill" value="false"/>
+        <property key="labeling/bufferSize" value="1"/>
+        <property key="labeling/bufferSizeInMapUnits" value="false"/>
+        <property key="labeling/bufferSizeMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/bufferTransp" value="0"/>
+        <property key="labeling/centroidInside" value="false"/>
+        <property key="labeling/centroidWhole" value="false"/>
+        <property key="labeling/decimals" value="3"/>
+        <property key="labeling/displayAll" value="false"/>
+        <property key="labeling/dist" value="0"/>
+        <property key="labeling/distInMapUnits" value="false"/>
+        <property key="labeling/distMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/drawLabels" value="false"/>
+        <property key="labeling/enabled" value="false"/>
+        <property key="labeling/fieldName" value="position"/>
+        <property key="labeling/fitInPolygonOnly" value="false"/>
+        <property key="labeling/fontCapitals" value="0"/>
+        <property key="labeling/fontFamily" value="Myriad Pro"/>
+        <property key="labeling/fontItalic" value="false"/>
+        <property key="labeling/fontLetterSpacing" value="0"/>
+        <property key="labeling/fontLimitPixelSize" value="false"/>
+        <property key="labeling/fontMaxPixelSize" value="10000"/>
+        <property key="labeling/fontMinPixelSize" value="3"/>
+        <property key="labeling/fontSize" value="10"/>
+        <property key="labeling/fontSizeInMapUnits" value="false"/>
+        <property key="labeling/fontSizeMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/fontStrikeout" value="false"/>
+        <property key="labeling/fontUnderline" value="false"/>
+        <property key="labeling/fontWeight" value="63"/>
+        <property key="labeling/fontWordSpacing" value="0"/>
+        <property key="labeling/formatNumbers" value="false"/>
+        <property key="labeling/isExpression" value="false"/>
+        <property key="labeling/labelOffsetInMapUnits" value="true"/>
+        <property key="labeling/labelOffsetMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/labelPerPart" value="false"/>
+        <property key="labeling/leftDirectionSymbol" value="&lt;"/>
+        <property key="labeling/limitNumLabels" value="false"/>
+        <property key="labeling/maxCurvedCharAngleIn" value="20"/>
+        <property key="labeling/maxCurvedCharAngleOut" value="-20"/>
+        <property key="labeling/maxNumLabels" value="2000"/>
+        <property key="labeling/mergeLines" value="false"/>
+        <property key="labeling/minFeatureSize" value="0"/>
+        <property key="labeling/multilineAlign" value="0"/>
+        <property key="labeling/multilineHeight" value="1"/>
+        <property key="labeling/namedStyle" value="Semibold"/>
+        <property key="labeling/obstacle" value="true"/>
+        <property key="labeling/obstacleFactor" value="1"/>
+        <property key="labeling/obstacleType" value="0"/>
+        <property key="labeling/offsetType" value="0"/>
+        <property key="labeling/placeDirectionSymbol" value="0"/>
+        <property key="labeling/placement" value="0"/>
+        <property key="labeling/placementFlags" value="10"/>
+        <property key="labeling/plussign" value="false"/>
+        <property key="labeling/predefinedPositionOrder" value="TR,TL,BR,BL,R,L,TSR,BSR"/>
+        <property key="labeling/preserveRotation" value="true"/>
+        <property key="labeling/previewBkgrdColor" value="#ffffff"/>
+        <property key="labeling/priority" value="5"/>
+        <property key="labeling/quadOffset" value="4"/>
+        <property key="labeling/repeatDistance" value="0"/>
+        <property key="labeling/repeatDistanceMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/repeatDistanceUnit" value="1"/>
+        <property key="labeling/reverseDirectionSymbol" value="false"/>
+        <property key="labeling/rightDirectionSymbol" value=">"/>
+        <property key="labeling/scaleMax" value="10000000"/>
+        <property key="labeling/scaleMin" value="1"/>
+        <property key="labeling/scaleVisibility" value="false"/>
+        <property key="labeling/shadowBlendMode" value="6"/>
+        <property key="labeling/shadowColorB" value="0"/>
+        <property key="labeling/shadowColorG" value="0"/>
+        <property key="labeling/shadowColorR" value="0"/>
+        <property key="labeling/shadowDraw" value="false"/>
+        <property key="labeling/shadowOffsetAngle" value="135"/>
+        <property key="labeling/shadowOffsetDist" value="1"/>
+        <property key="labeling/shadowOffsetGlobal" value="true"/>
+        <property key="labeling/shadowOffsetMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/shadowOffsetUnits" value="1"/>
+        <property key="labeling/shadowRadius" value="1.5"/>
+        <property key="labeling/shadowRadiusAlphaOnly" value="false"/>
+        <property key="labeling/shadowRadiusMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/shadowRadiusUnits" value="1"/>
+        <property key="labeling/shadowScale" value="100"/>
+        <property key="labeling/shadowTransparency" value="30"/>
+        <property key="labeling/shadowUnder" value="0"/>
+        <property key="labeling/shapeBlendMode" value="0"/>
+        <property key="labeling/shapeBorderColorA" value="255"/>
+        <property key="labeling/shapeBorderColorB" value="128"/>
+        <property key="labeling/shapeBorderColorG" value="128"/>
+        <property key="labeling/shapeBorderColorR" value="128"/>
+        <property key="labeling/shapeBorderWidth" value="0"/>
+        <property key="labeling/shapeBorderWidthMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/shapeBorderWidthUnits" value="1"/>
+        <property key="labeling/shapeDraw" value="true"/>
+        <property key="labeling/shapeFillColorA" value="255"/>
+        <property key="labeling/shapeFillColorB" value="138"/>
+        <property key="labeling/shapeFillColorG" value="0"/>
+        <property key="labeling/shapeFillColorR" value="101"/>
+        <property key="labeling/shapeJoinStyle" value="64"/>
+        <property key="labeling/shapeOffsetMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/shapeOffsetUnits" value="1"/>
+        <property key="labeling/shapeOffsetX" value="0"/>
+        <property key="labeling/shapeOffsetY" value="0"/>
+        <property key="labeling/shapeRadiiMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/shapeRadiiUnits" value="1"/>
+        <property key="labeling/shapeRadiiX" value="0"/>
+        <property key="labeling/shapeRadiiY" value="0"/>
+        <property key="labeling/shapeRotation" value="0"/>
+        <property key="labeling/shapeRotationType" value="0"/>
+        <property key="labeling/shapeSVGFile" value=""/>
+        <property key="labeling/shapeSizeMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/shapeSizeType" value="0"/>
+        <property key="labeling/shapeSizeUnits" value="1"/>
+        <property key="labeling/shapeSizeX" value="0"/>
+        <property key="labeling/shapeSizeY" value="0"/>
+        <property key="labeling/shapeTransparency" value="0"/>
+        <property key="labeling/shapeType" value="0"/>
+        <property key="labeling/textColorA" value="255"/>
+        <property key="labeling/textColorB" value="255"/>
+        <property key="labeling/textColorG" value="255"/>
+        <property key="labeling/textColorR" value="255"/>
+        <property key="labeling/textTransp" value="0"/>
+        <property key="labeling/upsidedownLabels" value="0"/>
+        <property key="labeling/wrapChar" value=""/>
+        <property key="labeling/xOffset" value="0"/>
+        <property key="labeling/yOffset" value="0"/>
+        <property key="labeling/zIndex" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minimumSize="0" opacity="1" penAlpha="255" penColor="#000000" enabled="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeType="MM" diagramOrientation="Up" labelPlacementMethod="XHeight" scaleBasedVisibility="0" width="15" minScaleDenominator="100000" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" barWidth="5" backgroundAlpha="255" lineSizeType="MM" penWidth="0">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory diagramOrientation="Up" minScaleDenominator="100000" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penColor="#000000" backgroundAlpha="255" barWidth="5" backgroundColor="#ffffff" lineSizeType="MM" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" height="15" scaleBasedVisibility="0" minimumSize="0" penAlpha="255" maxScaleDenominator="1e+08" penWidth="0" enabled="0" width="15" rotationOffset="270" opacity="1">
           <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+          <attribute color="#000000" field="" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" priority="0" linePlacementFlags="2" placement="0" showAll="1" dist="0">
+      <DiagramLayerSettings placement="0" priority="0" linePlacementFlags="2" obstacle="0" dist="0" zIndex="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -6513,8 +6513,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -6523,8 +6523,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="false" type="bool"/>
-                <Option name="UseHtml" value="false" type="bool"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6533,8 +6533,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="false" type="bool"/>
-                <Option name="UseHtml" value="false" type="bool"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6543,8 +6543,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -6553,8 +6553,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -6563,8 +6563,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -6580,8 +6580,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -6590,8 +6590,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -6633,92 +6633,92 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <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="oldpositio"/>
-        <alias index="5" name="" field="xyposition"/>
-        <alias index="6" name="" field="csv_positi"/>
-        <alias index="7" name="" field="csv_name"/>
-        <alias index="8" name="" field="csv_club"/>
-        <alias index="9" name="" field="csv_captai"/>
-        <alias index="10" name="" field="csv_capt_1"/>
-        <alias index="11" name="" field="csv_first_"/>
-        <alias index="12" name="" field="csv_last_r"/>
-        <alias index="13" name="" field="csv_instru"/>
+        <alias name="" field="id" index="0"/>
+        <alias name="" field="position" index="1"/>
+        <alias name="" field="type" index="2"/>
+        <alias name="" field="notes" index="3"/>
+        <alias name="" field="oldpositio" index="4"/>
+        <alias name="" field="xyposition" index="5"/>
+        <alias name="" field="csv_positi" index="6"/>
+        <alias name="" field="csv_name" index="7"/>
+        <alias name="" field="csv_club" index="8"/>
+        <alias name="" field="csv_captai" index="9"/>
+        <alias name="" field="csv_capt_1" index="10"/>
+        <alias name="" field="csv_first_" index="11"/>
+        <alias name="" field="csv_last_r" index="12"/>
+        <alias name="" field="csv_instru" index="13"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <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="oldpositio"/>
-        <default expression="" applyOnUpdate="0" field="xyposition"/>
-        <default expression="" applyOnUpdate="0" field="csv_positi"/>
-        <default expression="" applyOnUpdate="0" field="csv_name"/>
-        <default expression="" applyOnUpdate="0" field="csv_club"/>
-        <default expression="" applyOnUpdate="0" field="csv_captai"/>
-        <default expression="" applyOnUpdate="0" field="csv_capt_1"/>
-        <default expression="" applyOnUpdate="0" field="csv_first_"/>
-        <default expression="" applyOnUpdate="0" field="csv_last_r"/>
-        <default expression="" applyOnUpdate="0" field="csv_instru"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="position" expression=""/>
+        <default applyOnUpdate="0" field="type" expression=""/>
+        <default applyOnUpdate="0" field="notes" expression=""/>
+        <default applyOnUpdate="0" field="oldpositio" expression=""/>
+        <default applyOnUpdate="0" field="xyposition" expression=""/>
+        <default applyOnUpdate="0" field="csv_positi" expression=""/>
+        <default applyOnUpdate="0" field="csv_name" expression=""/>
+        <default applyOnUpdate="0" field="csv_club" expression=""/>
+        <default applyOnUpdate="0" field="csv_captai" expression=""/>
+        <default applyOnUpdate="0" field="csv_capt_1" expression=""/>
+        <default applyOnUpdate="0" field="csv_first_" expression=""/>
+        <default applyOnUpdate="0" field="csv_last_r" expression=""/>
+        <default applyOnUpdate="0" field="csv_instru" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="id"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="position"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="type"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="notes"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="oldpositio"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="xyposition"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="csv_positi"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="csv_name"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="csv_club"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="csv_captai"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="csv_capt_1"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="csv_first_"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="csv_last_r"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="csv_instru"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="id"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="position"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="type"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="notes"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="oldpositio"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="xyposition"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="csv_positi"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="csv_name"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="csv_club"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="csv_captai"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="csv_capt_1"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="csv_first_"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="csv_last_r"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="csv_instru"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="position"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="notes"/>
-        <constraint desc="" exp="" field="oldpositio"/>
-        <constraint desc="" exp="" field="xyposition"/>
-        <constraint desc="" exp="" field="csv_positi"/>
-        <constraint desc="" exp="" field="csv_name"/>
-        <constraint desc="" exp="" field="csv_club"/>
-        <constraint desc="" exp="" field="csv_captai"/>
-        <constraint desc="" exp="" field="csv_capt_1"/>
-        <constraint desc="" exp="" field="csv_first_"/>
-        <constraint desc="" exp="" field="csv_last_r"/>
-        <constraint desc="" exp="" field="csv_instru"/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="position" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="notes" exp=""/>
+        <constraint desc="" field="oldpositio" exp=""/>
+        <constraint desc="" field="xyposition" exp=""/>
+        <constraint desc="" field="csv_positi" exp=""/>
+        <constraint desc="" field="csv_name" exp=""/>
+        <constraint desc="" field="csv_club" exp=""/>
+        <constraint desc="" field="csv_captai" exp=""/>
+        <constraint desc="" field="csv_capt_1" exp=""/>
+        <constraint desc="" field="csv_first_" exp=""/>
+        <constraint desc="" field="csv_last_r" exp=""/>
+        <constraint desc="" field="csv_instru" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;position&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;position&quot;" sortOrder="0">
         <columns>
-          <column name="id" width="-1" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column name="position" width="-1" hidden="0" type="field"/>
-          <column name="type" width="-1" hidden="0" type="field"/>
-          <column name="notes" width="-1" hidden="0" type="field"/>
-          <column name="oldpositio" width="-1" hidden="0" type="field"/>
-          <column name="xyposition" width="-1" hidden="0" type="field"/>
-          <column name="csv_name" width="-1" hidden="0" type="field"/>
-          <column name="csv_club" width="-1" hidden="0" type="field"/>
-          <column name="csv_positi" width="-1" hidden="0" type="field"/>
-          <column name="csv_captai" width="-1" hidden="0" type="field"/>
-          <column name="csv_capt_1" width="-1" hidden="0" type="field"/>
-          <column name="csv_first_" width="-1" hidden="0" type="field"/>
-          <column name="csv_last_r" width="-1" hidden="0" type="field"/>
-          <column name="csv_instru" width="-1" hidden="0" type="field"/>
+          <column type="field" name="id" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="position" width="-1" hidden="0"/>
+          <column type="field" name="type" width="-1" hidden="0"/>
+          <column type="field" name="notes" width="-1" hidden="0"/>
+          <column type="field" name="oldpositio" width="-1" hidden="0"/>
+          <column type="field" name="xyposition" width="-1" hidden="0"/>
+          <column type="field" name="csv_name" width="-1" hidden="0"/>
+          <column type="field" name="csv_club" width="-1" hidden="0"/>
+          <column type="field" name="csv_positi" width="-1" hidden="0"/>
+          <column type="field" name="csv_captai" width="-1" hidden="0"/>
+          <column type="field" name="csv_capt_1" width="-1" hidden="0"/>
+          <column type="field" name="csv_first_" width="-1" hidden="0"/>
+          <column type="field" name="csv_last_r" width="-1" hidden="0"/>
+          <column type="field" name="csv_instru" width="-1" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6749,29 +6749,29 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="csv_10_distance"/>
-        <field editable="0" name="csv_21_distance"/>
-        <field editable="0" name="csv_Description"/>
-        <field editable="0" name="csv_captain"/>
-        <field editable="0" name="csv_captain_number"/>
-        <field editable="0" name="csv_captain_phone"/>
-        <field editable="0" name="csv_club"/>
-        <field editable="0" name="csv_email"/>
-        <field editable="0" name="csv_first runner"/>
-        <field editable="0" name="csv_first_runner"/>
-        <field editable="0" name="csv_instructions"/>
-        <field editable="0" name="csv_last runner"/>
-        <field editable="0" name="csv_last_runner"/>
-        <field editable="0" name="csv_name"/>
-        <field editable="0" name="csv_phone"/>
-        <field editable="0" name="csv_position"/>
-        <field editable="0" name="csv_races"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="notes"/>
-        <field editable="1" name="oldpositio"/>
-        <field editable="1" name="position"/>
-        <field editable="1" name="type"/>
-        <field editable="1" name="xyposition"/>
+        <field name="csv_10_distance" editable="0"/>
+        <field name="csv_21_distance" editable="0"/>
+        <field name="csv_Description" editable="0"/>
+        <field name="csv_captain" editable="0"/>
+        <field name="csv_captain_number" editable="0"/>
+        <field name="csv_captain_phone" editable="0"/>
+        <field name="csv_club" editable="0"/>
+        <field name="csv_email" editable="0"/>
+        <field name="csv_first runner" editable="0"/>
+        <field name="csv_first_runner" editable="0"/>
+        <field name="csv_instructions" editable="0"/>
+        <field name="csv_last runner" editable="0"/>
+        <field name="csv_last_runner" editable="0"/>
+        <field name="csv_name" editable="0"/>
+        <field name="csv_phone" editable="0"/>
+        <field name="csv_position" editable="0"/>
+        <field name="csv_races" editable="0"/>
+        <field name="id" editable="1"/>
+        <field name="notes" editable="1"/>
+        <field name="oldpositio" editable="1"/>
+        <field name="position" editable="1"/>
+        <field name="type" editable="1"/>
+        <field name="xyposition" editable="1"/>
       </editable>
       <labelOnTop>
         <field name="csv_10_distance" labelOnTop="0"/>
@@ -6845,7 +6845,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer styleCategories="AllStyleCategories" minScale="1e+08" wkbType="NoGeometry" refreshOnNotifyMessage="" geometry="No geometry" hasScaleBasedVisibilityFlag="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" type="vector" autoRefreshTime="0">
+    <maplayer autoRefreshTime="0" maxScale="100000" type="vector" autoRefreshEnabled="0" geometry="No geometry" hasScaleBasedVisibilityFlag="0" minScale="1e+08" readOnly="0" refreshOnNotifyMessage="" wkbType="NoGeometry" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories">
       <id>marshals_by_position20161003112326575</id>
       <datasource>file:./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes</datasource>
       <keywordList>
@@ -6896,7 +6896,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" maxx="0" minz="0" miny="0" crs="" dimensions="2" maxz="0" minx="0"/>
+          <spatial maxy="0" maxz="0" maxx="0" minx="0" minz="0" dimensions="2" crs="" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -6909,8 +6909,8 @@ def my_form_open(dialog, layer, feature):
       <vectorjoins/>
       <layerDependencies/>
       <dataDependencies>
-        <layer id="all_routes20170907054841602"/>
         <layer id="marshal_positions20160930121322287"/>
+        <layer id="all_routes20170907054841602"/>
       </dataDependencies>
       <legend type="default-vector"/>
       <expressionfields/>
@@ -6924,8 +6924,8 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties>
-        <property value="first_name" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="dualview/previewExpressions" value="first_name"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
@@ -6938,8 +6938,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -6962,8 +6962,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -6972,8 +6972,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -6982,8 +6982,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -6992,8 +6992,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -7002,8 +7002,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -7019,8 +7019,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -7048,87 +7048,87 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="position"/>
-        <alias index="1" name="" field="firstname"/>
-        <alias index="2" name="" field="surname"/>
-        <alias index="3" name="" field="name"/>
-        <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="races"/>
-        <alias index="10" name="" field="first_runner"/>
-        <alias index="11" name="" field="last_runner"/>
-        <alias index="12" name="" field="instructions"/>
+        <alias name="" field="position" index="0"/>
+        <alias name="" field="firstname" index="1"/>
+        <alias name="" field="surname" index="2"/>
+        <alias name="" field="name" index="3"/>
+        <alias name="" field="club" index="4"/>
+        <alias name="" field="phone" index="5"/>
+        <alias name="" field="email" index="6"/>
+        <alias name="" field="captain" index="7"/>
+        <alias name="" field="captain_phone" index="8"/>
+        <alias name="" field="races" index="9"/>
+        <alias name="" field="first_runner" index="10"/>
+        <alias name="" field="last_runner" index="11"/>
+        <alias name="" field="instructions" index="12"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="position"/>
-        <default expression="" applyOnUpdate="0" field="firstname"/>
-        <default expression="" applyOnUpdate="0" field="surname"/>
-        <default expression="" applyOnUpdate="0" field="name"/>
-        <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="races"/>
-        <default expression="" applyOnUpdate="0" field="first_runner"/>
-        <default expression="" applyOnUpdate="0" field="last_runner"/>
-        <default expression="" applyOnUpdate="0" field="instructions"/>
+        <default applyOnUpdate="0" field="position" expression=""/>
+        <default applyOnUpdate="0" field="firstname" expression=""/>
+        <default applyOnUpdate="0" field="surname" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="club" expression=""/>
+        <default applyOnUpdate="0" field="phone" expression=""/>
+        <default applyOnUpdate="0" field="email" expression=""/>
+        <default applyOnUpdate="0" field="captain" expression=""/>
+        <default applyOnUpdate="0" field="captain_phone" expression=""/>
+        <default applyOnUpdate="0" field="races" expression=""/>
+        <default applyOnUpdate="0" field="first_runner" expression=""/>
+        <default applyOnUpdate="0" field="last_runner" expression=""/>
+        <default applyOnUpdate="0" field="instructions" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="position"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="firstname"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="surname"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="name"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="club"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="phone"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="email"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="captain"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="captain_phone"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="races"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="first_runner"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="last_runner"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="instructions"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="position"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="firstname"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="surname"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="name"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="club"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="phone"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="email"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="captain"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="captain_phone"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="races"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="first_runner"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="last_runner"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="instructions"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="position"/>
-        <constraint desc="" exp="" field="firstname"/>
-        <constraint desc="" exp="" field="surname"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="club"/>
-        <constraint desc="" exp="" field="phone"/>
-        <constraint desc="" exp="" field="email"/>
-        <constraint desc="" exp="" field="captain"/>
-        <constraint desc="" exp="" field="captain_phone"/>
-        <constraint desc="" exp="" field="races"/>
-        <constraint desc="" exp="" field="first_runner"/>
-        <constraint desc="" exp="" field="last_runner"/>
-        <constraint desc="" exp="" field="instructions"/>
+        <constraint desc="" field="position" exp=""/>
+        <constraint desc="" field="firstname" exp=""/>
+        <constraint desc="" field="surname" exp=""/>
+        <constraint desc="" field="name" exp=""/>
+        <constraint desc="" field="club" exp=""/>
+        <constraint desc="" field="phone" exp=""/>
+        <constraint desc="" field="email" exp=""/>
+        <constraint desc="" field="captain" exp=""/>
+        <constraint desc="" field="captain_phone" exp=""/>
+        <constraint desc="" field="races" exp=""/>
+        <constraint desc="" field="first_runner" exp=""/>
+        <constraint desc="" field="last_runner" exp=""/>
+        <constraint desc="" field="instructions" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column name="position" width="-1" hidden="0" type="field"/>
-          <column name="name" width="-1" hidden="0" type="field"/>
-          <column name="club" width="-1" hidden="0" type="field"/>
-          <column name="phone" width="-1" hidden="0" type="field"/>
-          <column name="email" width="-1" hidden="0" type="field"/>
-          <column name="captain" width="-1" hidden="0" type="field"/>
-          <column name="races" width="-1" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column name="first_runner" width="-1" hidden="0" type="field"/>
-          <column name="last_runner" width="-1" hidden="0" type="field"/>
-          <column name="instructions" width="-1" hidden="0" type="field"/>
-          <column name="firstname" width="-1" hidden="0" type="field"/>
-          <column name="surname" width="-1" hidden="0" type="field"/>
-          <column name="captain_phone" width="-1" hidden="0" type="field"/>
+          <column type="field" name="position" width="-1" hidden="0"/>
+          <column type="field" name="name" width="-1" hidden="0"/>
+          <column type="field" name="club" width="-1" hidden="0"/>
+          <column type="field" name="phone" width="-1" hidden="0"/>
+          <column type="field" name="email" width="-1" hidden="0"/>
+          <column type="field" name="captain" width="-1" hidden="0"/>
+          <column type="field" name="races" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="first_runner" width="-1" hidden="0"/>
+          <column type="field" name="last_runner" width="-1" hidden="0"/>
+          <column type="field" name="instructions" width="-1" hidden="0"/>
+          <column type="field" name="firstname" width="-1" hidden="0"/>
+          <column type="field" name="surname" width="-1" hidden="0"/>
+          <column type="field" name="captain_phone" width="-1" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7159,23 +7159,23 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="10_distance"/>
-        <field editable="1" name="21_distance"/>
-        <field editable="1" name="5_distance"/>
-        <field editable="1" name="captain"/>
-        <field editable="1" name="captain_number"/>
-        <field editable="1" name="club"/>
-        <field editable="1" name="email"/>
-        <field editable="1" name="first_name"/>
-        <field editable="1" name="first_runner"/>
-        <field editable="1" name="instructions"/>
-        <field editable="1" name="last_name"/>
-        <field editable="1" name="last_runner"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="phone"/>
-        <field editable="1" name="position"/>
-        <field editable="1" name="races"/>
-        <field editable="1" name="tshirt"/>
+        <field name="10_distance" editable="1"/>
+        <field name="21_distance" editable="1"/>
+        <field name="5_distance" editable="1"/>
+        <field name="captain" editable="1"/>
+        <field name="captain_number" editable="1"/>
+        <field name="club" editable="1"/>
+        <field name="email" editable="1"/>
+        <field name="first_name" editable="1"/>
+        <field name="first_runner" editable="1"/>
+        <field name="instructions" editable="1"/>
+        <field name="last_name" editable="1"/>
+        <field name="last_runner" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="phone" editable="1"/>
+        <field name="position" editable="1"/>
+        <field name="races" editable="1"/>
+        <field name="tshirt" editable="1"/>
       </editable>
       <labelOnTop>
         <field name="10_distance" labelOnTop="0"/>
@@ -7200,7 +7200,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>first_name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" readOnly="0" maxScale="100000" type="vector" minScale="1e+08" simplifyLocal="1" wkbType="Point" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" geometry="Point" simplifyDrawingHints="0" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" labelsEnabled="1">
+    <maplayer simplifyDrawingTol="1" readOnly="0" maxScale="100000" simplifyLocal="1" simplifyDrawingHints="0" labelsEnabled="1" geometry="Point" type="vector" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" simplifyMaxScale="1" minScale="1e+08" autoRefreshEnabled="0" refreshOnNotifyMessage="" wkbType="Point">
       <extent>
         <xmin>18.37896929129519208</xmin>
         <ymin>-33.93500027904928373</ymin>
@@ -7257,7 +7257,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" maxx="0" minz="0" miny="0" crs="" dimensions="2" maxz="0" minx="0"/>
+          <spatial maxy="0" maxz="0" maxx="0" minx="0" minz="0" dimensions="2" crs="" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -7284,66 +7284,66 @@ def my_form_open(dialog, layer, feature):
       <renderer-v2 type="nullSymbol"/>
       <labeling type="simple">
         <settings>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" fontSize="8.5" namedStyle="Regular" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="0.75" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="0" fontStrikeout="0" fieldName="name" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="50" useSubstitutions="0">
-            <text-buffer bufferSizeUnits="MM" bufferDraw="1" bufferNoFill="0" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="0.6" bufferColor="255,255,255,255" bufferSize="1.5"/>
-            <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeJoinStyle="64" shapeRadiiY="0" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+          <text-style blendMode="0" fontSizeUnit="Point" isExpression="0" textOpacity="0.75" fontStrikeout="0" useSubstitutions="0" textColor="0,0,0,255" fontSize="8.5" fontUnderline="0" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fieldName="name" fontFamily="Myriad Pro" fontLetterSpacing="0" multilineHeight="1" namedStyle="Regular" fontWeight="50" fontCapitals="0">
+            <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferSize="1.5" bufferSizeUnits="MM" bufferBlendMode="0" bufferDraw="1" bufferOpacity="0.6" bufferColor="255,255,255,255"/>
+            <background shapeOffsetX="0" shapeSVGFile="" shapeSizeType="0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeX="0" shapeRotation="0" shapeRadiiUnit="MM" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeOpacity="1" shapeBorderWidthUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeType="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeBorderWidth="0"/>
+            <shadow shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowUnder="0" shadowBlendMode="6"/>
             <substitutions/>
           </text-style>
-          <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-          <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="6" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="2" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="0" maxCurvedCharAngleIn="20" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-          <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="0" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="1" scaleVisibility="0" obstacleFactor="0.2" fontMaxPixelSize="10000" obstacleType="0"/>
+          <text-format wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" reverseDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0"/>
+          <placement fitInPolygonOnly="0" repeatDistance="0" placement="6" priority="1" centroidWhole="0" placementFlags="2" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" maxCurvedCharAngleOut="-20" xOffset="0" yOffset="0" dist="0" centroidInside="0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
+          <rendering scaleVisibility="0" maxNumLabels="2000" fontLimitPixelSize="0" minFeatureSize="0" upsidedownLabels="0" displayAll="0" mergeLines="0" fontMinPixelSize="3" limitNumLabels="0" scaleMin="1" obstacleFactor="0.2" drawLabels="1" zIndex="0" obstacleType="0" labelPerPart="0" fontMaxPixelSize="10000" scaleMax="10000000" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="LabelRotation" type="Map">
-                  <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 type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="LabelRotation">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="360 - (&quot;label_rota&quot;)"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="PositionX" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="field" value="label_x" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                <Option type="Map" name="PositionX">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="field" value="label_x"/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
-                <Option name="PositionY" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="field" value="label_y" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                <Option type="Map" name="PositionY">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="field" value="label_y"/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
-                <Option name="Size" type="Map">
-                  <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 type="Map" name="Size">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </settings>
       </labeling>
       <customproperties>
-        <property value="&quot;name&quot;" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="dualview/previewExpressions" value="&quot;name&quot;"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minimumSize="0" opacity="1" penAlpha="255" penColor="#000000" enabled="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeType="MM" diagramOrientation="Up" labelPlacementMethod="XHeight" scaleBasedVisibility="0" width="15" minScaleDenominator="100000" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" barWidth="5" backgroundAlpha="255" lineSizeType="MM" penWidth="0">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory diagramOrientation="Up" minScaleDenominator="100000" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penColor="#000000" backgroundAlpha="255" barWidth="5" backgroundColor="#ffffff" lineSizeType="MM" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" height="15" scaleBasedVisibility="0" minimumSize="0" penAlpha="255" maxScaleDenominator="1e+08" penWidth="0" enabled="0" width="15" rotationOffset="270" opacity="1">
           <fontProperties style="" description="Arial,10,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+          <attribute color="#000000" field="" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" priority="0" linePlacementFlags="2" placement="0" showAll="1" dist="0">
+      <DiagramLayerSettings placement="0" priority="0" linePlacementFlags="2" obstacle="0" dist="0" zIndex="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -7356,8 +7356,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -7366,8 +7366,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -7376,8 +7376,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -7386,8 +7386,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -7396,8 +7396,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -7406,8 +7406,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -7416,8 +7416,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -7426,8 +7426,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -7436,75 +7436,75 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <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"/>
+        <alias name="" field="id" index="0"/>
+        <alias name="" field="osm_id" index="1"/>
+        <alias name="" field="name" index="2"/>
+        <alias name="" field="type" index="3"/>
+        <alias name="" field="z_order" index="4"/>
+        <alias name="" field="population" index="5"/>
+        <alias name="" field="label_x" index="6"/>
+        <alias name="" field="label_y" index="7"/>
+        <alias name="" field="label_rota" index="8"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <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" field="id" expression=""/>
+        <default applyOnUpdate="0" field="osm_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="type" expression=""/>
+        <default applyOnUpdate="0" field="z_order" expression=""/>
+        <default applyOnUpdate="0" field="population" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rota" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="id"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="osm_id"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="name"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="type"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="z_order"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="population"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="label_x"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="label_y"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="label_rota"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="id"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="osm_id"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="name"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="type"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="z_order"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="population"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="label_x"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="label_y"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="label_rota"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="osm_id"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="z_order"/>
-        <constraint desc="" exp="" field="population"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rota"/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="osm_id" exp=""/>
+        <constraint desc="" field="name" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="z_order" exp=""/>
+        <constraint desc="" field="population" exp=""/>
+        <constraint desc="" field="label_x" exp=""/>
+        <constraint desc="" field="label_y" exp=""/>
+        <constraint desc="" field="label_rota" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column name="id" width="-1" hidden="0" type="field"/>
-          <column name="osm_id" width="-1" hidden="0" type="field"/>
-          <column name="name" width="-1" hidden="0" type="field"/>
-          <column name="type" width="-1" hidden="0" type="field"/>
-          <column name="z_order" width="-1" hidden="0" type="field"/>
-          <column name="population" width="-1" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column name="label_x" width="-1" hidden="0" type="field"/>
-          <column name="label_y" width="-1" hidden="0" type="field"/>
-          <column name="label_rota" width="-1" hidden="0" type="field"/>
+          <column type="field" name="id" width="-1" hidden="0"/>
+          <column type="field" name="osm_id" width="-1" hidden="0"/>
+          <column type="field" name="name" width="-1" hidden="0"/>
+          <column type="field" name="type" width="-1" hidden="0"/>
+          <column type="field" name="z_order" width="-1" hidden="0"/>
+          <column type="field" name="population" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="label_x" width="-1" hidden="0"/>
+          <column type="field" name="label_y" width="-1" hidden="0"/>
+          <column type="field" name="label_rota" width="-1" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7535,15 +7535,15 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="label_rota"/>
-        <field editable="1" name="label_x"/>
-        <field editable="1" name="label_y"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="osm_id"/>
-        <field editable="1" name="population"/>
-        <field editable="1" name="type"/>
-        <field editable="1" name="z_order"/>
+        <field name="id" editable="1"/>
+        <field name="label_rota" editable="1"/>
+        <field name="label_x" editable="1"/>
+        <field name="label_y" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="osm_id" editable="1"/>
+        <field name="population" editable="1"/>
+        <field name="type" editable="1"/>
+        <field name="z_order" editable="1"/>
       </editable>
       <labelOnTop>
         <field name="id" labelOnTop="0"/>
@@ -7560,7 +7560,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" readOnly="0" maxScale="100000" type="vector" minScale="1e+08" simplifyLocal="1" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" geometry="Line" simplifyDrawingHints="0" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" labelsEnabled="1">
+    <maplayer simplifyDrawingTol="1" readOnly="0" maxScale="100000" simplifyLocal="1" simplifyDrawingHints="0" labelsEnabled="1" geometry="Line" type="vector" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" simplifyMaxScale="1" minScale="1e+08" autoRefreshEnabled="0" refreshOnNotifyMessage="" wkbType="MultiLineString">
       <extent>
         <xmin>18.3437671999999985</xmin>
         <ymin>-34.02801110000000051</ymin>
@@ -7617,7 +7617,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" maxx="0" minz="0" miny="0" crs="" dimensions="2" maxz="0" minx="0"/>
+          <spatial maxy="0" maxz="0" maxx="0" minx="0" minz="0" dimensions="2" crs="" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -7644,61 +7644,61 @@ def my_form_open(dialog, layer, feature):
       <renderer-v2 type="nullSymbol"/>
       <labeling type="simple">
         <settings>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" fontSize="7" namedStyle="Regular" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="0.8" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="1" fontStrikeout="0" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="50" useSubstitutions="0">
-            <text-buffer bufferSizeUnits="MM" bufferDraw="1" bufferNoFill="0" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="0.6" bufferColor="255,255,255,255" bufferSize="1"/>
-            <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeJoinStyle="64" shapeRadiiY="0" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+          <text-style blendMode="0" fontSizeUnit="Point" isExpression="1" textOpacity="0.8" fontStrikeout="0" useSubstitutions="0" textColor="0,0,0,255" fontSize="7" fontUnderline="0" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" fontFamily="Myriad Pro" fontLetterSpacing="0" multilineHeight="1" namedStyle="Regular" fontWeight="50" fontCapitals="0">
+            <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferSizeUnits="MM" bufferBlendMode="0" bufferDraw="1" bufferOpacity="0.6" bufferColor="255,255,255,255"/>
+            <background shapeOffsetX="0" shapeSVGFile="" shapeSizeType="0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeX="0" shapeRotation="0" shapeRadiiUnit="MM" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeOpacity="1" shapeBorderWidthUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeType="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeBorderWidth="0"/>
+            <shadow shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowUnder="0" shadowBlendMode="6"/>
             <substitutions/>
           </text-style>
-          <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-          <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="3" repeatDistanceUnits="MapUnit" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="4" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="3" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="0" maxCurvedCharAngleIn="20" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-          <rendering drawLabels="1" maxNumLabels="2000" mergeLines="1" labelPerPart="0" scaleMax="10000000" displayAll="0" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="5" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="1" scaleVisibility="0" obstacleFactor="0.42" fontMaxPixelSize="10000" obstacleType="0"/>
+          <text-format wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" reverseDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0"/>
+          <placement fitInPolygonOnly="0" repeatDistance="0" placement="3" priority="3" centroidWhole="0" placementFlags="4" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" maxCurvedCharAngleOut="-20" xOffset="0" yOffset="0" dist="0" centroidInside="0" repeatDistanceUnits="MapUnit" offsetType="0" quadOffset="4" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
+          <rendering scaleVisibility="0" maxNumLabels="2000" fontLimitPixelSize="0" minFeatureSize="5" upsidedownLabels="0" displayAll="0" mergeLines="1" fontMinPixelSize="3" limitNumLabels="0" scaleMin="1" obstacleFactor="0.42" drawLabels="1" zIndex="0" obstacleType="0" labelPerPart="0" fontMaxPixelSize="10000" scaleMax="10000000" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="AlwaysShow" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="field" value="always_sho" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="AlwaysShow">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="field" value="always_sho"/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
-                <Option name="IsObstacle" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="&quot;&quot;" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="IsObstacle">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value="&quot;&quot;"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="LabelRotation" type="Map">
-                  <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 type="Map" name="LabelRotation">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="360 - (&quot;label_rota&quot;)"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="PositionX" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="field" value="label_x" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                <Option type="Map" name="PositionX">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="field" value="label_x"/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
-                <Option name="PositionY" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="field" value="label_y" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                <Option type="Map" name="PositionY">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="field" value="label_y"/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
-                <Option name="Priority" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="type" value="1" type="int"/>
-                  <Option name="val" value="" type="QString"/>
+                <Option type="Map" name="Priority">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="int" name="type" value="1"/>
+                  <Option type="QString" name="val" value=""/>
                 </Option>
-                <Option name="Show" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="type" value="1" type="int"/>
-                  <Option name="val" value="" type="QString"/>
+                <Option type="Map" name="Show">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="int" name="type" value="1"/>
+                  <Option type="QString" name="val" value=""/>
                 </Option>
-                <Option name="Size" type="Map">
-                  <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 type="Map" name="Size">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </settings>
@@ -7708,25 +7708,25 @@ def my_form_open(dialog, layer, feature):
           <value>COALESCE( "name", '&lt;NULL>' )</value>
           <value>COALESCE( "name", '&lt;NULL>' )</value>
         </property>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minimumSize="0" opacity="1" penAlpha="255" penColor="#000000" enabled="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeType="MM" diagramOrientation="Up" labelPlacementMethod="XHeight" scaleBasedVisibility="0" width="15" minScaleDenominator="100000" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" barWidth="5" backgroundAlpha="255" lineSizeType="MM" penWidth="0">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory diagramOrientation="Up" minScaleDenominator="100000" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penColor="#000000" backgroundAlpha="255" barWidth="5" backgroundColor="#ffffff" lineSizeType="MM" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" height="15" scaleBasedVisibility="0" minimumSize="0" penAlpha="255" maxScaleDenominator="1e+08" penWidth="0" enabled="0" width="15" rotationOffset="270" opacity="1">
           <fontProperties style="" description="Arial,10,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+          <attribute color="#000000" field="" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" priority="0" linePlacementFlags="2" placement="2" showAll="1" dist="0">
+      <DiagramLayerSettings placement="2" priority="0" linePlacementFlags="2" obstacle="0" dist="0" zIndex="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -7739,8 +7739,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -7749,8 +7749,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -7794,8 +7794,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -7851,97 +7851,97 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <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 name="" field="osm_id" index="0"/>
+        <alias name="" field="name" index="1"/>
+        <alias name="" field="highway" index="2"/>
+        <alias name="" field="waterway" index="3"/>
+        <alias name="" field="aerialway" index="4"/>
+        <alias name="" field="barrier" index="5"/>
+        <alias name="" field="man_made" index="6"/>
+        <alias name="" field="z_order" index="7"/>
+        <alias name="" field="other_tags" index="8"/>
+        <alias name="" field="never_show" index="9"/>
+        <alias name="" field="label_x" index="10"/>
+        <alias name="" field="label_y" index="11"/>
+        <alias name="" field="label_rota" index="12"/>
+        <alias name="" field="always_sho" index="13"/>
+        <alias name="" field="resident_a" index="14"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <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 applyOnUpdate="0" field="osm_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="highway" expression=""/>
+        <default applyOnUpdate="0" field="waterway" expression=""/>
+        <default applyOnUpdate="0" field="aerialway" expression=""/>
+        <default applyOnUpdate="0" field="barrier" expression=""/>
+        <default applyOnUpdate="0" field="man_made" expression=""/>
+        <default applyOnUpdate="0" field="z_order" expression=""/>
+        <default applyOnUpdate="0" field="other_tags" expression=""/>
+        <default applyOnUpdate="0" field="never_show" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rota" expression=""/>
+        <default applyOnUpdate="0" field="always_sho" expression=""/>
+        <default applyOnUpdate="0" field="resident_a" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="osm_id"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="name"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="highway"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="waterway"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="aerialway"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="barrier"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="man_made"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="z_order"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="other_tags"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="never_show"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="label_x"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="label_y"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="label_rota"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="always_sho"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="resident_a"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="osm_id"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="name"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="highway"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="waterway"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="aerialway"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="barrier"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="man_made"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="z_order"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="other_tags"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="never_show"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="label_x"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="label_y"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="label_rota"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="always_sho"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="resident_a"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="osm_id"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="highway"/>
-        <constraint desc="" exp="" field="waterway"/>
-        <constraint desc="" exp="" field="aerialway"/>
-        <constraint desc="" exp="" field="barrier"/>
-        <constraint desc="" exp="" field="man_made"/>
-        <constraint desc="" exp="" field="z_order"/>
-        <constraint desc="" exp="" field="other_tags"/>
-        <constraint desc="" exp="" field="never_show"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rota"/>
-        <constraint desc="" exp="" field="always_sho"/>
-        <constraint desc="" exp="" field="resident_a"/>
+        <constraint desc="" field="osm_id" exp=""/>
+        <constraint desc="" field="name" exp=""/>
+        <constraint desc="" field="highway" exp=""/>
+        <constraint desc="" field="waterway" exp=""/>
+        <constraint desc="" field="aerialway" exp=""/>
+        <constraint desc="" field="barrier" exp=""/>
+        <constraint desc="" field="man_made" exp=""/>
+        <constraint desc="" field="z_order" exp=""/>
+        <constraint desc="" field="other_tags" exp=""/>
+        <constraint desc="" field="never_show" exp=""/>
+        <constraint desc="" field="label_x" exp=""/>
+        <constraint desc="" field="label_y" exp=""/>
+        <constraint desc="" field="label_rota" exp=""/>
+        <constraint desc="" field="always_sho" exp=""/>
+        <constraint desc="" field="resident_a" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;osm_id&quot;" sortOrder="1" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;osm_id&quot;" sortOrder="1">
         <columns>
-          <column name="osm_id" width="-1" hidden="0" type="field"/>
-          <column name="name" width="-1" hidden="0" type="field"/>
-          <column name="z_order" width="-1" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column name="highway" width="-1" hidden="0" type="field"/>
-          <column name="waterway" width="-1" hidden="0" type="field"/>
-          <column name="aerialway" width="-1" hidden="0" type="field"/>
-          <column name="barrier" width="-1" hidden="0" type="field"/>
-          <column name="man_made" width="-1" hidden="0" type="field"/>
-          <column name="other_tags" width="-1" hidden="0" type="field"/>
-          <column name="never_show" width="-1" hidden="0" type="field"/>
-          <column name="label_x" width="-1" hidden="0" type="field"/>
-          <column name="label_y" width="-1" hidden="0" type="field"/>
-          <column name="label_rota" width="-1" hidden="0" type="field"/>
-          <column name="always_sho" width="-1" hidden="0" type="field"/>
-          <column name="resident_a" width="-1" hidden="0" type="field"/>
+          <column type="field" name="osm_id" width="-1" hidden="0"/>
+          <column type="field" name="name" width="-1" hidden="0"/>
+          <column type="field" name="z_order" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="highway" width="-1" hidden="0"/>
+          <column type="field" name="waterway" width="-1" hidden="0"/>
+          <column type="field" name="aerialway" width="-1" hidden="0"/>
+          <column type="field" name="barrier" width="-1" hidden="0"/>
+          <column type="field" name="man_made" width="-1" hidden="0"/>
+          <column type="field" name="other_tags" width="-1" hidden="0"/>
+          <column type="field" name="never_show" width="-1" hidden="0"/>
+          <column type="field" name="label_x" width="-1" hidden="0"/>
+          <column type="field" name="label_y" width="-1" hidden="0"/>
+          <column type="field" name="label_rota" width="-1" hidden="0"/>
+          <column type="field" name="always_sho" width="-1" hidden="0"/>
+          <column type="field" name="resident_a" width="-1" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7972,39 +7972,39 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="aerialway"/>
-        <field editable="1" name="always_sho"/>
-        <field editable="1" name="barrier"/>
-        <field editable="1" name="highway"/>
-        <field editable="1" name="label_rota"/>
-        <field editable="1" name="label_x"/>
-        <field editable="1" name="label_y"/>
-        <field editable="1" name="man_made"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="never_show"/>
-        <field editable="0" name="orig_access"/>
-        <field editable="0" name="orig_always_sho"/>
-        <field editable="0" name="orig_bridge"/>
-        <field editable="0" name="orig_c_z_order"/>
-        <field editable="0" name="orig_class"/>
-        <field editable="0" name="orig_id"/>
-        <field editable="0" name="orig_label_rota"/>
-        <field editable="0" name="orig_label_x"/>
-        <field editable="0" name="orig_label_y"/>
-        <field editable="0" name="orig_name"/>
-        <field editable="0" name="orig_oneway"/>
-        <field editable="0" name="orig_ref"/>
-        <field editable="0" name="orig_service"/>
-        <field editable="0" name="orig_show"/>
-        <field editable="0" name="orig_tunnel"/>
-        <field editable="0" name="orig_type"/>
-        <field editable="0" name="orig_z_order"/>
-        <field editable="1" name="osm_id"/>
-        <field editable="1" name="other_tags"/>
-        <field editable="1" name="resident_a"/>
-        <field editable="1" name="resident_access"/>
-        <field editable="1" name="waterway"/>
-        <field editable="1" name="z_order"/>
+        <field name="aerialway" editable="1"/>
+        <field name="always_sho" editable="1"/>
+        <field name="barrier" editable="1"/>
+        <field name="highway" editable="1"/>
+        <field name="label_rota" editable="1"/>
+        <field name="label_x" editable="1"/>
+        <field name="label_y" editable="1"/>
+        <field name="man_made" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="never_show" editable="1"/>
+        <field name="orig_access" editable="0"/>
+        <field name="orig_always_sho" editable="0"/>
+        <field name="orig_bridge" editable="0"/>
+        <field name="orig_c_z_order" editable="0"/>
+        <field name="orig_class" editable="0"/>
+        <field name="orig_id" editable="0"/>
+        <field name="orig_label_rota" editable="0"/>
+        <field name="orig_label_x" editable="0"/>
+        <field name="orig_label_y" editable="0"/>
+        <field name="orig_name" editable="0"/>
+        <field name="orig_oneway" editable="0"/>
+        <field name="orig_ref" editable="0"/>
+        <field name="orig_service" editable="0"/>
+        <field name="orig_show" editable="0"/>
+        <field name="orig_tunnel" editable="0"/>
+        <field name="orig_type" editable="0"/>
+        <field name="orig_z_order" editable="0"/>
+        <field name="osm_id" editable="1"/>
+        <field name="other_tags" editable="1"/>
+        <field name="resident_a" editable="1"/>
+        <field name="resident_access" editable="1"/>
+        <field name="waterway" editable="1"/>
+        <field name="z_order" editable="1"/>
       </editable>
       <labelOnTop>
         <field name="aerialway" labelOnTop="0"/>
@@ -8088,7 +8088,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" readOnly="0" maxScale="0" type="vector" minScale="1e+08" simplifyLocal="1" wkbType="Point" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" geometry="Point" simplifyDrawingHints="0" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" labelsEnabled="1">
+    <maplayer simplifyDrawingTol="1" readOnly="0" maxScale="0" simplifyLocal="1" simplifyDrawingHints="0" labelsEnabled="1" geometry="Point" type="vector" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" simplifyMaxScale="1" minScale="1e+08" autoRefreshEnabled="0" refreshOnNotifyMessage="" wkbType="Point">
       <extent>
         <xmin>18.3984390148267174</xmin>
         <ymin>-33.90832575607554134</ymin>
@@ -8152,332 +8152,332 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" forceraster="0" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" enableorderby="0">
         <rules key="{0927a9cd-bbb2-44ea-811b-fdbcb767a09a}">
-          <rule symbol="0" filter="regexp_match( &quot;type&quot;, '(start|finish)')" key="{efda7615-994b-459d-a657-ee8185286b0b}"/>
-          <rule symbol="1" filter="&quot;type&quot; = 'toilets'" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}"/>
-          <rule symbol="2" filter="&quot;type&quot; = 'togbag'" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}"/>
-          <rule symbol="3" filter=" &quot;type&quot; = 'closure'" key="{67af661e-65f1-44a7-9993-d5a668077b33}"/>
-          <rule symbol="4" filter="&quot;type&quot; = 'myciti'" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}"/>
-          <rule symbol="5" filter="&quot;type&quot; = 'parking'" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}"/>
+          <rule symbol="0" key="{efda7615-994b-459d-a657-ee8185286b0b}" filter="regexp_match( &quot;type&quot;, '(start|finish)')"/>
+          <rule symbol="1" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}" filter="&quot;type&quot; = 'toilets'"/>
+          <rule symbol="2" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}" filter="&quot;type&quot; = 'togbag'"/>
+          <rule symbol="3" key="{67af661e-65f1-44a7-9993-d5a668077b33}" filter=" &quot;type&quot; = 'closure'"/>
+          <rule symbol="4" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}" filter="&quot;type&quot; = 'myciti'"/>
+          <rule symbol="5" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}" filter="&quot;type&quot; = 'parking'"/>
         </rules>
         <symbols>
-          <symbol name="0" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-            <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
-              <prop v="0" k="angle"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="star" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="7" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol type="marker" name="0" force_rhr="0" clip_to_extent="1" alpha="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="0,0,0,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="star"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="0,0,0,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="7"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( @map_scale &lt; 7000, '14', '7' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="size">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '14', '7' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-            <layer enabled="1" pass="0" class="SvgMarker" locked="0">
-              <prop v="0" k="angle"/>
-              <prop v="0,32,80,255" k="color"/>
-              <prop v="0" k="fixedAspectRatio"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="amenity/amenity_toilets.svg" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="5" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol type="marker" name="1" force_rhr="0" clip_to_extent="1" alpha="1">
+            <layer class="SvgMarker" enabled="1" locked="0" pass="0">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="0,32,80,255"/>
+              <prop k="fixedAspectRatio" v="0"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="name" v="amenity/amenity_toilets.svg"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="35,35,35,255"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="5"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( @map_scale &lt; 7000, '10', '5' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="size">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '10', '5' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-            <layer enabled="1" pass="0" class="SvgMarker" locked="0">
-              <prop v="0" k="angle"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="0" k="fixedAspectRatio"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="../images/gym-bag.svg" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="5" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol type="marker" name="2" force_rhr="0" clip_to_extent="1" alpha="1">
+            <layer class="SvgMarker" enabled="1" locked="0" pass="0">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="0,0,0,255"/>
+              <prop k="fixedAspectRatio" v="0"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="name" v="../images/gym-bag.svg"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="0,0,0,255"/>
+              <prop k="outline_width" v="0.2"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="5"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="fillColor" type="Map">
-                      <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 type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="fillColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" 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"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="size" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( @map_scale &lt; 7000, '10', '5' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="size">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '10', '5' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-            <layer enabled="1" pass="0" class="SvgMarker" locked="0">
-              <prop v="0" k="angle"/>
-              <prop v="125,139,143,255" k="color"/>
-              <prop v="0" k="fixedAspectRatio"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="../images/road_closure.svg" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="6" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol type="marker" name="3" force_rhr="0" clip_to_extent="1" alpha="1">
+            <layer class="SvgMarker" enabled="1" locked="0" pass="0">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="125,139,143,255"/>
+              <prop k="fixedAspectRatio" v="0"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="name" v="../images/road_closure.svg"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="35,35,35,255"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="6"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( @map_scale &lt; 7000, '10', '6' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="size">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '10', '6' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="4" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-            <layer enabled="1" pass="0" class="SvgMarker" locked="0">
-              <prop v="0" k="angle"/>
-              <prop v="0,12,254,255" k="color"/>
-              <prop v="0" k="fixedAspectRatio"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="transport/transport_bus_stop.svg" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="255,255,255,255" k="outline_color"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="6.125" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
-              <effect enabled="0" type="effectStack">
+          <symbol type="marker" name="4" force_rhr="0" clip_to_extent="1" alpha="1">
+            <layer class="SvgMarker" enabled="1" locked="0" pass="0">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="0,12,254,255"/>
+              <prop k="fixedAspectRatio" v="0"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="name" v="transport/transport_bus_stop.svg"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="255,255,255,255"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="6.125"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
+              <effect type="effectStack" enabled="0">
                 <effect type="dropShadow">
-                  <prop v="13" k="blend_mode"/>
-                  <prop v="2.645" k="blur_level"/>
-                  <prop v="MM" k="blur_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-                  <prop v="0,0,0,255" k="color"/>
-                  <prop v="2" k="draw_mode"/>
-                  <prop v="0" k="enabled"/>
-                  <prop v="135" k="offset_angle"/>
-                  <prop v="2" k="offset_distance"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_unit_scale"/>
-                  <prop v="1" k="opacity"/>
+                  <prop k="blend_mode" v="13"/>
+                  <prop k="blur_level" v="2.645"/>
+                  <prop k="blur_unit" v="MM"/>
+                  <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="color" v="0,0,0,255"/>
+                  <prop k="draw_mode" v="2"/>
+                  <prop k="enabled" v="0"/>
+                  <prop k="offset_angle" v="135"/>
+                  <prop k="offset_distance" v="2"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="offset_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="opacity" v="1"/>
                 </effect>
                 <effect type="outerGlow">
-                  <prop v="0" k="blend_mode"/>
-                  <prop v="0.7935" k="blur_level"/>
-                  <prop v="MM" k="blur_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-                  <prop v="0,0,255,255" k="color1"/>
-                  <prop v="0,255,0,255" k="color2"/>
-                  <prop v="0" k="color_type"/>
-                  <prop v="0" k="discrete"/>
-                  <prop v="2" k="draw_mode"/>
-                  <prop v="1" k="enabled"/>
-                  <prop v="0.5" k="opacity"/>
-                  <prop v="gradient" k="rampType"/>
-                  <prop v="255,255,255,255" k="single_color"/>
-                  <prop v="2" k="spread"/>
-                  <prop v="MM" k="spread_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="spread_unit_scale"/>
+                  <prop k="blend_mode" v="0"/>
+                  <prop k="blur_level" v="0.7935"/>
+                  <prop k="blur_unit" v="MM"/>
+                  <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="color1" v="0,0,255,255"/>
+                  <prop k="color2" v="0,255,0,255"/>
+                  <prop k="color_type" v="0"/>
+                  <prop k="discrete" v="0"/>
+                  <prop k="draw_mode" v="2"/>
+                  <prop k="enabled" v="1"/>
+                  <prop k="opacity" v="0.5"/>
+                  <prop k="rampType" v="gradient"/>
+                  <prop k="single_color" v="255,255,255,255"/>
+                  <prop k="spread" v="2"/>
+                  <prop k="spread_unit" v="MM"/>
+                  <prop k="spread_unit_scale" v="3x:0,0,0,0,0,0"/>
                 </effect>
                 <effect type="drawSource">
-                  <prop v="0" k="blend_mode"/>
-                  <prop v="2" k="draw_mode"/>
-                  <prop v="1" k="enabled"/>
-                  <prop v="1" k="opacity"/>
+                  <prop k="blend_mode" v="0"/>
+                  <prop k="draw_mode" v="2"/>
+                  <prop k="enabled" v="1"/>
+                  <prop k="opacity" v="1"/>
                 </effect>
                 <effect type="innerShadow">
-                  <prop v="13" k="blend_mode"/>
-                  <prop v="2.645" k="blur_level"/>
-                  <prop v="MM" k="blur_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-                  <prop v="0,0,0,255" k="color"/>
-                  <prop v="2" k="draw_mode"/>
-                  <prop v="0" k="enabled"/>
-                  <prop v="135" k="offset_angle"/>
-                  <prop v="2" k="offset_distance"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_unit_scale"/>
-                  <prop v="1" k="opacity"/>
+                  <prop k="blend_mode" v="13"/>
+                  <prop k="blur_level" v="2.645"/>
+                  <prop k="blur_unit" v="MM"/>
+                  <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="color" v="0,0,0,255"/>
+                  <prop k="draw_mode" v="2"/>
+                  <prop k="enabled" v="0"/>
+                  <prop k="offset_angle" v="135"/>
+                  <prop k="offset_distance" v="2"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="offset_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="opacity" v="1"/>
                 </effect>
                 <effect type="innerGlow">
-                  <prop v="0" k="blend_mode"/>
-                  <prop v="0.7935" k="blur_level"/>
-                  <prop v="MM" k="blur_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-                  <prop v="0,0,255,255" k="color1"/>
-                  <prop v="0,255,0,255" k="color2"/>
-                  <prop v="0" k="color_type"/>
-                  <prop v="0" k="discrete"/>
-                  <prop v="2" k="draw_mode"/>
-                  <prop v="0" k="enabled"/>
-                  <prop v="0.5" k="opacity"/>
-                  <prop v="gradient" k="rampType"/>
-                  <prop v="255,255,255,255" k="single_color"/>
-                  <prop v="2" k="spread"/>
-                  <prop v="MM" k="spread_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="spread_unit_scale"/>
+                  <prop k="blend_mode" v="0"/>
+                  <prop k="blur_level" v="0.7935"/>
+                  <prop k="blur_unit" v="MM"/>
+                  <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="color1" v="0,0,255,255"/>
+                  <prop k="color2" v="0,255,0,255"/>
+                  <prop k="color_type" v="0"/>
+                  <prop k="discrete" v="0"/>
+                  <prop k="draw_mode" v="2"/>
+                  <prop k="enabled" v="0"/>
+                  <prop k="opacity" v="0.5"/>
+                  <prop k="rampType" v="gradient"/>
+                  <prop k="single_color" v="255,255,255,255"/>
+                  <prop k="spread" v="2"/>
+                  <prop k="spread_unit" v="MM"/>
+                  <prop k="spread_unit_scale" v="3x:0,0,0,0,0,0"/>
                 </effect>
               </effect>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="0.875*(if( @map_scale &lt; 7000, '14', '7' ))" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="size">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="0.875*(if( @map_scale &lt; 7000, '14', '7' ))"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
-              <prop v="0" k="angle"/>
-              <prop v="255,0,0,0" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,0" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="1" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="7" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="255,0,0,0"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="circle"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="35,35,35,0"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="1"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="7"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( @map_scale &lt; 7000, '14', '7' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="size">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '14', '7' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="5" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-            <layer enabled="1" pass="0" class="SvgMarker" locked="0">
-              <prop v="0" k="angle"/>
-              <prop v="43,153,41,255" k="color"/>
-              <prop v="0" k="fixedAspectRatio"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="transport/amenity=parking.svg" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="5" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol type="marker" name="5" force_rhr="0" clip_to_extent="1" alpha="1">
+            <layer class="SvgMarker" enabled="1" locked="0" pass="0">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="43,153,41,255"/>
+              <prop k="fixedAspectRatio" v="0"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="name" v="transport/amenity=parking.svg"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="35,35,35,255"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="5"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( @map_scale &lt; 7000, '10', '5' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="size">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '10', '5' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -8486,61 +8486,61 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" fontSize="10" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="0.9" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="0" fontStrikeout="0" fieldName="name" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-            <text-buffer bufferSizeUnits="MM" bufferDraw="1" bufferNoFill="0" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="0.8" bufferColor="255,255,255,255" bufferSize="2"/>
-            <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeJoinStyle="64" shapeRadiiY="2" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="0" shapeRadiiX="2" shapeBorderWidth="0" shapeSizeY="1" shapeOffsetUnit="MM" shapeOpacity="0.7" shapeSVGFile="" shapeSizeX="1" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+          <text-style blendMode="0" fontSizeUnit="Point" isExpression="0" textOpacity="0.9" fontStrikeout="0" useSubstitutions="0" textColor="0,0,0,255" fontSize="10" fontUnderline="0" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fieldName="name" fontFamily="Myriad Pro" fontLetterSpacing="0" multilineHeight="1" namedStyle="Semibold" fontWeight="63" fontCapitals="0">
+            <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferSize="2" bufferSizeUnits="MM" bufferBlendMode="0" bufferDraw="1" bufferOpacity="0.8" bufferColor="255,255,255,255"/>
+            <background shapeOffsetX="0" shapeSVGFile="" shapeSizeType="0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeRadiiY="2" shapeSizeX="1" shapeRotation="0" shapeRadiiUnit="MM" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeOpacity="0.7" shapeBorderWidthUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiX="2" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeType="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeBorderWidth="0"/>
+            <shadow shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowUnder="0" shadowBlendMode="6"/>
             <substitutions/>
           </text-style>
-          <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-          <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="2" placement="0" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="10" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MM" dist="3" maxCurvedCharAngleIn="25" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" yOffset="3" xOffset="2" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-          <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="0" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="10" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="0" scaleVisibility="0" obstacleFactor="1.8" fontMaxPixelSize="10000" obstacleType="0"/>
+          <text-format wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" reverseDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0"/>
+          <placement fitInPolygonOnly="0" repeatDistance="0" placement="0" priority="10" centroidWhole="0" placementFlags="10" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" maxCurvedCharAngleIn="25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" maxCurvedCharAngleOut="-25" xOffset="2" yOffset="3" dist="3" centroidInside="0" repeatDistanceUnits="MM" offsetType="0" quadOffset="2" offsetUnits="MM" geometryGeneratorType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
+          <rendering scaleVisibility="0" maxNumLabels="2000" fontLimitPixelSize="0" minFeatureSize="0" upsidedownLabels="0" displayAll="1" mergeLines="0" fontMinPixelSize="3" limitNumLabels="0" scaleMin="0" obstacleFactor="1.8" drawLabels="1" zIndex="10" obstacleType="0" labelPerPart="0" fontMaxPixelSize="10000" scaleMax="0" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="LabelDistance" type="Map">
-                  <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 type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="LabelDistance">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '5', '3' )"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="OffsetQuad" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="2" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="OffsetQuad">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="2"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="Size" type="Map">
-                  <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 type="Map" name="Size">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '14', '10' )"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </settings>
       </labeling>
       <customproperties>
-        <property value="id" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="dualview/previewExpressions" value="id"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minimumSize="0" opacity="1" penAlpha="255" penColor="#000000" enabled="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeType="MM" diagramOrientation="Up" labelPlacementMethod="XHeight" scaleBasedVisibility="0" width="15" minScaleDenominator="0" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" barWidth="5" backgroundAlpha="255" lineSizeType="MM" penWidth="0">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory diagramOrientation="Up" minScaleDenominator="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penColor="#000000" backgroundAlpha="255" barWidth="5" backgroundColor="#ffffff" lineSizeType="MM" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" height="15" scaleBasedVisibility="0" minimumSize="0" penAlpha="255" maxScaleDenominator="1e+08" penWidth="0" enabled="0" width="15" rotationOffset="270" opacity="1">
           <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+          <attribute color="#000000" field="" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" priority="0" linePlacementFlags="18" placement="0" showAll="1" dist="0">
+      <DiagramLayerSettings placement="0" priority="0" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -8579,42 +8579,42 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="type"/>
-        <alias index="2" name="" field="name"/>
-        <alias index="3" name="" field="distance"/>
+        <alias name="" field="id" index="0"/>
+        <alias name="" field="type" index="1"/>
+        <alias name="" field="name" index="2"/>
+        <alias name="" field="distance" index="3"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <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" field="id" expression=""/>
+        <default applyOnUpdate="0" field="type" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="distance" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="id"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="type"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="name"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="distance"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="id"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="type"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="name"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="distance"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="distance"/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="name" exp=""/>
+        <constraint desc="" field="distance" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;type&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;type&quot;" sortOrder="0">
         <columns>
-          <column name="id" width="-1" hidden="0" type="field"/>
-          <column name="type" width="-1" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column name="name" width="-1" hidden="0" type="field"/>
-          <column name="distance" width="-1" hidden="0" type="field"/>
+          <column type="field" name="id" width="-1" hidden="0"/>
+          <column type="field" name="type" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="name" width="-1" hidden="0"/>
+          <column type="field" name="distance" width="-1" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8645,10 +8645,10 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="type"/>
+        <field name="distance" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
         <field name="distance" labelOnTop="0"/>
@@ -8660,19 +8660,19 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" readOnly="0" maxScale="100000" type="vector" minScale="1e+08" simplifyLocal="1" wkbType="Point" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" geometry="Point" simplifyDrawingHints="0" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" labelsEnabled="1">
+    <maplayer simplifyDrawingTol="1" readOnly="0" maxScale="100000" simplifyLocal="1" simplifyDrawingHints="0" labelsEnabled="1" geometry="Point" type="vector" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" simplifyMaxScale="1" minScale="1e+08" autoRefreshEnabled="0" refreshOnNotifyMessage="" wkbType="Point">
       <extent>
-        <xmin>18.3754509738640941</xmin>
-        <ymin>-33.94260795275215514</ymin>
-        <xmax>18.41919710472834737</xmax>
-        <ymax>-33.8999969693438814</ymax>
+        <xmin>18.37544309819313781</xmin>
+        <ymin>-33.94257978420861122</ymin>
+        <xmax>18.41917299546326348</xmax>
+        <ymax>-33.89998955749085496</ymax>
       </extent>
-      <id>proposed_road_markers_2b454f1d_6ad8_4b91_805f_f503490286b2</id>
+      <id>proposed_route_markers_b3dac0b0_ee05_431b_a89e_52cc9d9162b0</id>
       <datasource>memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:Integer64(10,0)&amp;field=length_m:Real(10,10)&amp;field=length_km:Real(10,10)&amp;field=Source:String(20,0)&amp;field=org_fid:(0,0)&amp;field=distance:(0,0)</datasource>
       <keywordList>
         <value></value>
       </keywordList>
-      <layername>proposed road markers</layername>
+      <layername>proposed route markers</layername>
       <srs>
         <spatialrefsys>
           <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
@@ -8692,15 +8692,6 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
-        <contact>
-          <name></name>
-          <organization></organization>
-          <position></position>
-          <voice></voice>
-          <fax></fax>
-          <email></email>
-          <role></role>
-        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -8713,18 +8704,10 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent>
-          <spatial maxy="0" maxx="0" minz="0" miny="0" crs="" dimensions="2" maxz="0" minx="0"/>
-          <temporal>
-            <period>
-              <start></start>
-              <end></end>
-            </period>
-          </temporal>
-        </extent>
+        <extent/>
       </resourceMetadata>
       <provider encoding="UTF-8">memory</provider>
       <vectorjoins/>
@@ -8744,251 +8727,251 @@ def my_form_open(dialog, layer, feature):
       <renderer-v2 type="nullSymbol"/>
       <labeling type="rule-based">
         <rules key="{9dfa2d77-6e52-4640-91f6-8cd0a7b822ed}">
-          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{a130bab9-8b6c-4395-8ba0-7ae70031713d}" description="Active">
-            <rule filter="&quot;Source&quot; = '21KM'" key="{c646d958-ac1a-4ea1-99c1-2c147334f417}" description="21KM">
+          <rule key="{a130bab9-8b6c-4395-8ba0-7ae70031713d}" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="Active">
+            <rule key="{c646d958-ac1a-4ea1-99c1-2c147334f417}" filter="&quot;Source&quot; = '21KM'" description="21KM">
               <settings>
-                <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" fontSize="10" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="1" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="1" fontStrikeout="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-                  <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                  <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="210,32,39,255" shapeType="0" shapeJoinStyle="128" shapeRadiiY="1" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="210,32,39,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="1" shapeBorderWidth="1" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="1" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+                <text-style blendMode="0" fontSizeUnit="Point" isExpression="1" textOpacity="1" fontStrikeout="0" useSubstitutions="0" textColor="255,255,255,255" fontSize="10" fontUnderline="0" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontFamily="Myriad Pro" fontLetterSpacing="0" multilineHeight="1" namedStyle="Semibold" fontWeight="63" fontCapitals="0">
+                  <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferSizeUnits="MM" bufferBlendMode="0" bufferDraw="0" bufferOpacity="1" bufferColor="255,255,255,255"/>
+                  <background shapeOffsetX="0" shapeSVGFile="" shapeSizeType="0" shapeSizeUnit="MM" shapeFillColor="210,32,39,255" shapeRadiiY="1" shapeSizeX="1" shapeRotation="0" shapeRadiiUnit="MM" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeOpacity="1" shapeBorderWidthUnit="MM" shapeJoinStyle="128" shapeBlendMode="0" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="210,32,39,255" shapeType="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeBorderWidth="1"/>
+                  <shadow shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowUnder="0" shadowBlendMode="6"/>
                   <substitutions/>
                 </text-style>
-                <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="0" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-                <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="3" placement="6" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="10" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="2" maxCurvedCharAngleIn="20" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-                <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="1" scaleVisibility="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacleType="0"/>
+                <text-format wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" reverseDirectionSymbol="0" decimals="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0"/>
+                <placement fitInPolygonOnly="0" repeatDistance="0" placement="6" priority="10" centroidWhole="0" placementFlags="10" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" maxCurvedCharAngleOut="-20" xOffset="0" yOffset="0" dist="2" centroidInside="0" repeatDistanceUnits="MM" offsetType="0" quadOffset="3" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
+                <rendering scaleVisibility="0" maxNumLabels="2000" fontLimitPixelSize="0" minFeatureSize="0" upsidedownLabels="0" displayAll="1" mergeLines="0" fontMinPixelSize="3" limitNumLabels="0" scaleMin="1" obstacleFactor="2" drawLabels="1" zIndex="0" obstacleType="0" labelPerPart="0" fontMaxPixelSize="10000" scaleMax="10000000" obstacle="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="field" value="quadrant" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                      <Option type="Map" name="PredefinedPositionOrder">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="quadrant"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="field" value="rotation" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                      <Option type="Map" name="Rotation">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="QString" name="field" value="rotation"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
               </settings>
             </rule>
-            <rule filter="&quot;Source&quot; = '10KM'" key="{b2fb2188-6121-4982-bc1c-04ddb70f9be7}" description="10KM">
+            <rule key="{b2fb2188-6121-4982-bc1c-04ddb70f9be7}" filter="&quot;Source&quot; = '10KM'" description="10KM">
               <settings>
-                <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" fontSize="10" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="1" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="1" fontStrikeout="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-                  <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                  <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="103,34,144,255" shapeType="0" shapeJoinStyle="128" shapeRadiiY="1" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="103,34,144,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="1" shapeBorderWidth="1" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="1" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+                <text-style blendMode="0" fontSizeUnit="Point" isExpression="1" textOpacity="1" fontStrikeout="0" useSubstitutions="0" textColor="255,255,255,255" fontSize="10" fontUnderline="0" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontFamily="Myriad Pro" fontLetterSpacing="0" multilineHeight="1" namedStyle="Semibold" fontWeight="63" fontCapitals="0">
+                  <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferSizeUnits="MM" bufferBlendMode="0" bufferDraw="0" bufferOpacity="1" bufferColor="255,255,255,255"/>
+                  <background shapeOffsetX="0" shapeSVGFile="" shapeSizeType="0" shapeSizeUnit="MM" shapeFillColor="103,34,144,255" shapeRadiiY="1" shapeSizeX="1" shapeRotation="0" shapeRadiiUnit="MM" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeOpacity="1" shapeBorderWidthUnit="MM" shapeJoinStyle="128" shapeBlendMode="0" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="103,34,144,255" shapeType="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeBorderWidth="1"/>
+                  <shadow shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowUnder="0" shadowBlendMode="6"/>
                   <substitutions/>
                 </text-style>
-                <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="0" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-                <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="6" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="10" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="2" maxCurvedCharAngleIn="20" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-                <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="1" scaleVisibility="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacleType="0"/>
+                <text-format wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" reverseDirectionSymbol="0" decimals="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0"/>
+                <placement fitInPolygonOnly="0" repeatDistance="0" placement="6" priority="10" centroidWhole="0" placementFlags="10" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" maxCurvedCharAngleOut="-20" xOffset="0" yOffset="0" dist="2" centroidInside="0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
+                <rendering scaleVisibility="0" maxNumLabels="2000" fontLimitPixelSize="0" minFeatureSize="0" upsidedownLabels="0" displayAll="1" mergeLines="0" fontMinPixelSize="3" limitNumLabels="0" scaleMin="1" obstacleFactor="2" drawLabels="1" zIndex="0" obstacleType="0" labelPerPart="0" fontMaxPixelSize="10000" scaleMax="10000000" obstacle="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="field" value="quadrant" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                      <Option type="Map" name="PredefinedPositionOrder">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="quadrant"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="field" value="rotation" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                      <Option type="Map" name="Rotation">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="QString" name="field" value="rotation"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
               </settings>
             </rule>
-            <rule filter="&quot;Source&quot; = '5KM'" key="{7b3b06bf-7cd8-4b3c-9c28-a4b85c60458e}" description="5KM">
+            <rule key="{7b3b06bf-7cd8-4b3c-9c28-a4b85c60458e}" filter="&quot;Source&quot; = '5KM'" description="5KM">
               <settings>
-                <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" fontSize="10" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="1" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="1" fontStrikeout="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-                  <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                  <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="145,211,55,255" shapeType="0" shapeJoinStyle="128" shapeRadiiY="1" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="145,211,55,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="1" shapeBorderWidth="1" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="1" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+                <text-style blendMode="0" fontSizeUnit="Point" isExpression="1" textOpacity="1" fontStrikeout="0" useSubstitutions="0" textColor="255,255,255,255" fontSize="10" fontUnderline="0" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontFamily="Myriad Pro" fontLetterSpacing="0" multilineHeight="1" namedStyle="Semibold" fontWeight="63" fontCapitals="0">
+                  <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferSizeUnits="MM" bufferBlendMode="0" bufferDraw="0" bufferOpacity="1" bufferColor="255,255,255,255"/>
+                  <background shapeOffsetX="0" shapeSVGFile="" shapeSizeType="0" shapeSizeUnit="MM" shapeFillColor="145,211,55,255" shapeRadiiY="1" shapeSizeX="1" shapeRotation="0" shapeRadiiUnit="MM" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeOpacity="1" shapeBorderWidthUnit="MM" shapeJoinStyle="128" shapeBlendMode="0" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeType="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeBorderWidth="1"/>
+                  <shadow shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowUnder="0" shadowBlendMode="6"/>
                   <substitutions/>
                 </text-style>
-                <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="0" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-                <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="6" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="10" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="2" maxCurvedCharAngleIn="20" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-                <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="1" scaleVisibility="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacleType="0"/>
+                <text-format wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" reverseDirectionSymbol="0" decimals="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0"/>
+                <placement fitInPolygonOnly="0" repeatDistance="0" placement="6" priority="10" centroidWhole="0" placementFlags="10" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" maxCurvedCharAngleOut="-20" xOffset="0" yOffset="0" dist="2" centroidInside="0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
+                <rendering scaleVisibility="0" maxNumLabels="2000" fontLimitPixelSize="0" minFeatureSize="0" upsidedownLabels="0" displayAll="1" mergeLines="0" fontMinPixelSize="3" limitNumLabels="0" scaleMin="1" obstacleFactor="2" drawLabels="1" zIndex="0" obstacleType="0" labelPerPart="0" fontMaxPixelSize="10000" scaleMax="10000000" obstacle="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="field" value="quadrant" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                      <Option type="Map" name="PredefinedPositionOrder">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="quadrant"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="field" value="rotation" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                      <Option type="Map" name="Rotation">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="QString" name="field" value="rotation"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
               </settings>
             </rule>
           </rule>
-          <rule key="{2b06f76f-7537-425c-a1e0-da99f8965c9f}" description="Always show" active="0">
-            <rule filter="&quot;Source&quot; = '21KM'" key="{c739bb0e-e629-4c73-abbd-017b5b56ae01}" description="21KM" active="0">
+          <rule active="0" key="{2b06f76f-7537-425c-a1e0-da99f8965c9f}" description="Always show">
+            <rule active="0" key="{c739bb0e-e629-4c73-abbd-017b5b56ae01}" filter="&quot;Source&quot; = '21KM'" description="21KM">
               <settings>
-                <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" fontSize="8" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="1" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="1" fontStrikeout="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-                  <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                  <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="210,32,39,255" shapeType="0" shapeJoinStyle="128" shapeRadiiY="1" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="210,32,39,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="0.5" shapeBorderWidth="1" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="0.5" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+                <text-style blendMode="0" fontSizeUnit="Point" isExpression="1" textOpacity="1" fontStrikeout="0" useSubstitutions="0" textColor="255,255,255,255" fontSize="8" fontUnderline="0" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontFamily="Myriad Pro" fontLetterSpacing="0" multilineHeight="1" namedStyle="Semibold" fontWeight="63" fontCapitals="0">
+                  <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferSizeUnits="MM" bufferBlendMode="0" bufferDraw="0" bufferOpacity="1" bufferColor="255,255,255,255"/>
+                  <background shapeOffsetX="0" shapeSVGFile="" shapeSizeType="0" shapeSizeUnit="MM" shapeFillColor="210,32,39,255" shapeRadiiY="1" shapeSizeX="0.5" shapeRotation="0" shapeRadiiUnit="MM" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeOpacity="1" shapeBorderWidthUnit="MM" shapeJoinStyle="128" shapeBlendMode="0" shapeRadiiX="0.5" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="210,32,39,255" shapeType="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeBorderWidth="1"/>
+                  <shadow shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowUnder="0" shadowBlendMode="6"/>
                   <substitutions/>
                 </text-style>
-                <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="0" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-                <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="3" placement="6" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="10" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="2" maxCurvedCharAngleIn="20" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-                <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="1" scaleVisibility="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacleType="0"/>
+                <text-format wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" reverseDirectionSymbol="0" decimals="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0"/>
+                <placement fitInPolygonOnly="0" repeatDistance="0" placement="6" priority="10" centroidWhole="0" placementFlags="10" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" maxCurvedCharAngleOut="-20" xOffset="0" yOffset="0" dist="2" centroidInside="0" repeatDistanceUnits="MM" offsetType="0" quadOffset="3" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
+                <rendering scaleVisibility="0" maxNumLabels="2000" fontLimitPixelSize="0" minFeatureSize="0" upsidedownLabels="0" displayAll="1" mergeLines="0" fontMinPixelSize="3" limitNumLabels="0" scaleMin="1" obstacleFactor="2" drawLabels="1" zIndex="0" obstacleType="0" labelPerPart="0" fontMaxPixelSize="10000" scaleMax="10000000" obstacle="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="field" value="quadrant" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                      <Option type="Map" name="PredefinedPositionOrder">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="quadrant"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="field" value="rotation" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                      <Option type="Map" name="Rotation">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="QString" name="field" value="rotation"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
               </settings>
             </rule>
-            <rule filter="&quot;Source&quot; = '10KM'" key="{3edc5d00-f213-44ae-9a91-62cbf88e850c}" description="10KM" active="0">
+            <rule active="0" key="{3edc5d00-f213-44ae-9a91-62cbf88e850c}" filter="&quot;Source&quot; = '10KM'" description="10KM">
               <settings>
-                <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" fontSize="8" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="1" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="1" fontStrikeout="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-                  <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                  <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="103,34,144,255" shapeType="0" shapeJoinStyle="128" shapeRadiiY="1" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="103,34,144,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="0.5" shapeBorderWidth="1" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="0.5" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+                <text-style blendMode="0" fontSizeUnit="Point" isExpression="1" textOpacity="1" fontStrikeout="0" useSubstitutions="0" textColor="255,255,255,255" fontSize="8" fontUnderline="0" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontFamily="Myriad Pro" fontLetterSpacing="0" multilineHeight="1" namedStyle="Semibold" fontWeight="63" fontCapitals="0">
+                  <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferSizeUnits="MM" bufferBlendMode="0" bufferDraw="0" bufferOpacity="1" bufferColor="255,255,255,255"/>
+                  <background shapeOffsetX="0" shapeSVGFile="" shapeSizeType="0" shapeSizeUnit="MM" shapeFillColor="103,34,144,255" shapeRadiiY="1" shapeSizeX="0.5" shapeRotation="0" shapeRadiiUnit="MM" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeOpacity="1" shapeBorderWidthUnit="MM" shapeJoinStyle="128" shapeBlendMode="0" shapeRadiiX="0.5" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="103,34,144,255" shapeType="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeBorderWidth="1"/>
+                  <shadow shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowUnder="0" shadowBlendMode="6"/>
                   <substitutions/>
                 </text-style>
-                <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="0" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-                <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="6" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="10" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="2" maxCurvedCharAngleIn="20" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-                <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="1" scaleVisibility="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacleType="0"/>
+                <text-format wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" reverseDirectionSymbol="0" decimals="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0"/>
+                <placement fitInPolygonOnly="0" repeatDistance="0" placement="6" priority="10" centroidWhole="0" placementFlags="10" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" maxCurvedCharAngleOut="-20" xOffset="0" yOffset="0" dist="2" centroidInside="0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
+                <rendering scaleVisibility="0" maxNumLabels="2000" fontLimitPixelSize="0" minFeatureSize="0" upsidedownLabels="0" displayAll="1" mergeLines="0" fontMinPixelSize="3" limitNumLabels="0" scaleMin="1" obstacleFactor="2" drawLabels="1" zIndex="0" obstacleType="0" labelPerPart="0" fontMaxPixelSize="10000" scaleMax="10000000" obstacle="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="field" value="quadrant" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                      <Option type="Map" name="PredefinedPositionOrder">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="quadrant"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="field" value="rotation" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                      <Option type="Map" name="Rotation">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="QString" name="field" value="rotation"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
               </settings>
             </rule>
-            <rule filter="&quot;Source&quot; = '5KM'" key="{1b5b2a5b-81b0-42be-86e5-12e6f7f654bc}" description="5KM" active="0">
+            <rule active="0" key="{1b5b2a5b-81b0-42be-86e5-12e6f7f654bc}" filter="&quot;Source&quot; = '5KM'" description="5KM">
               <settings>
-                <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" fontSize="8" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="1" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="1" fontStrikeout="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-                  <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                  <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="145,211,55,255" shapeType="0" shapeJoinStyle="128" shapeRadiiY="1" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="145,211,55,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="0.5" shapeBorderWidth="1" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="0.5" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+                <text-style blendMode="0" fontSizeUnit="Point" isExpression="1" textOpacity="1" fontStrikeout="0" useSubstitutions="0" textColor="255,255,255,255" fontSize="8" fontUnderline="0" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontFamily="Myriad Pro" fontLetterSpacing="0" multilineHeight="1" namedStyle="Semibold" fontWeight="63" fontCapitals="0">
+                  <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferSizeUnits="MM" bufferBlendMode="0" bufferDraw="0" bufferOpacity="1" bufferColor="255,255,255,255"/>
+                  <background shapeOffsetX="0" shapeSVGFile="" shapeSizeType="0" shapeSizeUnit="MM" shapeFillColor="145,211,55,255" shapeRadiiY="1" shapeSizeX="0.5" shapeRotation="0" shapeRadiiUnit="MM" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeOpacity="1" shapeBorderWidthUnit="MM" shapeJoinStyle="128" shapeBlendMode="0" shapeRadiiX="0.5" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeType="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeBorderWidth="1"/>
+                  <shadow shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowUnder="0" shadowBlendMode="6"/>
                   <substitutions/>
                 </text-style>
-                <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="0" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-                <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="6" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="10" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="2" maxCurvedCharAngleIn="20" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-                <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="1" scaleVisibility="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacleType="0"/>
+                <text-format wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" reverseDirectionSymbol="0" decimals="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0"/>
+                <placement fitInPolygonOnly="0" repeatDistance="0" placement="6" priority="10" centroidWhole="0" placementFlags="10" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" maxCurvedCharAngleOut="-20" xOffset="0" yOffset="0" dist="2" centroidInside="0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
+                <rendering scaleVisibility="0" maxNumLabels="2000" fontLimitPixelSize="0" minFeatureSize="0" upsidedownLabels="0" displayAll="1" mergeLines="0" fontMinPixelSize="3" limitNumLabels="0" scaleMin="1" obstacleFactor="2" drawLabels="1" zIndex="0" obstacleType="0" labelPerPart="0" fontMaxPixelSize="10000" scaleMax="10000000" obstacle="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="field" value="quadrant" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                      <Option type="Map" name="PredefinedPositionOrder">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="quadrant"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="field" value="rotation" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                      <Option type="Map" name="Rotation">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="QString" name="field" value="rotation"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
               </settings>
@@ -8997,26 +8980,26 @@ def my_form_open(dialog, layer, feature):
         </rules>
       </labeling>
       <customproperties>
-        <property value="COALESCE(&quot;Text&quot;, '&lt;NULL>')" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="dualview/previewExpressions" value="COALESCE(&quot;Text&quot;, '&lt;NULL>')"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minimumSize="0" opacity="1" penAlpha="255" penColor="#000000" enabled="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeType="MM" diagramOrientation="Up" labelPlacementMethod="XHeight" scaleBasedVisibility="0" width="15" minScaleDenominator="100000" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" barWidth="5" backgroundAlpha="255" lineSizeType="MM" penWidth="0">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory diagramOrientation="Up" minScaleDenominator="100000" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penColor="#000000" backgroundAlpha="255" barWidth="5" backgroundColor="#ffffff" lineSizeType="MM" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" height="15" scaleBasedVisibility="0" minimumSize="0" penAlpha="255" maxScaleDenominator="1e+08" penWidth="0" enabled="0" width="15" rotationOffset="270" opacity="1">
           <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+          <attribute color="#000000" field="" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" priority="0" linePlacementFlags="2" placement="0" showAll="1" dist="0">
+      <DiagramLayerSettings placement="0" priority="0" linePlacementFlags="2" obstacle="0" dist="0" zIndex="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -9029,8 +9012,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -9039,8 +9022,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -9049,8 +9032,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -9059,8 +9042,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -9069,8 +9052,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -9079,8 +9062,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -9089,8 +9072,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -9099,8 +9082,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -9109,8 +9092,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -9119,8 +9102,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -9129,8 +9112,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -9139,90 +9122,90 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <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="Distance"/>
-        <alias index="6" name="" field="RouteLen"/>
-        <alias index="7" name="" field="length_m"/>
-        <alias index="8" name="" field="length_km"/>
-        <alias index="9" name="" field="Source"/>
-        <alias index="10" name="" field="org_fid"/>
-        <alias index="11" name="" field="distance"/>
+        <alias name="" field="Name" index="0"/>
+        <alias name="" field="descriptio" index="1"/>
+        <alias name="" field="timestamp" index="2"/>
+        <alias name="" field="begin" index="3"/>
+        <alias name="" field="end" index="4"/>
+        <alias name="" field="Distance" index="5"/>
+        <alias name="" field="RouteLen" index="6"/>
+        <alias name="" field="length_m" index="7"/>
+        <alias name="" field="length_km" index="8"/>
+        <alias name="" field="Source" index="9"/>
+        <alias name="" field="org_fid" index="10"/>
+        <alias name="" field="distance" index="11"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <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="Distance"/>
-        <default expression="" applyOnUpdate="0" field="RouteLen"/>
-        <default expression="" applyOnUpdate="0" field="length_m"/>
-        <default expression="" applyOnUpdate="0" field="length_km"/>
-        <default expression="" applyOnUpdate="0" field="Source"/>
-        <default expression="" applyOnUpdate="0" field="org_fid"/>
-        <default expression="" applyOnUpdate="0" field="distance"/>
+        <default applyOnUpdate="0" field="Name" expression=""/>
+        <default applyOnUpdate="0" field="descriptio" expression=""/>
+        <default applyOnUpdate="0" field="timestamp" expression=""/>
+        <default applyOnUpdate="0" field="begin" expression=""/>
+        <default applyOnUpdate="0" field="end" expression=""/>
+        <default applyOnUpdate="0" field="Distance" expression=""/>
+        <default applyOnUpdate="0" field="RouteLen" expression=""/>
+        <default applyOnUpdate="0" field="length_m" expression=""/>
+        <default applyOnUpdate="0" field="length_km" expression=""/>
+        <default applyOnUpdate="0" field="Source" expression=""/>
+        <default applyOnUpdate="0" field="org_fid" expression=""/>
+        <default applyOnUpdate="0" field="distance" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Name"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="descriptio"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="timestamp"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="begin"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="end"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Distance"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="RouteLen"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="length_m"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="length_km"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Source"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="org_fid"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="distance"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="Name"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="descriptio"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="timestamp"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="begin"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="end"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="Distance"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="RouteLen"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="length_m"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="length_km"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="Source"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="org_fid"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="distance"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="Name"/>
-        <constraint desc="" exp="" field="descriptio"/>
-        <constraint desc="" exp="" field="timestamp"/>
-        <constraint desc="" exp="" field="begin"/>
-        <constraint desc="" exp="" field="end"/>
-        <constraint desc="" exp="" field="Distance"/>
-        <constraint desc="" exp="" field="RouteLen"/>
-        <constraint desc="" exp="" field="length_m"/>
-        <constraint desc="" exp="" field="length_km"/>
-        <constraint desc="" exp="" field="Source"/>
-        <constraint desc="" exp="" field="org_fid"/>
-        <constraint desc="" exp="" field="distance"/>
+        <constraint desc="" field="Name" exp=""/>
+        <constraint desc="" field="descriptio" exp=""/>
+        <constraint desc="" field="timestamp" exp=""/>
+        <constraint desc="" field="begin" exp=""/>
+        <constraint desc="" field="end" exp=""/>
+        <constraint desc="" field="Distance" exp=""/>
+        <constraint desc="" field="RouteLen" exp=""/>
+        <constraint desc="" field="length_m" exp=""/>
+        <constraint desc="" field="length_km" exp=""/>
+        <constraint desc="" field="Source" exp=""/>
+        <constraint desc="" field="org_fid" exp=""/>
+        <constraint desc="" field="distance" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;distance&quot;" sortOrder="1" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;distance&quot;" sortOrder="1">
         <columns>
-          <column width="-1" hidden="1" type="actions"/>
-          <column name="org_fid" width="-1" hidden="0" type="field"/>
-          <column name="distance" width="-1" hidden="0" type="field"/>
-          <column name="Name" width="-1" hidden="0" type="field"/>
-          <column name="Source" width="-1" hidden="0" type="field"/>
-          <column name="RouteLen" width="-1" hidden="0" type="field"/>
-          <column name="descriptio" width="-1" hidden="0" type="field"/>
-          <column name="timestamp" width="-1" hidden="0" type="field"/>
-          <column name="begin" width="-1" hidden="0" type="field"/>
-          <column name="end" width="-1" hidden="0" type="field"/>
-          <column name="Distance" width="-1" hidden="0" type="field"/>
-          <column name="length_m" width="-1" hidden="0" type="field"/>
-          <column name="length_km" width="-1" hidden="0" type="field"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="org_fid" width="-1" hidden="0"/>
+          <column type="field" name="distance" width="-1" hidden="0"/>
+          <column type="field" name="Name" width="-1" hidden="0"/>
+          <column type="field" name="Source" width="-1" hidden="0"/>
+          <column type="field" name="RouteLen" width="-1" hidden="0"/>
+          <column type="field" name="descriptio" width="-1" hidden="0"/>
+          <column type="field" name="timestamp" width="-1" hidden="0"/>
+          <column type="field" name="begin" width="-1" hidden="0"/>
+          <column type="field" name="end" width="-1" hidden="0"/>
+          <column type="field" name="Distance" width="-1" hidden="0"/>
+          <column type="field" name="length_m" width="-1" hidden="0"/>
+          <column type="field" name="length_km" width="-1" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9253,19 +9236,19 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Source"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="end"/>
-        <field editable="1" name="length_km"/>
-        <field editable="1" name="length_m"/>
-        <field editable="1" name="org_fid"/>
-        <field editable="1" name="quadrant"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="begin" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="distance" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="length_km" editable="1"/>
+        <field name="length_m" editable="1"/>
+        <field name="org_fid" editable="1"/>
+        <field name="quadrant" editable="1"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
         <field name="Distance" labelOnTop="0"/>
@@ -9286,7 +9269,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
       <mapTip>Text</mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" readOnly="0" maxScale="100000" type="vector" minScale="1e+08" simplifyLocal="1" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" geometry="Line" simplifyDrawingHints="0" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" labelsEnabled="0">
+    <maplayer simplifyDrawingTol="1" readOnly="0" maxScale="100000" simplifyLocal="1" simplifyDrawingHints="0" labelsEnabled="0" geometry="Line" type="vector" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" simplifyMaxScale="1" minScale="1e+08" autoRefreshEnabled="0" refreshOnNotifyMessage="" wkbType="MultiLineString">
       <extent>
         <xmin>18.37527226735897301</xmin>
         <ymin>-33.94586066151139647</ymin>
@@ -9343,7 +9326,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" maxx="0" minz="0" miny="0" crs="" dimensions="2" maxz="0" minx="0"/>
+          <spatial maxy="0" maxz="0" maxx="0" minx="0" minz="0" dimensions="2" crs="" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -9367,122 +9350,122 @@ def my_form_open(dialog, layer, feature):
         <Removable>0</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" forceraster="0" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" enableorderby="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule symbol="0" label="Active" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone|spac|constr)' )" key="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" description="Only show when active in Atlas">
-            <rule symbol="1" label="21KM" filter="&quot;Distance&quot; = '21KM'" key="{13a555f1-0140-4584-9ca0-a5c3268249fa}" description="Only show when active in Atlas"/>
-            <rule symbol="2" label="10KM" filter="&quot;Distance&quot; = '10KM'" key="{3047fdca-b9ef-4659-af1a-dbbd7cd48473}" description="Only show when active in Atlas"/>
-            <rule symbol="3" label="5KM" filter="&quot;Distance&quot; = '5KM'" key="{915c5fda-fe09-44ca-bed3-6346c6df4966}" description="Only show when active in Atlas"/>
+          <rule symbol="0" key="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone|spac|constr)' )" description="Only show when active in Atlas" label="Active">
+            <rule symbol="1" key="{13a555f1-0140-4584-9ca0-a5c3268249fa}" filter="&quot;Distance&quot; = '21KM'" description="Only show when active in Atlas" label="21KM"/>
+            <rule symbol="2" key="{3047fdca-b9ef-4659-af1a-dbbd7cd48473}" filter="&quot;Distance&quot; = '10KM'" description="Only show when active in Atlas" label="10KM"/>
+            <rule symbol="3" key="{915c5fda-fe09-44ca-bed3-6346c6df4966}" filter="&quot;Distance&quot; = '5KM'" description="Only show when active in Atlas" label="5KM"/>
           </rule>
         </rules>
         <symbols>
-          <symbol name="0" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.26" 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"/>
+          <symbol type="line" name="0" force_rhr="0" clip_to_extent="1" alpha="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,0,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.26"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" 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"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="250" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+          <symbol type="line" name="1" force_rhr="0" clip_to_extent="1" alpha="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="250"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <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 type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <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 type="Map" name="offsetAlongLine">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@1@0" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="FilledMarker" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="210,32,39,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol type="marker" name="@1@0" force_rhr="0" clip_to_extent="1" alpha="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="210,32,39,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@1@0@0" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-                    <layer enabled="1" pass="0" class="SimpleFill" locked="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="210,32,39,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="227,26,28,0" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol type="fill" name="@@1@0@0" force_rhr="0" clip_to_extent="1" alpha="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="210,32,39,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="227,26,28,0"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -9490,212 +9473,212 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MapUnit" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="210,32,39,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="MapUnit" 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"/>
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MapUnit"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="210,32,39,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.5"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="lastvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="lastvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@1@2" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="210,32,39,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol type="marker" name="@1@2" force_rhr="0" clip_to_extent="1" alpha="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="210,32,39,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="firstvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="firstvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@1@3" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="210,32,39,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol type="marker" name="@1@3" force_rhr="0" clip_to_extent="1" alpha="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="210,32,39,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="250" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+          <symbol type="line" name="2" force_rhr="0" clip_to_extent="1" alpha="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="250"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <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 type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <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 type="Map" name="offsetAlongLine">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@0" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="FilledMarker" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="103,34,144,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol type="marker" name="@2@0" force_rhr="0" clip_to_extent="1" alpha="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="103,34,144,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@2@0@0" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-                    <layer enabled="1" pass="0" class="SimpleFill" locked="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="103,34,144,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="26,0,201,0" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol type="fill" name="@@2@0@0" force_rhr="0" clip_to_extent="1" alpha="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="103,34,144,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="26,0,201,0"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -9703,212 +9686,212 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MapUnit" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="103,34,144,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="MapUnit" 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"/>
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MapUnit"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="103,34,144,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.5"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="lastvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="lastvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@2" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="103,34,144,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol type="marker" name="@2@2" force_rhr="0" clip_to_extent="1" alpha="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="103,34,144,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="Point" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="firstvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="Point"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="firstvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@3" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="103,34,144,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol type="marker" name="@2@3" force_rhr="0" clip_to_extent="1" alpha="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="103,34,144,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="250" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+          <symbol type="line" name="3" force_rhr="0" clip_to_extent="1" alpha="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="250"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <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 type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <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 type="Map" name="offsetAlongLine">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@3@0" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="FilledMarker" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="145,211,55,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol type="marker" name="@3@0" force_rhr="0" clip_to_extent="1" alpha="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="145,211,55,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@3@0@0" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-                    <layer enabled="1" pass="0" class="SimpleFill" locked="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="145,211,55,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="51,160,44,0" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol type="fill" name="@@3@0@0" force_rhr="0" clip_to_extent="1" alpha="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="145,211,55,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="51,160,44,0"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -9916,134 +9899,134 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="lastvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="lastvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@3@1" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="145,211,55,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol type="marker" name="@3@1" force_rhr="0" clip_to_extent="1" alpha="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="145,211,55,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="firstvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="firstvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@3@2" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="145,211,55,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol type="marker" name="@3@2" force_rhr="0" clip_to_extent="1" alpha="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="145,211,55,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="145,211,55,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.4" 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"/>
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="145,211,55,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.4"/>
+              <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"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10059,26 +10042,29 @@ def my_form_open(dialog, layer, feature):
           <value>COALESCE( "Name", '&lt;NULL>' )</value>
           <value>COALESCE( "Name", '&lt;NULL>' )</value>
           <value>COALESCE( "Name", '&lt;NULL>' )</value>
+          <value>COALESCE( "Name", '&lt;NULL>' )</value>
+          <value>COALESCE( "Name", '&lt;NULL>' )</value>
+          <value>COALESCE( "Name", '&lt;NULL>' )</value>
         </property>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minimumSize="0" opacity="1" penAlpha="255" penColor="#000000" enabled="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeType="MM" diagramOrientation="Up" labelPlacementMethod="XHeight" scaleBasedVisibility="0" width="15" minScaleDenominator="100000" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" barWidth="5" backgroundAlpha="255" lineSizeType="MM" penWidth="0">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory diagramOrientation="Up" minScaleDenominator="100000" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penColor="#000000" backgroundAlpha="255" barWidth="5" backgroundColor="#ffffff" lineSizeType="MM" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" height="15" scaleBasedVisibility="0" minimumSize="0" penAlpha="255" maxScaleDenominator="1e+08" penWidth="0" enabled="0" width="15" rotationOffset="270" opacity="1">
           <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+          <attribute color="#000000" field="" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" priority="0" linePlacementFlags="2" placement="2" showAll="1" dist="0">
+      <DiagramLayerSettings placement="2" priority="0" linePlacementFlags="2" obstacle="0" dist="0" zIndex="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -10091,8 +10077,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -10101,8 +10087,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -10111,8 +10097,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -10121,8 +10107,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -10131,8 +10117,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -10141,8 +10127,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -10151,8 +10137,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -10161,8 +10147,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -10171,8 +10157,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -10181,80 +10167,80 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <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="Distance"/>
-        <alias index="6" name="" field="RouteLen"/>
-        <alias index="7" name="" field="length_m"/>
-        <alias index="8" name="" field="length_km"/>
-        <alias index="9" name="" field="Source"/>
+        <alias name="" field="Name" index="0"/>
+        <alias name="" field="descriptio" index="1"/>
+        <alias name="" field="timestamp" index="2"/>
+        <alias name="" field="begin" index="3"/>
+        <alias name="" field="end" index="4"/>
+        <alias name="" field="Distance" index="5"/>
+        <alias name="" field="RouteLen" index="6"/>
+        <alias name="" field="length_m" index="7"/>
+        <alias name="" field="length_km" index="8"/>
+        <alias name="" field="Source" index="9"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <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="Distance"/>
-        <default expression="" applyOnUpdate="0" field="RouteLen"/>
-        <default expression="" applyOnUpdate="0" field="length_m"/>
-        <default expression="" applyOnUpdate="0" field="length_km"/>
-        <default expression="" applyOnUpdate="0" field="Source"/>
+        <default applyOnUpdate="0" field="Name" expression=""/>
+        <default applyOnUpdate="0" field="descriptio" expression=""/>
+        <default applyOnUpdate="0" field="timestamp" expression=""/>
+        <default applyOnUpdate="0" field="begin" expression=""/>
+        <default applyOnUpdate="0" field="end" expression=""/>
+        <default applyOnUpdate="0" field="Distance" expression=""/>
+        <default applyOnUpdate="0" field="RouteLen" expression=""/>
+        <default applyOnUpdate="0" field="length_m" expression=""/>
+        <default applyOnUpdate="0" field="length_km" expression=""/>
+        <default applyOnUpdate="0" field="Source" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Name"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="descriptio"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="timestamp"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="begin"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="end"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Distance"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="RouteLen"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="length_m"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="length_km"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Source"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="Name"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="descriptio"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="timestamp"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="begin"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="end"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="Distance"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="RouteLen"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="length_m"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="length_km"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="Source"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="Name"/>
-        <constraint desc="" exp="" field="descriptio"/>
-        <constraint desc="" exp="" field="timestamp"/>
-        <constraint desc="" exp="" field="begin"/>
-        <constraint desc="" exp="" field="end"/>
-        <constraint desc="" exp="" field="Distance"/>
-        <constraint desc="" exp="" field="RouteLen"/>
-        <constraint desc="" exp="" field="length_m"/>
-        <constraint desc="" exp="" field="length_km"/>
-        <constraint desc="" exp="" field="Source"/>
+        <constraint desc="" field="Name" exp=""/>
+        <constraint desc="" field="descriptio" exp=""/>
+        <constraint desc="" field="timestamp" exp=""/>
+        <constraint desc="" field="begin" exp=""/>
+        <constraint desc="" field="end" exp=""/>
+        <constraint desc="" field="Distance" exp=""/>
+        <constraint desc="" field="RouteLen" exp=""/>
+        <constraint desc="" field="length_m" exp=""/>
+        <constraint desc="" field="length_km" exp=""/>
+        <constraint desc="" field="Source" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;Name&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;Name&quot;" sortOrder="0">
         <columns>
-          <column name="Name" width="-1" hidden="0" type="field"/>
-          <column name="descriptio" width="-1" hidden="0" type="field"/>
-          <column name="timestamp" width="-1" hidden="0" type="field"/>
-          <column name="begin" width="163" hidden="0" type="field"/>
-          <column name="end" width="-1" hidden="0" type="field"/>
-          <column name="Distance" width="-1" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column name="RouteLen" width="-1" hidden="0" type="field"/>
-          <column name="length_m" width="-1" hidden="0" type="field"/>
-          <column name="length_km" width="-1" hidden="0" type="field"/>
-          <column name="Source" width="-1" hidden="0" type="field"/>
+          <column type="field" name="Name" width="-1" hidden="0"/>
+          <column type="field" name="descriptio" width="-1" hidden="0"/>
+          <column type="field" name="timestamp" width="-1" hidden="0"/>
+          <column type="field" name="begin" width="163" hidden="0"/>
+          <column type="field" name="end" width="-1" hidden="0"/>
+          <column type="field" name="Distance" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="RouteLen" width="-1" hidden="0"/>
+          <column type="field" name="length_m" width="-1" hidden="0"/>
+          <column type="field" name="length_km" width="-1" hidden="0"/>
+          <column type="field" name="Source" width="-1" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10285,16 +10271,16 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Source"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="end"/>
-        <field editable="1" name="length_km"/>
-        <field editable="1" name="length_m"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="begin" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="length_km" editable="1"/>
+        <field name="length_m" editable="1"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
         <field name="Distance" labelOnTop="0"/>
@@ -10312,7 +10298,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" readOnly="0" maxScale="0" type="vector" minScale="1e+08" simplifyLocal="1" wkbType="MultiPolygon" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" geometry="Polygon" simplifyDrawingHints="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" labelsEnabled="0">
+    <maplayer simplifyDrawingTol="1" readOnly="0" maxScale="0" simplifyLocal="1" simplifyDrawingHints="1" labelsEnabled="0" geometry="Polygon" type="vector" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" simplifyMaxScale="1" minScale="1e+08" autoRefreshEnabled="0" refreshOnNotifyMessage="" wkbType="MultiPolygon">
       <extent>
         <xmin>18.37312291788339991</xmin>
         <ymin>-33.931815589166888</ymin>
@@ -10376,75 +10362,75 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" forceraster="0" enableorderby="0" type="singleSymbol">
+      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol name="0" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-            <layer enabled="1" pass="0" class="LinePatternFill" locked="0">
-              <prop v="135" k="angle"/>
-              <prop v="211,134,33,255" k="color"/>
-              <prop v="2" k="distance"/>
-              <prop v="3x:0,0,0,0,0,0" k="distance_map_unit_scale"/>
-              <prop v="MM" k="distance_unit"/>
-              <prop v="0.26" k="line_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="line_width_map_unit_scale"/>
-              <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="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
+          <symbol type="fill" name="0" force_rhr="0" clip_to_extent="1" alpha="1">
+            <layer class="LinePatternFill" enabled="1" locked="0" pass="0">
+              <prop k="angle" v="135"/>
+              <prop k="color" v="211,134,33,255"/>
+              <prop k="distance" v="2"/>
+              <prop k="distance_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="distance_unit" v="MM"/>
+              <prop k="line_width" v="0.26"/>
+              <prop k="line_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@0@0" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-                <layer enabled="1" pass="0" class="SimpleLine" locked="0">
-                  <prop v="square" k="capstyle"/>
-                  <prop v="5;2" k="customdash"/>
-                  <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                  <prop v="MM" k="customdash_unit"/>
-                  <prop v="0" k="draw_inside_polygon"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="211,134,33,255" k="line_color"/>
-                  <prop v="solid" k="line_style"/>
-                  <prop v="0.3" 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"/>
+              <symbol type="line" name="@0@0" force_rhr="0" clip_to_extent="1" alpha="1">
+                <layer class="SimpleLine" enabled="1" locked="0" pass="0">
+                  <prop k="capstyle" v="square"/>
+                  <prop k="customdash" v="5;2"/>
+                  <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="customdash_unit" v="MM"/>
+                  <prop k="draw_inside_polygon" v="0"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="line_color" v="211,134,33,255"/>
+                  <prop k="line_style" v="solid"/>
+                  <prop k="line_width" v="0.3"/>
+                  <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"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="SimpleFill" locked="0">
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="211,134,33,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.46" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="no" k="style"/>
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="color" v="211,134,33,255"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="0,0,0,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0.46"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="style" v="no"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10454,26 +10440,26 @@ def my_form_open(dialog, layer, feature):
         <sizescale/>
       </renderer-v2>
       <customproperties>
-        <property value="id" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="dualview/previewExpressions" value="id"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minimumSize="0" opacity="1" penAlpha="255" penColor="#000000" enabled="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeType="MM" diagramOrientation="Up" labelPlacementMethod="XHeight" scaleBasedVisibility="0" width="15" minScaleDenominator="0" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" barWidth="5" backgroundAlpha="255" lineSizeType="MM" penWidth="0">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory diagramOrientation="Up" minScaleDenominator="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penColor="#000000" backgroundAlpha="255" barWidth="5" backgroundColor="#ffffff" lineSizeType="MM" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" height="15" scaleBasedVisibility="0" minimumSize="0" penAlpha="255" maxScaleDenominator="1e+08" penWidth="0" enabled="0" width="15" rotationOffset="270" opacity="1">
           <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+          <attribute color="#000000" field="" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" priority="0" linePlacementFlags="18" placement="1" showAll="1" dist="0">
+      <DiagramLayerSettings placement="1" priority="0" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -10491,28 +10477,28 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="FID"/>
+        <alias name="" field="FID" index="0"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="FID"/>
+        <default applyOnUpdate="0" field="FID" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="FID"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="FID"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="FID"/>
+        <constraint desc="" field="FID" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column name="id" width="-1" hidden="0" type="field"/>
-          <column name="type" width="431" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
+          <column type="field" name="id" width="-1" hidden="0"/>
+          <column type="field" name="type" width="431" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10543,8 +10529,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
         <field name="id" labelOnTop="0"/>
@@ -10554,7 +10540,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" readOnly="0" maxScale="0" type="vector" minScale="1e+08" simplifyLocal="1" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" geometry="Line" simplifyDrawingHints="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" labelsEnabled="1">
+    <maplayer simplifyDrawingTol="1" readOnly="0" maxScale="0" simplifyLocal="1" simplifyDrawingHints="1" labelsEnabled="1" geometry="Line" type="vector" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" simplifyMaxScale="1" minScale="1e+08" autoRefreshEnabled="0" refreshOnNotifyMessage="" wkbType="MultiLineString">
       <extent>
         <xmin>18.3752895999999879</xmin>
         <ymin>-33.94589500000000726</ymin>
@@ -10618,188 +10604,188 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" forceraster="0" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" enableorderby="0">
         <rules key="{57366f52-c504-4c9a-800f-dcbf1d415bf6}">
-          <rule symbol="0" label="Road Closures" filter="&quot;status&quot; = 'closure'" key="{3d527c2d-2e74-4cfa-bc4b-b23a84bd2b64}" checkstate="0"/>
-          <rule symbol="1" label="One-Way" filter="&quot;status&quot; = 'one-way'" key="{15afbf65-f71f-4335-906e-79a74c987d9a}" checkstate="0"/>
-          <rule symbol="2" label="Road Open" filter="&quot;status&quot; = 'open'" key="{1c49b105-b991-480a-b221-afb9009498f0}" checkstate="0"/>
+          <rule symbol="0" key="{3d527c2d-2e74-4cfa-bc4b-b23a84bd2b64}" filter="&quot;status&quot; = 'closure'" checkstate="0" label="Road Closures"/>
+          <rule symbol="1" key="{15afbf65-f71f-4335-906e-79a74c987d9a}" filter="&quot;status&quot; = 'one-way'" checkstate="0" label="One-Way"/>
+          <rule symbol="2" key="{1c49b105-b991-480a-b221-afb9009498f0}" filter="&quot;status&quot; = 'open'" checkstate="0" label="Road Open"/>
         </rules>
         <symbols>
-          <symbol name="0" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="255,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.75" 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"/>
+          <symbol type="line" name="0" force_rhr="0" clip_to_extent="1" alpha="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="255,0,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.75"/>
+              <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"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="outlineStyle" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="outlineStyle">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,255,0,255" k="line_color"/>
-              <prop v="dash" k="line_style"/>
-              <prop v="0.75" 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"/>
+          <symbol type="line" name="1" force_rhr="0" clip_to_extent="1" alpha="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,255,0,255"/>
+              <prop k="line_style" v="dash"/>
+              <prop k="line_width" v="0.75"/>
+              <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"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="outlineStyle" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="outlineStyle">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="250" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MapUnit" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="25" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="250"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MapUnit"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="25"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MapUnit"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="enabled" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="enabled">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@1@1" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="0,255,0,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="35,35,35,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3.5" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol type="marker" name="@1@1" force_rhr="0" clip_to_extent="1" alpha="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="0,255,0,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="35,35,35,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="3.5"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="outlineStyle" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="outlineStyle">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,255,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.75" 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"/>
+          <symbol type="line" name="2" force_rhr="0" clip_to_extent="1" alpha="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,255,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.75"/>
+              <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"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="outlineStyle" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="outlineStyle">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10808,45 +10794,45 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" fontSize="9" namedStyle="Regular" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="1" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="0" fontStrikeout="0" fieldName="times" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="50" useSubstitutions="0">
-            <text-buffer bufferSizeUnits="MM" bufferDraw="1" bufferNoFill="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-            <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeJoinStyle="64" shapeRadiiY="0" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+          <text-style blendMode="0" fontSizeUnit="Point" isExpression="0" textOpacity="1" fontStrikeout="0" useSubstitutions="0" textColor="0,0,0,255" fontSize="9" fontUnderline="0" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fieldName="times" fontFamily="Myriad Pro" fontLetterSpacing="0" multilineHeight="1" namedStyle="Regular" fontWeight="50" fontCapitals="0">
+            <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferSize="1" bufferSizeUnits="MM" bufferBlendMode="0" bufferDraw="1" bufferOpacity="1" bufferColor="255,255,255,255"/>
+            <background shapeOffsetX="0" shapeSVGFile="" shapeSizeType="0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeX="0" shapeRotation="0" shapeRadiiUnit="MM" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeOpacity="1" shapeBorderWidthUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeType="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeBorderWidth="0"/>
+            <shadow shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowUnder="0" shadowBlendMode="6"/>
             <substitutions/>
           </text-style>
-          <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="4294967295" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-          <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="2" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="5" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MM" dist="0" maxCurvedCharAngleIn="25" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-          <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="0" displayAll="0" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="0" scaleVisibility="0" obstacleFactor="1" fontMaxPixelSize="10000" obstacleType="0"/>
+          <text-format wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" reverseDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="4294967295" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0"/>
+          <placement fitInPolygonOnly="0" repeatDistance="0" placement="2" priority="5" centroidWhole="0" placementFlags="10" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" maxCurvedCharAngleIn="25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" maxCurvedCharAngleOut="-25" xOffset="0" yOffset="0" dist="0" centroidInside="0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" offsetUnits="MM" geometryGeneratorType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
+          <rendering scaleVisibility="0" maxNumLabels="2000" fontLimitPixelSize="0" minFeatureSize="0" upsidedownLabels="0" displayAll="0" mergeLines="0" fontMinPixelSize="3" limitNumLabels="0" scaleMin="0" obstacleFactor="1" drawLabels="1" zIndex="0" obstacleType="0" labelPerPart="0" fontMaxPixelSize="10000" scaleMax="0" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </settings>
       </labeling>
       <customproperties>
-        <property value="id" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="dualview/previewExpressions" value="id"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minimumSize="0" opacity="1" penAlpha="255" penColor="#000000" enabled="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeType="MM" diagramOrientation="Up" labelPlacementMethod="XHeight" scaleBasedVisibility="0" width="15" minScaleDenominator="0" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" barWidth="5" backgroundAlpha="255" lineSizeType="MM" penWidth="0">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory diagramOrientation="Up" minScaleDenominator="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penColor="#000000" backgroundAlpha="255" barWidth="5" backgroundColor="#ffffff" lineSizeType="MM" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" height="15" scaleBasedVisibility="0" minimumSize="0" penAlpha="255" maxScaleDenominator="1e+08" penWidth="0" enabled="0" width="15" rotationOffset="270" opacity="1">
           <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+          <attribute color="#000000" field="" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" priority="0" linePlacementFlags="18" placement="2" showAll="1" dist="0">
+      <DiagramLayerSettings placement="2" priority="0" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -10885,42 +10871,42 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="type"/>
-        <alias index="2" name="" field="status"/>
-        <alias index="3" name="" field="times"/>
+        <alias name="" field="id" index="0"/>
+        <alias name="" field="type" index="1"/>
+        <alias name="" field="status" index="2"/>
+        <alias name="" field="times" index="3"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <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" field="id" expression=""/>
+        <default applyOnUpdate="0" field="type" expression=""/>
+        <default applyOnUpdate="0" field="status" expression=""/>
+        <default applyOnUpdate="0" field="times" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="id"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="type"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="status"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="times"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="id"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="type"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="status"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="times"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="status"/>
-        <constraint desc="" exp="" field="times"/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="status" exp=""/>
+        <constraint desc="" field="times" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;" sortOrder="0">
         <columns>
-          <column name="id" width="-1" hidden="0" type="field"/>
-          <column name="type" width="202" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column name="status" width="-1" hidden="0" type="field"/>
-          <column name="times" width="-1" hidden="0" type="field"/>
+          <column type="field" name="id" width="-1" hidden="0"/>
+          <column type="field" name="type" width="202" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="status" width="-1" hidden="0"/>
+          <column type="field" name="times" width="-1" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10951,10 +10937,10 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="status"/>
-        <field editable="1" name="times"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="status" editable="1"/>
+        <field name="times" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
         <field name="id" labelOnTop="0"/>
@@ -10966,7 +10952,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" readOnly="0" maxScale="100000" type="vector" minScale="1e+08" simplifyLocal="1" wkbType="Point" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" geometry="Point" simplifyDrawingHints="0" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" labelsEnabled="1">
+    <maplayer simplifyDrawingTol="1" readOnly="0" maxScale="100000" simplifyLocal="1" simplifyDrawingHints="0" labelsEnabled="1" geometry="Point" type="vector" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" simplifyMaxScale="1" minScale="1e+08" autoRefreshEnabled="0" refreshOnNotifyMessage="" wkbType="Point">
       <extent>
         <xmin>18.37601210021433928</xmin>
         <ymin>-33.94454035775031286</ymin>
@@ -11023,7 +11009,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" maxx="0" minz="0" miny="0" crs="" dimensions="2" maxz="0" minx="0"/>
+          <spatial maxy="0" maxz="0" maxx="0" minx="0" minz="0" dimensions="2" crs="" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -11050,251 +11036,251 @@ def my_form_open(dialog, layer, feature):
       <renderer-v2 type="nullSymbol"/>
       <labeling type="rule-based">
         <rules key="{9dfa2d77-6e52-4640-91f6-8cd0a7b822ed}">
-          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{a130bab9-8b6c-4395-8ba0-7ae70031713d}" description="Active">
-            <rule filter="&quot;Source&quot; = '21KM'" key="{c646d958-ac1a-4ea1-99c1-2c147334f417}" description="21KM">
+          <rule key="{a130bab9-8b6c-4395-8ba0-7ae70031713d}" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="Active">
+            <rule key="{c646d958-ac1a-4ea1-99c1-2c147334f417}" filter="&quot;Source&quot; = '21KM'" description="21KM">
               <settings>
-                <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" fontSize="10" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="1" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="1" fontStrikeout="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-                  <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                  <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="210,32,39,255" shapeType="0" shapeJoinStyle="128" shapeRadiiY="1" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="210,32,39,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="1" shapeBorderWidth="1" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="1" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+                <text-style blendMode="0" fontSizeUnit="Point" isExpression="1" textOpacity="1" fontStrikeout="0" useSubstitutions="0" textColor="255,255,255,255" fontSize="10" fontUnderline="0" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontFamily="Myriad Pro" fontLetterSpacing="0" multilineHeight="1" namedStyle="Semibold" fontWeight="63" fontCapitals="0">
+                  <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferSizeUnits="MM" bufferBlendMode="0" bufferDraw="0" bufferOpacity="1" bufferColor="255,255,255,255"/>
+                  <background shapeOffsetX="0" shapeSVGFile="" shapeSizeType="0" shapeSizeUnit="MM" shapeFillColor="210,32,39,255" shapeRadiiY="1" shapeSizeX="1" shapeRotation="0" shapeRadiiUnit="MM" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeOpacity="1" shapeBorderWidthUnit="MM" shapeJoinStyle="128" shapeBlendMode="0" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="210,32,39,255" shapeType="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeBorderWidth="1"/>
+                  <shadow shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowUnder="0" shadowBlendMode="6"/>
                   <substitutions/>
                 </text-style>
-                <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="0" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-                <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="3" placement="6" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="10" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="2" maxCurvedCharAngleIn="20" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-                <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="1" scaleVisibility="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacleType="0"/>
+                <text-format wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" reverseDirectionSymbol="0" decimals="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0"/>
+                <placement fitInPolygonOnly="0" repeatDistance="0" placement="6" priority="10" centroidWhole="0" placementFlags="10" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" maxCurvedCharAngleOut="-20" xOffset="0" yOffset="0" dist="2" centroidInside="0" repeatDistanceUnits="MM" offsetType="0" quadOffset="3" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
+                <rendering scaleVisibility="0" maxNumLabels="2000" fontLimitPixelSize="0" minFeatureSize="0" upsidedownLabels="0" displayAll="1" mergeLines="0" fontMinPixelSize="3" limitNumLabels="0" scaleMin="1" obstacleFactor="2" drawLabels="1" zIndex="0" obstacleType="0" labelPerPart="0" fontMaxPixelSize="10000" scaleMax="10000000" obstacle="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="field" value="quadrant" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                      <Option type="Map" name="PredefinedPositionOrder">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="quadrant"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="field" value="rotation" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                      <Option type="Map" name="Rotation">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="QString" name="field" value="rotation"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
               </settings>
             </rule>
-            <rule filter="&quot;Source&quot; = '10KM'" key="{b2fb2188-6121-4982-bc1c-04ddb70f9be7}" description="10KM">
+            <rule key="{b2fb2188-6121-4982-bc1c-04ddb70f9be7}" filter="&quot;Source&quot; = '10KM'" description="10KM">
               <settings>
-                <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" fontSize="10" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="1" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="1" fontStrikeout="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-                  <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                  <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="103,34,144,255" shapeType="0" shapeJoinStyle="128" shapeRadiiY="1" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="103,34,144,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="1" shapeBorderWidth="1" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="1" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+                <text-style blendMode="0" fontSizeUnit="Point" isExpression="1" textOpacity="1" fontStrikeout="0" useSubstitutions="0" textColor="255,255,255,255" fontSize="10" fontUnderline="0" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontFamily="Myriad Pro" fontLetterSpacing="0" multilineHeight="1" namedStyle="Semibold" fontWeight="63" fontCapitals="0">
+                  <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferSizeUnits="MM" bufferBlendMode="0" bufferDraw="0" bufferOpacity="1" bufferColor="255,255,255,255"/>
+                  <background shapeOffsetX="0" shapeSVGFile="" shapeSizeType="0" shapeSizeUnit="MM" shapeFillColor="103,34,144,255" shapeRadiiY="1" shapeSizeX="1" shapeRotation="0" shapeRadiiUnit="MM" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeOpacity="1" shapeBorderWidthUnit="MM" shapeJoinStyle="128" shapeBlendMode="0" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="103,34,144,255" shapeType="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeBorderWidth="1"/>
+                  <shadow shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowUnder="0" shadowBlendMode="6"/>
                   <substitutions/>
                 </text-style>
-                <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="0" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-                <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="6" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="10" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="2" maxCurvedCharAngleIn="20" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-                <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="1" scaleVisibility="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacleType="0"/>
+                <text-format wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" reverseDirectionSymbol="0" decimals="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0"/>
+                <placement fitInPolygonOnly="0" repeatDistance="0" placement="6" priority="10" centroidWhole="0" placementFlags="10" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" maxCurvedCharAngleOut="-20" xOffset="0" yOffset="0" dist="2" centroidInside="0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
+                <rendering scaleVisibility="0" maxNumLabels="2000" fontLimitPixelSize="0" minFeatureSize="0" upsidedownLabels="0" displayAll="1" mergeLines="0" fontMinPixelSize="3" limitNumLabels="0" scaleMin="1" obstacleFactor="2" drawLabels="1" zIndex="0" obstacleType="0" labelPerPart="0" fontMaxPixelSize="10000" scaleMax="10000000" obstacle="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="field" value="quadrant" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                      <Option type="Map" name="PredefinedPositionOrder">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="quadrant"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="field" value="rotation" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                      <Option type="Map" name="Rotation">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="QString" name="field" value="rotation"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
               </settings>
             </rule>
-            <rule filter="&quot;Source&quot; = '5KM'" key="{7b3b06bf-7cd8-4b3c-9c28-a4b85c60458e}" description="5KM">
+            <rule key="{7b3b06bf-7cd8-4b3c-9c28-a4b85c60458e}" filter="&quot;Source&quot; = '5KM'" description="5KM">
               <settings>
-                <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" fontSize="10" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="1" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="1" fontStrikeout="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-                  <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                  <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="145,211,55,255" shapeType="0" shapeJoinStyle="128" shapeRadiiY="1" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="145,211,55,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="1" shapeBorderWidth="1" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="1" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+                <text-style blendMode="0" fontSizeUnit="Point" isExpression="1" textOpacity="1" fontStrikeout="0" useSubstitutions="0" textColor="255,255,255,255" fontSize="10" fontUnderline="0" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontFamily="Myriad Pro" fontLetterSpacing="0" multilineHeight="1" namedStyle="Semibold" fontWeight="63" fontCapitals="0">
+                  <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferSizeUnits="MM" bufferBlendMode="0" bufferDraw="0" bufferOpacity="1" bufferColor="255,255,255,255"/>
+                  <background shapeOffsetX="0" shapeSVGFile="" shapeSizeType="0" shapeSizeUnit="MM" shapeFillColor="145,211,55,255" shapeRadiiY="1" shapeSizeX="1" shapeRotation="0" shapeRadiiUnit="MM" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeOpacity="1" shapeBorderWidthUnit="MM" shapeJoinStyle="128" shapeBlendMode="0" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeType="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeBorderWidth="1"/>
+                  <shadow shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowUnder="0" shadowBlendMode="6"/>
                   <substitutions/>
                 </text-style>
-                <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="0" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-                <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="6" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="10" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="2" maxCurvedCharAngleIn="20" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-                <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="1" scaleVisibility="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacleType="0"/>
+                <text-format wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" reverseDirectionSymbol="0" decimals="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0"/>
+                <placement fitInPolygonOnly="0" repeatDistance="0" placement="6" priority="10" centroidWhole="0" placementFlags="10" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" maxCurvedCharAngleOut="-20" xOffset="0" yOffset="0" dist="2" centroidInside="0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
+                <rendering scaleVisibility="0" maxNumLabels="2000" fontLimitPixelSize="0" minFeatureSize="0" upsidedownLabels="0" displayAll="1" mergeLines="0" fontMinPixelSize="3" limitNumLabels="0" scaleMin="1" obstacleFactor="2" drawLabels="1" zIndex="0" obstacleType="0" labelPerPart="0" fontMaxPixelSize="10000" scaleMax="10000000" obstacle="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="field" value="quadrant" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                      <Option type="Map" name="PredefinedPositionOrder">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="quadrant"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="field" value="rotation" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                      <Option type="Map" name="Rotation">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="QString" name="field" value="rotation"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
               </settings>
             </rule>
           </rule>
-          <rule key="{2b06f76f-7537-425c-a1e0-da99f8965c9f}" description="Always show" active="0">
-            <rule filter="&quot;Source&quot; = '21KM'" key="{c739bb0e-e629-4c73-abbd-017b5b56ae01}" description="21KM" active="0">
+          <rule active="0" key="{2b06f76f-7537-425c-a1e0-da99f8965c9f}" description="Always show">
+            <rule active="0" key="{c739bb0e-e629-4c73-abbd-017b5b56ae01}" filter="&quot;Source&quot; = '21KM'" description="21KM">
               <settings>
-                <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" fontSize="8" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="1" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="1" fontStrikeout="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-                  <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                  <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="210,32,39,255" shapeType="0" shapeJoinStyle="128" shapeRadiiY="1" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="210,32,39,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="0.5" shapeBorderWidth="1" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="0.5" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+                <text-style blendMode="0" fontSizeUnit="Point" isExpression="1" textOpacity="1" fontStrikeout="0" useSubstitutions="0" textColor="255,255,255,255" fontSize="8" fontUnderline="0" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontFamily="Myriad Pro" fontLetterSpacing="0" multilineHeight="1" namedStyle="Semibold" fontWeight="63" fontCapitals="0">
+                  <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferSizeUnits="MM" bufferBlendMode="0" bufferDraw="0" bufferOpacity="1" bufferColor="255,255,255,255"/>
+                  <background shapeOffsetX="0" shapeSVGFile="" shapeSizeType="0" shapeSizeUnit="MM" shapeFillColor="210,32,39,255" shapeRadiiY="1" shapeSizeX="0.5" shapeRotation="0" shapeRadiiUnit="MM" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeOpacity="1" shapeBorderWidthUnit="MM" shapeJoinStyle="128" shapeBlendMode="0" shapeRadiiX="0.5" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="210,32,39,255" shapeType="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeBorderWidth="1"/>
+                  <shadow shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowUnder="0" shadowBlendMode="6"/>
                   <substitutions/>
                 </text-style>
-                <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="0" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-                <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="3" placement="6" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="10" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="2" maxCurvedCharAngleIn="20" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-                <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="1" scaleVisibility="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacleType="0"/>
+                <text-format wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" reverseDirectionSymbol="0" decimals="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0"/>
+                <placement fitInPolygonOnly="0" repeatDistance="0" placement="6" priority="10" centroidWhole="0" placementFlags="10" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" maxCurvedCharAngleOut="-20" xOffset="0" yOffset="0" dist="2" centroidInside="0" repeatDistanceUnits="MM" offsetType="0" quadOffset="3" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
+                <rendering scaleVisibility="0" maxNumLabels="2000" fontLimitPixelSize="0" minFeatureSize="0" upsidedownLabels="0" displayAll="1" mergeLines="0" fontMinPixelSize="3" limitNumLabels="0" scaleMin="1" obstacleFactor="2" drawLabels="1" zIndex="0" obstacleType="0" labelPerPart="0" fontMaxPixelSize="10000" scaleMax="10000000" obstacle="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="field" value="quadrant" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                      <Option type="Map" name="PredefinedPositionOrder">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="quadrant"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="field" value="rotation" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                      <Option type="Map" name="Rotation">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="QString" name="field" value="rotation"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
               </settings>
             </rule>
-            <rule filter="&quot;Source&quot; = '10KM'" key="{3edc5d00-f213-44ae-9a91-62cbf88e850c}" description="10KM" active="0">
+            <rule active="0" key="{3edc5d00-f213-44ae-9a91-62cbf88e850c}" filter="&quot;Source&quot; = '10KM'" description="10KM">
               <settings>
-                <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" fontSize="8" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="1" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="1" fontStrikeout="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-                  <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                  <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="103,34,144,255" shapeType="0" shapeJoinStyle="128" shapeRadiiY="1" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="103,34,144,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="0.5" shapeBorderWidth="1" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="0.5" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+                <text-style blendMode="0" fontSizeUnit="Point" isExpression="1" textOpacity="1" fontStrikeout="0" useSubstitutions="0" textColor="255,255,255,255" fontSize="8" fontUnderline="0" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontFamily="Myriad Pro" fontLetterSpacing="0" multilineHeight="1" namedStyle="Semibold" fontWeight="63" fontCapitals="0">
+                  <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferSizeUnits="MM" bufferBlendMode="0" bufferDraw="0" bufferOpacity="1" bufferColor="255,255,255,255"/>
+                  <background shapeOffsetX="0" shapeSVGFile="" shapeSizeType="0" shapeSizeUnit="MM" shapeFillColor="103,34,144,255" shapeRadiiY="1" shapeSizeX="0.5" shapeRotation="0" shapeRadiiUnit="MM" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeOpacity="1" shapeBorderWidthUnit="MM" shapeJoinStyle="128" shapeBlendMode="0" shapeRadiiX="0.5" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="103,34,144,255" shapeType="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeBorderWidth="1"/>
+                  <shadow shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowUnder="0" shadowBlendMode="6"/>
                   <substitutions/>
                 </text-style>
-                <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="0" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-                <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="6" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="10" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="2" maxCurvedCharAngleIn="20" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-                <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="1" scaleVisibility="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacleType="0"/>
+                <text-format wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" reverseDirectionSymbol="0" decimals="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0"/>
+                <placement fitInPolygonOnly="0" repeatDistance="0" placement="6" priority="10" centroidWhole="0" placementFlags="10" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" maxCurvedCharAngleOut="-20" xOffset="0" yOffset="0" dist="2" centroidInside="0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
+                <rendering scaleVisibility="0" maxNumLabels="2000" fontLimitPixelSize="0" minFeatureSize="0" upsidedownLabels="0" displayAll="1" mergeLines="0" fontMinPixelSize="3" limitNumLabels="0" scaleMin="1" obstacleFactor="2" drawLabels="1" zIndex="0" obstacleType="0" labelPerPart="0" fontMaxPixelSize="10000" scaleMax="10000000" obstacle="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="field" value="quadrant" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                      <Option type="Map" name="PredefinedPositionOrder">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="quadrant"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="field" value="rotation" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                      <Option type="Map" name="Rotation">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="QString" name="field" value="rotation"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
               </settings>
             </rule>
-            <rule filter="&quot;Source&quot; = '5KM'" key="{1b5b2a5b-81b0-42be-86e5-12e6f7f654bc}" description="5KM" active="0">
+            <rule active="0" key="{1b5b2a5b-81b0-42be-86e5-12e6f7f654bc}" filter="&quot;Source&quot; = '5KM'" description="5KM">
               <settings>
-                <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" fontSize="8" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="1" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="1" fontStrikeout="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-                  <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                  <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="145,211,55,255" shapeType="0" shapeJoinStyle="128" shapeRadiiY="1" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="145,211,55,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="0.5" shapeBorderWidth="1" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="0.5" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+                <text-style blendMode="0" fontSizeUnit="Point" isExpression="1" textOpacity="1" fontStrikeout="0" useSubstitutions="0" textColor="255,255,255,255" fontSize="8" fontUnderline="0" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontFamily="Myriad Pro" fontLetterSpacing="0" multilineHeight="1" namedStyle="Semibold" fontWeight="63" fontCapitals="0">
+                  <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferSizeUnits="MM" bufferBlendMode="0" bufferDraw="0" bufferOpacity="1" bufferColor="255,255,255,255"/>
+                  <background shapeOffsetX="0" shapeSVGFile="" shapeSizeType="0" shapeSizeUnit="MM" shapeFillColor="145,211,55,255" shapeRadiiY="1" shapeSizeX="0.5" shapeRotation="0" shapeRadiiUnit="MM" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeOpacity="1" shapeBorderWidthUnit="MM" shapeJoinStyle="128" shapeBlendMode="0" shapeRadiiX="0.5" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeType="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeBorderWidth="1"/>
+                  <shadow shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowUnder="0" shadowBlendMode="6"/>
                   <substitutions/>
                 </text-style>
-                <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="0" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-                <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="6" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="10" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="2" maxCurvedCharAngleIn="20" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-                <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="1" scaleVisibility="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacleType="0"/>
+                <text-format wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" reverseDirectionSymbol="0" decimals="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0"/>
+                <placement fitInPolygonOnly="0" repeatDistance="0" placement="6" priority="10" centroidWhole="0" placementFlags="10" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" maxCurvedCharAngleOut="-20" xOffset="0" yOffset="0" dist="2" centroidInside="0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
+                <rendering scaleVisibility="0" maxNumLabels="2000" fontLimitPixelSize="0" minFeatureSize="0" upsidedownLabels="0" displayAll="1" mergeLines="0" fontMinPixelSize="3" limitNumLabels="0" scaleMin="1" obstacleFactor="2" drawLabels="1" zIndex="0" obstacleType="0" labelPerPart="0" fontMaxPixelSize="10000" scaleMax="10000000" obstacle="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="field" value="quadrant" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                      <Option type="Map" name="PredefinedPositionOrder">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="quadrant"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="field" value="rotation" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                      <Option type="Map" name="Rotation">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="QString" name="field" value="rotation"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
               </settings>
@@ -11303,26 +11289,26 @@ def my_form_open(dialog, layer, feature):
         </rules>
       </labeling>
       <customproperties>
-        <property value="COALESCE(&quot;Text&quot;, '&lt;NULL>')" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="dualview/previewExpressions" value="COALESCE(&quot;Text&quot;, '&lt;NULL>')"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minimumSize="0" opacity="1" penAlpha="255" penColor="#000000" enabled="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeType="MM" diagramOrientation="Up" labelPlacementMethod="XHeight" scaleBasedVisibility="0" width="15" minScaleDenominator="100000" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" barWidth="5" backgroundAlpha="255" lineSizeType="MM" penWidth="0">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory diagramOrientation="Up" minScaleDenominator="100000" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penColor="#000000" backgroundAlpha="255" barWidth="5" backgroundColor="#ffffff" lineSizeType="MM" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" height="15" scaleBasedVisibility="0" minimumSize="0" penAlpha="255" maxScaleDenominator="1e+08" penWidth="0" enabled="0" width="15" rotationOffset="270" opacity="1">
           <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+          <attribute color="#000000" field="" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" priority="0" linePlacementFlags="2" placement="0" showAll="1" dist="0">
+      <DiagramLayerSettings placement="0" priority="0" linePlacementFlags="2" obstacle="0" dist="0" zIndex="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -11335,8 +11321,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11345,8 +11331,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11355,8 +11341,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11365,8 +11351,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11375,8 +11361,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11385,8 +11371,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11395,8 +11381,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11405,8 +11391,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11415,8 +11401,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11425,8 +11411,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11435,8 +11421,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11445,90 +11431,90 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <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="Distance"/>
-        <alias index="6" name="" field="RouteLen"/>
-        <alias index="7" name="" field="length_m"/>
-        <alias index="8" name="" field="length_km"/>
-        <alias index="9" name="" field="Source"/>
-        <alias index="10" name="" field="org_fid"/>
-        <alias index="11" name="" field="distance"/>
+        <alias name="" field="Name" index="0"/>
+        <alias name="" field="descriptio" index="1"/>
+        <alias name="" field="timestamp" index="2"/>
+        <alias name="" field="begin" index="3"/>
+        <alias name="" field="end" index="4"/>
+        <alias name="" field="Distance" index="5"/>
+        <alias name="" field="RouteLen" index="6"/>
+        <alias name="" field="length_m" index="7"/>
+        <alias name="" field="length_km" index="8"/>
+        <alias name="" field="Source" index="9"/>
+        <alias name="" field="org_fid" index="10"/>
+        <alias name="" field="distance" index="11"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <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="Distance"/>
-        <default expression="" applyOnUpdate="0" field="RouteLen"/>
-        <default expression="" applyOnUpdate="0" field="length_m"/>
-        <default expression="" applyOnUpdate="0" field="length_km"/>
-        <default expression="" applyOnUpdate="0" field="Source"/>
-        <default expression="" applyOnUpdate="0" field="org_fid"/>
-        <default expression="" applyOnUpdate="0" field="distance"/>
+        <default applyOnUpdate="0" field="Name" expression=""/>
+        <default applyOnUpdate="0" field="descriptio" expression=""/>
+        <default applyOnUpdate="0" field="timestamp" expression=""/>
+        <default applyOnUpdate="0" field="begin" expression=""/>
+        <default applyOnUpdate="0" field="end" expression=""/>
+        <default applyOnUpdate="0" field="Distance" expression=""/>
+        <default applyOnUpdate="0" field="RouteLen" expression=""/>
+        <default applyOnUpdate="0" field="length_m" expression=""/>
+        <default applyOnUpdate="0" field="length_km" expression=""/>
+        <default applyOnUpdate="0" field="Source" expression=""/>
+        <default applyOnUpdate="0" field="org_fid" expression=""/>
+        <default applyOnUpdate="0" field="distance" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Name"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="descriptio"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="timestamp"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="begin"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="end"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Distance"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="RouteLen"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="length_m"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="length_km"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Source"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="org_fid"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="distance"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="Name"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="descriptio"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="timestamp"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="begin"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="end"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="Distance"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="RouteLen"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="length_m"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="length_km"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="Source"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="org_fid"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="distance"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="Name"/>
-        <constraint desc="" exp="" field="descriptio"/>
-        <constraint desc="" exp="" field="timestamp"/>
-        <constraint desc="" exp="" field="begin"/>
-        <constraint desc="" exp="" field="end"/>
-        <constraint desc="" exp="" field="Distance"/>
-        <constraint desc="" exp="" field="RouteLen"/>
-        <constraint desc="" exp="" field="length_m"/>
-        <constraint desc="" exp="" field="length_km"/>
-        <constraint desc="" exp="" field="Source"/>
-        <constraint desc="" exp="" field="org_fid"/>
-        <constraint desc="" exp="" field="distance"/>
+        <constraint desc="" field="Name" exp=""/>
+        <constraint desc="" field="descriptio" exp=""/>
+        <constraint desc="" field="timestamp" exp=""/>
+        <constraint desc="" field="begin" exp=""/>
+        <constraint desc="" field="end" exp=""/>
+        <constraint desc="" field="Distance" exp=""/>
+        <constraint desc="" field="RouteLen" exp=""/>
+        <constraint desc="" field="length_m" exp=""/>
+        <constraint desc="" field="length_km" exp=""/>
+        <constraint desc="" field="Source" exp=""/>
+        <constraint desc="" field="org_fid" exp=""/>
+        <constraint desc="" field="distance" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;distance&quot;" sortOrder="1" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;distance&quot;" sortOrder="1">
         <columns>
-          <column width="-1" hidden="1" type="actions"/>
-          <column name="org_fid" width="-1" hidden="0" type="field"/>
-          <column name="distance" width="-1" hidden="0" type="field"/>
-          <column name="Name" width="-1" hidden="0" type="field"/>
-          <column name="Source" width="-1" hidden="0" type="field"/>
-          <column name="RouteLen" width="-1" hidden="0" type="field"/>
-          <column name="descriptio" width="-1" hidden="0" type="field"/>
-          <column name="timestamp" width="-1" hidden="0" type="field"/>
-          <column name="begin" width="-1" hidden="0" type="field"/>
-          <column name="end" width="-1" hidden="0" type="field"/>
-          <column name="Distance" width="-1" hidden="0" type="field"/>
-          <column name="length_m" width="-1" hidden="0" type="field"/>
-          <column name="length_km" width="-1" hidden="0" type="field"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="org_fid" width="-1" hidden="0"/>
+          <column type="field" name="distance" width="-1" hidden="0"/>
+          <column type="field" name="Name" width="-1" hidden="0"/>
+          <column type="field" name="Source" width="-1" hidden="0"/>
+          <column type="field" name="RouteLen" width="-1" hidden="0"/>
+          <column type="field" name="descriptio" width="-1" hidden="0"/>
+          <column type="field" name="timestamp" width="-1" hidden="0"/>
+          <column type="field" name="begin" width="-1" hidden="0"/>
+          <column type="field" name="end" width="-1" hidden="0"/>
+          <column type="field" name="Distance" width="-1" hidden="0"/>
+          <column type="field" name="length_m" width="-1" hidden="0"/>
+          <column type="field" name="length_km" width="-1" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11559,19 +11545,19 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Source"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="end"/>
-        <field editable="1" name="length_km"/>
-        <field editable="1" name="length_m"/>
-        <field editable="1" name="org_fid"/>
-        <field editable="1" name="quadrant"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="begin" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="distance" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="length_km" editable="1"/>
+        <field name="length_m" editable="1"/>
+        <field name="org_fid" editable="1"/>
+        <field name="quadrant" editable="1"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
         <field name="Distance" labelOnTop="0"/>
@@ -11592,7 +11578,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
       <mapTip>Text</mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" readOnly="0" maxScale="100000" type="vector" minScale="1e+08" simplifyLocal="1" wkbType="Point" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" geometry="Point" simplifyDrawingHints="0" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" labelsEnabled="1">
+    <maplayer simplifyDrawingTol="1" readOnly="0" maxScale="100000" simplifyLocal="1" simplifyDrawingHints="0" labelsEnabled="1" geometry="Point" type="vector" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" simplifyMaxScale="1" minScale="1e+08" autoRefreshEnabled="0" refreshOnNotifyMessage="" wkbType="Point">
       <extent>
         <xmin>18.37564686539056424</xmin>
         <ymin>-33.94557380387234957</ymin>
@@ -11659,145 +11645,145 @@ def my_form_open(dialog, layer, feature):
       <renderer-v2 type="nullSymbol"/>
       <labeling type="rule-based">
         <rules key="{dcce4a01-cb4f-41a8-88eb-a09338c9148b}">
-          <rule filter="&quot;Source&quot; = '21KM' AND ( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' ) OR 'marshal plan' = attribute( @atlas_feature , 'type' ) OR 'marshal' = attribute( @atlas_feature , 'type' ) )" key="{85c566ca-8799-48c9-8ba8-26b2b1f35482}" description="21KM">
+          <rule key="{85c566ca-8799-48c9-8ba8-26b2b1f35482}" filter="&quot;Source&quot; = '21KM' AND ( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' ) OR 'marshal plan' = attribute( @atlas_feature , 'type' ) OR 'marshal' = attribute( @atlas_feature , 'type' ) )" description="21KM">
             <settings>
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" fontSize="10" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="1" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="1" fontStrikeout="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-                <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="210,32,39,255" shapeType="0" shapeJoinStyle="128" shapeRadiiY="1" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="210,32,39,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="1" shapeBorderWidth="1" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="1" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+              <text-style blendMode="0" fontSizeUnit="Point" isExpression="1" textOpacity="1" fontStrikeout="0" useSubstitutions="0" textColor="255,255,255,255" fontSize="10" fontUnderline="0" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontFamily="Myriad Pro" fontLetterSpacing="0" multilineHeight="1" namedStyle="Semibold" fontWeight="63" fontCapitals="0">
+                <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferSizeUnits="MM" bufferBlendMode="0" bufferDraw="0" bufferOpacity="1" bufferColor="255,255,255,255"/>
+                <background shapeOffsetX="0" shapeSVGFile="" shapeSizeType="0" shapeSizeUnit="MM" shapeFillColor="210,32,39,255" shapeRadiiY="1" shapeSizeX="1" shapeRotation="0" shapeRadiiUnit="MM" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeOpacity="1" shapeBorderWidthUnit="MM" shapeJoinStyle="128" shapeBlendMode="0" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="210,32,39,255" shapeType="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeBorderWidth="1"/>
+                <shadow shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowUnder="0" shadowBlendMode="6"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="0" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-              <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="3" placement="6" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="10" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="2" maxCurvedCharAngleIn="20" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-              <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="1" scaleVisibility="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacleType="0"/>
+              <text-format wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" reverseDirectionSymbol="0" decimals="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0"/>
+              <placement fitInPolygonOnly="0" repeatDistance="0" placement="6" priority="10" centroidWhole="0" placementFlags="10" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" maxCurvedCharAngleOut="-20" xOffset="0" yOffset="0" dist="2" centroidInside="0" repeatDistanceUnits="MM" offsetType="0" quadOffset="3" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
+              <rendering scaleVisibility="0" maxNumLabels="2000" fontLimitPixelSize="0" minFeatureSize="0" upsidedownLabels="0" displayAll="1" mergeLines="0" fontMinPixelSize="3" limitNumLabels="0" scaleMin="1" obstacleFactor="2" drawLabels="1" zIndex="0" obstacleType="0" labelPerPart="0" fontMaxPixelSize="10000" scaleMax="10000000" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="PredefinedPositionOrder" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="field" value="quadrant" type="QString"/>
-                      <Option name="type" value="2" type="int"/>
+                    <Option type="Map" name="PredefinedPositionOrder">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="quadrant"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
-                    <Option name="Rotation" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="field" value="rotation" type="QString"/>
-                      <Option name="type" value="2" type="int"/>
+                    <Option type="Map" name="Rotation">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="field" value="rotation"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </settings>
           </rule>
-          <rule filter="&quot;Source&quot; = '10KM' AND ( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' ) OR 'marshal plan' = attribute( @atlas_feature , 'type' ) OR 'marshal' = attribute( @atlas_feature , 'type' ) )" key="{f30a25fa-c4c5-427d-99bc-14adf7dbed5e}" description="10KM">
+          <rule key="{f30a25fa-c4c5-427d-99bc-14adf7dbed5e}" filter="&quot;Source&quot; = '10KM' AND ( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' ) OR 'marshal plan' = attribute( @atlas_feature , 'type' ) OR 'marshal' = attribute( @atlas_feature , 'type' ) )" description="10KM">
             <settings>
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" fontSize="10" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="1" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="1" fontStrikeout="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-                <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="103,34,144,255" shapeType="0" shapeJoinStyle="128" shapeRadiiY="1" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="103,34,144,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="1" shapeBorderWidth="1" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="1" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+              <text-style blendMode="0" fontSizeUnit="Point" isExpression="1" textOpacity="1" fontStrikeout="0" useSubstitutions="0" textColor="255,255,255,255" fontSize="10" fontUnderline="0" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontFamily="Myriad Pro" fontLetterSpacing="0" multilineHeight="1" namedStyle="Semibold" fontWeight="63" fontCapitals="0">
+                <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferSizeUnits="MM" bufferBlendMode="0" bufferDraw="0" bufferOpacity="1" bufferColor="255,255,255,255"/>
+                <background shapeOffsetX="0" shapeSVGFile="" shapeSizeType="0" shapeSizeUnit="MM" shapeFillColor="103,34,144,255" shapeRadiiY="1" shapeSizeX="1" shapeRotation="0" shapeRadiiUnit="MM" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeOpacity="1" shapeBorderWidthUnit="MM" shapeJoinStyle="128" shapeBlendMode="0" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="103,34,144,255" shapeType="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeBorderWidth="1"/>
+                <shadow shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowUnder="0" shadowBlendMode="6"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="0" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-              <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="6" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="10" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="2" maxCurvedCharAngleIn="20" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-              <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="1" scaleVisibility="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacleType="0"/>
+              <text-format wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" reverseDirectionSymbol="0" decimals="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0"/>
+              <placement fitInPolygonOnly="0" repeatDistance="0" placement="6" priority="10" centroidWhole="0" placementFlags="10" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" maxCurvedCharAngleOut="-20" xOffset="0" yOffset="0" dist="2" centroidInside="0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
+              <rendering scaleVisibility="0" maxNumLabels="2000" fontLimitPixelSize="0" minFeatureSize="0" upsidedownLabels="0" displayAll="1" mergeLines="0" fontMinPixelSize="3" limitNumLabels="0" scaleMin="1" obstacleFactor="2" drawLabels="1" zIndex="0" obstacleType="0" labelPerPart="0" fontMaxPixelSize="10000" scaleMax="10000000" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="PredefinedPositionOrder" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="field" value="quadrant" type="QString"/>
-                      <Option name="type" value="2" type="int"/>
+                    <Option type="Map" name="PredefinedPositionOrder">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="quadrant"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
-                    <Option name="Rotation" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="field" value="rotation" type="QString"/>
-                      <Option name="type" value="2" type="int"/>
+                    <Option type="Map" name="Rotation">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="field" value="rotation"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </settings>
           </rule>
-          <rule filter="&quot;Source&quot; = '5KM' AND ( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' ) OR 'marshal plan' = attribute( @atlas_feature , 'type' ) OR 'marshal' = attribute( @atlas_feature , 'type' ) )" key="{17df8049-285c-4bd2-ba2d-a83de3deab9d}" description="5KM">
+          <rule key="{17df8049-285c-4bd2-ba2d-a83de3deab9d}" filter="&quot;Source&quot; = '5KM' AND ( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' ) OR 'marshal plan' = attribute( @atlas_feature , 'type' ) OR 'marshal' = attribute( @atlas_feature , 'type' ) )" description="5KM">
             <settings>
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" fontSize="10" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="1" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="1" fontStrikeout="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-                <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="145,211,55,255" shapeType="0" shapeJoinStyle="128" shapeRadiiY="1" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="145,211,55,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="1" shapeBorderWidth="1" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="1" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+              <text-style blendMode="0" fontSizeUnit="Point" isExpression="1" textOpacity="1" fontStrikeout="0" useSubstitutions="0" textColor="255,255,255,255" fontSize="10" fontUnderline="0" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontFamily="Myriad Pro" fontLetterSpacing="0" multilineHeight="1" namedStyle="Semibold" fontWeight="63" fontCapitals="0">
+                <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferSizeUnits="MM" bufferBlendMode="0" bufferDraw="0" bufferOpacity="1" bufferColor="255,255,255,255"/>
+                <background shapeOffsetX="0" shapeSVGFile="" shapeSizeType="0" shapeSizeUnit="MM" shapeFillColor="145,211,55,255" shapeRadiiY="1" shapeSizeX="1" shapeRotation="0" shapeRadiiUnit="MM" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeOpacity="1" shapeBorderWidthUnit="MM" shapeJoinStyle="128" shapeBlendMode="0" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeType="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeBorderWidth="1"/>
+                <shadow shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowUnder="0" shadowBlendMode="6"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="0" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-              <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="6" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="10" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="2" maxCurvedCharAngleIn="20" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-              <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="1" scaleVisibility="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacleType="0"/>
+              <text-format wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" reverseDirectionSymbol="0" decimals="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0"/>
+              <placement fitInPolygonOnly="0" repeatDistance="0" placement="6" priority="10" centroidWhole="0" placementFlags="10" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" maxCurvedCharAngleOut="-20" xOffset="0" yOffset="0" dist="2" centroidInside="0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
+              <rendering scaleVisibility="0" maxNumLabels="2000" fontLimitPixelSize="0" minFeatureSize="0" upsidedownLabels="0" displayAll="1" mergeLines="0" fontMinPixelSize="3" limitNumLabels="0" scaleMin="1" obstacleFactor="2" drawLabels="1" zIndex="0" obstacleType="0" labelPerPart="0" fontMaxPixelSize="10000" scaleMax="10000000" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="PredefinedPositionOrder" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="field" value="quadrant" type="QString"/>
-                      <Option name="type" value="2" type="int"/>
+                    <Option type="Map" name="PredefinedPositionOrder">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="quadrant"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
-                    <Option name="Rotation" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="field" value="rotation" type="QString"/>
-                      <Option name="type" value="2" type="int"/>
+                    <Option type="Map" name="Rotation">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="field" value="rotation"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </settings>
           </rule>
-          <rule key="{72fc497c-35d7-45d4-9380-f31c6758babc}" description="Always show" active="0">
+          <rule active="0" key="{72fc497c-35d7-45d4-9380-f31c6758babc}" description="Always show">
             <settings>
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" fontSize="11" namedStyle="Italic" multilineHeight="1" fontItalic="1" fontSizeUnit="Point" blendMode="0" textOpacity="1" fontLetterSpacing="0" fontFamily="Roboto Condensed" fontWordSpacing="0" fontCapitals="0" isExpression="0" fontStrikeout="0" fieldName="Name" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="50" useSubstitutions="0">
-                <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeJoinStyle="64" shapeRadiiY="0" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+              <text-style blendMode="0" fontSizeUnit="Point" isExpression="0" textOpacity="1" fontStrikeout="0" useSubstitutions="0" textColor="0,0,0,255" fontSize="11" fontUnderline="0" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="1" fieldName="Name" fontFamily="Roboto Condensed" fontLetterSpacing="0" multilineHeight="1" namedStyle="Italic" fontWeight="50" fontCapitals="0">
+                <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferSize="1" bufferSizeUnits="MM" bufferBlendMode="0" bufferDraw="0" bufferOpacity="1" bufferColor="255,255,255,255"/>
+                <background shapeOffsetX="0" shapeSVGFile="" shapeSizeType="0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeX="0" shapeRotation="0" shapeRadiiUnit="MM" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeOpacity="1" shapeBorderWidthUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeType="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeBorderWidth="0"/>
+                <shadow shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowUnder="0" shadowBlendMode="6"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-              <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="0" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="5" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="0" maxCurvedCharAngleIn="25" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-              <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="0" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="1" scaleVisibility="0" obstacleFactor="1" fontMaxPixelSize="10000" obstacleType="0"/>
+              <text-format wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" reverseDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0"/>
+              <placement fitInPolygonOnly="0" repeatDistance="0" placement="0" priority="5" centroidWhole="0" placementFlags="10" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" maxCurvedCharAngleIn="25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" maxCurvedCharAngleOut="-25" xOffset="0" yOffset="0" dist="0" centroidInside="0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
+              <rendering scaleVisibility="0" maxNumLabels="2000" fontLimitPixelSize="0" minFeatureSize="0" upsidedownLabels="0" displayAll="0" mergeLines="0" fontMinPixelSize="3" limitNumLabels="0" scaleMin="1" obstacleFactor="1" drawLabels="1" zIndex="0" obstacleType="0" labelPerPart="0" fontMaxPixelSize="10000" scaleMax="10000000" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </settings>
@@ -11805,26 +11791,26 @@ def my_form_open(dialog, layer, feature):
         </rules>
       </labeling>
       <customproperties>
-        <property value="COALESCE(&quot;Text&quot;, '&lt;NULL>')" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="dualview/previewExpressions" value="COALESCE(&quot;Text&quot;, '&lt;NULL>')"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minimumSize="0" opacity="1" penAlpha="255" penColor="#000000" enabled="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeType="MM" diagramOrientation="Up" labelPlacementMethod="XHeight" scaleBasedVisibility="0" width="15" minScaleDenominator="100000" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" barWidth="5" backgroundAlpha="255" lineSizeType="MM" penWidth="0">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory diagramOrientation="Up" minScaleDenominator="100000" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penColor="#000000" backgroundAlpha="255" barWidth="5" backgroundColor="#ffffff" lineSizeType="MM" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" height="15" scaleBasedVisibility="0" minimumSize="0" penAlpha="255" maxScaleDenominator="1e+08" penWidth="0" enabled="0" width="15" rotationOffset="270" opacity="1">
           <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+          <attribute color="#000000" field="" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" priority="0" linePlacementFlags="2" placement="0" showAll="1" dist="0">
+      <DiagramLayerSettings placement="0" priority="0" linePlacementFlags="2" obstacle="0" dist="0" zIndex="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -11837,8 +11823,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11847,8 +11833,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11857,8 +11843,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11867,8 +11853,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11877,8 +11863,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11887,8 +11873,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11897,8 +11883,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11907,8 +11893,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11917,8 +11903,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11927,8 +11913,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11937,8 +11923,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11947,90 +11933,90 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <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="Distance"/>
-        <alias index="6" name="" field="RouteLen"/>
-        <alias index="7" name="" field="length_m"/>
-        <alias index="8" name="" field="length_km"/>
-        <alias index="9" name="" field="Source"/>
-        <alias index="10" name="" field="org_fid"/>
-        <alias index="11" name="" field="distance"/>
+        <alias name="" field="Name" index="0"/>
+        <alias name="" field="descriptio" index="1"/>
+        <alias name="" field="timestamp" index="2"/>
+        <alias name="" field="begin" index="3"/>
+        <alias name="" field="end" index="4"/>
+        <alias name="" field="Distance" index="5"/>
+        <alias name="" field="RouteLen" index="6"/>
+        <alias name="" field="length_m" index="7"/>
+        <alias name="" field="length_km" index="8"/>
+        <alias name="" field="Source" index="9"/>
+        <alias name="" field="org_fid" index="10"/>
+        <alias name="" field="distance" index="11"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <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="Distance"/>
-        <default expression="" applyOnUpdate="0" field="RouteLen"/>
-        <default expression="" applyOnUpdate="0" field="length_m"/>
-        <default expression="" applyOnUpdate="0" field="length_km"/>
-        <default expression="" applyOnUpdate="0" field="Source"/>
-        <default expression="" applyOnUpdate="0" field="org_fid"/>
-        <default expression="" applyOnUpdate="0" field="distance"/>
+        <default applyOnUpdate="0" field="Name" expression=""/>
+        <default applyOnUpdate="0" field="descriptio" expression=""/>
+        <default applyOnUpdate="0" field="timestamp" expression=""/>
+        <default applyOnUpdate="0" field="begin" expression=""/>
+        <default applyOnUpdate="0" field="end" expression=""/>
+        <default applyOnUpdate="0" field="Distance" expression=""/>
+        <default applyOnUpdate="0" field="RouteLen" expression=""/>
+        <default applyOnUpdate="0" field="length_m" expression=""/>
+        <default applyOnUpdate="0" field="length_km" expression=""/>
+        <default applyOnUpdate="0" field="Source" expression=""/>
+        <default applyOnUpdate="0" field="org_fid" expression=""/>
+        <default applyOnUpdate="0" field="distance" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Name"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="descriptio"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="timestamp"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="begin"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="end"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Distance"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="RouteLen"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="length_m"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="length_km"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Source"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="org_fid"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="distance"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="Name"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="descriptio"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="timestamp"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="begin"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="end"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="Distance"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="RouteLen"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="length_m"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="length_km"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="Source"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="org_fid"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="distance"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="Name"/>
-        <constraint desc="" exp="" field="descriptio"/>
-        <constraint desc="" exp="" field="timestamp"/>
-        <constraint desc="" exp="" field="begin"/>
-        <constraint desc="" exp="" field="end"/>
-        <constraint desc="" exp="" field="Distance"/>
-        <constraint desc="" exp="" field="RouteLen"/>
-        <constraint desc="" exp="" field="length_m"/>
-        <constraint desc="" exp="" field="length_km"/>
-        <constraint desc="" exp="" field="Source"/>
-        <constraint desc="" exp="" field="org_fid"/>
-        <constraint desc="" exp="" field="distance"/>
+        <constraint desc="" field="Name" exp=""/>
+        <constraint desc="" field="descriptio" exp=""/>
+        <constraint desc="" field="timestamp" exp=""/>
+        <constraint desc="" field="begin" exp=""/>
+        <constraint desc="" field="end" exp=""/>
+        <constraint desc="" field="Distance" exp=""/>
+        <constraint desc="" field="RouteLen" exp=""/>
+        <constraint desc="" field="length_m" exp=""/>
+        <constraint desc="" field="length_km" exp=""/>
+        <constraint desc="" field="Source" exp=""/>
+        <constraint desc="" field="org_fid" exp=""/>
+        <constraint desc="" field="distance" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;distance&quot;" sortOrder="1" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;distance&quot;" sortOrder="1">
         <columns>
-          <column width="-1" hidden="1" type="actions"/>
-          <column name="org_fid" width="-1" hidden="0" type="field"/>
-          <column name="distance" width="-1" hidden="0" type="field"/>
-          <column name="Name" width="-1" hidden="0" type="field"/>
-          <column name="Source" width="-1" hidden="0" type="field"/>
-          <column name="RouteLen" width="-1" hidden="0" type="field"/>
-          <column name="descriptio" width="-1" hidden="0" type="field"/>
-          <column name="timestamp" width="-1" hidden="0" type="field"/>
-          <column name="begin" width="-1" hidden="0" type="field"/>
-          <column name="end" width="-1" hidden="0" type="field"/>
-          <column name="Distance" width="-1" hidden="0" type="field"/>
-          <column name="length_m" width="-1" hidden="0" type="field"/>
-          <column name="length_km" width="-1" hidden="0" type="field"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="org_fid" width="-1" hidden="0"/>
+          <column type="field" name="distance" width="-1" hidden="0"/>
+          <column type="field" name="Name" width="-1" hidden="0"/>
+          <column type="field" name="Source" width="-1" hidden="0"/>
+          <column type="field" name="RouteLen" width="-1" hidden="0"/>
+          <column type="field" name="descriptio" width="-1" hidden="0"/>
+          <column type="field" name="timestamp" width="-1" hidden="0"/>
+          <column type="field" name="begin" width="-1" hidden="0"/>
+          <column type="field" name="end" width="-1" hidden="0"/>
+          <column type="field" name="Distance" width="-1" hidden="0"/>
+          <column type="field" name="length_m" width="-1" hidden="0"/>
+          <column type="field" name="length_km" width="-1" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -12061,19 +12047,19 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Source"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="end"/>
-        <field editable="1" name="length_km"/>
-        <field editable="1" name="length_m"/>
-        <field editable="1" name="org_fid"/>
-        <field editable="1" name="quadrant"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="begin" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="distance" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="length_km" editable="1"/>
+        <field name="length_m" editable="1"/>
+        <field name="org_fid" editable="1"/>
+        <field name="quadrant" editable="1"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
         <field name="Distance" labelOnTop="0"/>
@@ -12094,7 +12080,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
       <mapTip>Text</mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" readOnly="0" maxScale="0" type="vector" minScale="1e+08" simplifyLocal="1" wkbType="MultiPolygon" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" geometry="Polygon" simplifyDrawingHints="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" labelsEnabled="0">
+    <maplayer simplifyDrawingTol="1" readOnly="0" maxScale="0" simplifyLocal="1" simplifyDrawingHints="1" labelsEnabled="0" geometry="Polygon" type="vector" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" simplifyMaxScale="1" minScale="1e+08" autoRefreshEnabled="0" refreshOnNotifyMessage="" wkbType="MultiPolygon">
       <extent>
         <xmin>18.40435736428151614</xmin>
         <ymin>-33.90613600950420903</ymin>
@@ -12158,26 +12144,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" forceraster="0" enableorderby="0" type="singleSymbol">
+      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol name="0" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-            <layer enabled="1" pass="0" class="SimpleFill" locked="0">
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="114,155,111,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
+          <symbol type="fill" name="0" force_rhr="0" clip_to_extent="1" alpha="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="color" v="114,155,111,255"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="35,35,35,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0.26"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -12187,14 +12173,14 @@ def my_form_open(dialog, layer, feature):
         <sizescale/>
       </renderer-v2>
       <customproperties>
-        <property value="&quot;id&quot;" key="dualview/previewExpressions"/>
+        <property key="dualview/previewExpressions" value="&quot;id&quot;"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks type="StringList">
-          <Option value="" type="QString"/>
+          <Option type="QString" value=""/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
@@ -12222,37 +12208,37 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="area"/>
-        <alias index="2" name="" field="rotation"/>
+        <alias name="" field="id" index="0"/>
+        <alias name="" field="area" index="1"/>
+        <alias name="" field="rotation" index="2"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="area"/>
-        <default expression="" applyOnUpdate="0" field="rotation"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="area" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="id"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="area"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="rotation"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="id"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="area"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="rotation"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="area"/>
-        <constraint desc="" exp="" field="rotation"/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="area" exp=""/>
+        <constraint desc="" field="rotation" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;rotation&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;rotation&quot;" sortOrder="0">
         <columns>
-          <column name="id" width="-1" hidden="0" type="field"/>
-          <column name="area" width="-1" hidden="0" type="field"/>
-          <column name="rotation" width="-1" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
+          <column type="field" name="id" width="-1" hidden="0"/>
+          <column type="field" name="area" width="-1" hidden="0"/>
+          <column type="field" name="rotation" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -12272,7 +12258,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" readOnly="0" maxScale="0" type="vector" minScale="1e+08" simplifyLocal="1" wkbType="Point" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" geometry="Point" simplifyDrawingHints="0" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" labelsEnabled="0">
+    <maplayer simplifyDrawingTol="1" readOnly="0" maxScale="0" simplifyLocal="1" simplifyDrawingHints="0" labelsEnabled="0" geometry="Point" type="vector" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" simplifyMaxScale="1" minScale="1e+08" autoRefreshEnabled="0" refreshOnNotifyMessage="" wkbType="Point">
       <extent>
         <xmin>18.37527292247776955</xmin>
         <ymin>-33.94586016049600374</ymin>
@@ -12336,114 +12322,114 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" forceraster="0" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" enableorderby="0">
         <rules key="{01115dc1-cc6e-4980-a968-7ef94a3b9df6}">
-          <rule symbol="0" filter="&quot;Distance&quot; = '21KM'" key="{71dc0866-b893-48a0-be36-e2b65a581610}"/>
-          <rule symbol="1" filter="&quot;Distance&quot; = '10KM'" key="{405230e7-6e6f-4e87-b9bc-b89e44296582}"/>
-          <rule symbol="2" filter="&quot;Distance&quot; = '5KM'" key="{c5d85d4d-6b78-403d-ab66-ecd04556e7d7}"/>
+          <rule symbol="0" key="{71dc0866-b893-48a0-be36-e2b65a581610}" filter="&quot;Distance&quot; = '21KM'"/>
+          <rule symbol="1" key="{405230e7-6e6f-4e87-b9bc-b89e44296582}" filter="&quot;Distance&quot; = '10KM'"/>
+          <rule symbol="2" key="{c5d85d4d-6b78-403d-ab66-ecd04556e7d7}" filter="&quot;Distance&quot; = '5KM'"/>
         </rules>
         <symbols>
-          <symbol name="0" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-            <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
-              <prop v="0" k="angle"/>
-              <prop v="210,32,39,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,0" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="0.5" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol type="marker" name="0" force_rhr="0" clip_to_extent="1" alpha="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="210,32,39,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="circle"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="35,35,35,0"/>
+              <prop k="outline_style" v="no"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="0.5"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="size">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="0.8" force_rhr="0" clip_to_extent="1" type="marker">
-            <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
-              <prop v="0" k="angle"/>
-              <prop v="103,34,144,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,0" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="0.5" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol type="marker" name="1" force_rhr="0" clip_to_extent="1" alpha="0.8">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="103,34,144,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="circle"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="35,35,35,0"/>
+              <prop k="outline_style" v="no"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="0.5"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="size">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="0.8" force_rhr="0" clip_to_extent="1" type="marker">
-            <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
-              <prop v="0" k="angle"/>
-              <prop v="145,211,55,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,0" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="0.5" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol type="marker" name="2" force_rhr="0" clip_to_extent="1" alpha="0.8">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="145,211,55,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="circle"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="35,35,35,0"/>
+              <prop k="outline_style" v="no"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="0.5"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="size">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -12452,46 +12438,46 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,255,255" fontSize="9" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="0.8" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="1" fontStrikeout="0" fieldName="IF(&quot;Distance&quot; IS attribute( @atlas_feature, 'Distance' ), display, '')" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-            <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-            <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="0,0,255,255" shapeType="0" shapeJoinStyle="128" shapeRadiiY="0.5" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="0.5" shapeBorderWidth="0.2" shapeSizeY="1" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="1" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+          <text-style blendMode="0" fontSizeUnit="Point" isExpression="1" textOpacity="0.8" fontStrikeout="0" useSubstitutions="0" textColor="0,0,255,255" fontSize="9" fontUnderline="0" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fieldName="IF(&quot;Distance&quot; IS attribute( @atlas_feature, 'Distance' ), display, '')" fontFamily="Myriad Pro" fontLetterSpacing="0" multilineHeight="1" namedStyle="Semibold" fontWeight="63" fontCapitals="0">
+            <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferSize="1" bufferSizeUnits="MM" bufferBlendMode="0" bufferDraw="0" bufferOpacity="1" bufferColor="255,255,255,255"/>
+            <background shapeOffsetX="0" shapeSVGFile="" shapeSizeType="0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeRadiiY="0.5" shapeSizeX="1" shapeRotation="0" shapeRadiiUnit="MM" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeOpacity="1" shapeBorderWidthUnit="MM" shapeJoinStyle="128" shapeBlendMode="0" shapeRadiiX="0.5" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,255,255" shapeType="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeBorderWidth="0.2"/>
+            <shadow shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowUnder="0" shadowBlendMode="6"/>
             <substitutions/>
           </text-style>
-          <text-format formatNumbers="0" autoWrapLength="17" useMaxLineLengthForAutoWrap="1" multilineAlign="2" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-          <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="0" repeatDistanceUnits="MM" preserveRotation="0" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="LineGeometry" geometryGenerator="" priority="10" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MM" dist="0" maxCurvedCharAngleIn="25" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-          <rendering drawLabels="1" maxNumLabels="2" mergeLines="0" labelPerPart="0" scaleMax="0" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="0" scaleVisibility="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacleType="0"/>
+          <text-format wrapChar="" placeDirectionSymbol="0" autoWrapLength="17" reverseDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="2" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0"/>
+          <placement fitInPolygonOnly="0" repeatDistance="0" placement="0" priority="10" centroidWhole="0" placementFlags="10" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" maxCurvedCharAngleIn="25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" maxCurvedCharAngleOut="-25" xOffset="0" yOffset="0" dist="0" centroidInside="0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" offsetUnits="MM" geometryGeneratorType="LineGeometry" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
+          <rendering scaleVisibility="0" maxNumLabels="2" fontLimitPixelSize="0" minFeatureSize="0" upsidedownLabels="0" displayAll="1" mergeLines="0" fontMinPixelSize="3" limitNumLabels="0" scaleMin="0" obstacleFactor="2" drawLabels="1" zIndex="0" obstacleType="0" labelPerPart="0" fontMaxPixelSize="10000" scaleMax="0" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="AlwaysShow" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="type" value="1" type="int"/>
-                  <Option name="val" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="AlwaysShow">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="int" name="type" value="1"/>
+                  <Option type="QString" name="val" value=""/>
                 </Option>
-                <Option name="Hali" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="'Center'" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="Hali">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="'Center'"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="PositionX" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="field" value="" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                <Option type="Map" name="PositionX">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="field" value=""/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
-                <Option name="PositionY" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="field" value="" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                <Option type="Map" name="PositionY">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="field" value=""/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
-                <Option name="Vali" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="'Half'" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="Vali">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="'Half'"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </settings>
@@ -12503,25 +12489,25 @@ def my_form_open(dialog, layer, feature):
           <value>COALESCE( "display", '&lt;NULL>' )</value>
           <value>Name</value>
         </property>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minimumSize="0" opacity="1" penAlpha="255" penColor="#000000" enabled="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeType="MM" diagramOrientation="Up" labelPlacementMethod="XHeight" scaleBasedVisibility="0" width="15" minScaleDenominator="0" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" barWidth="5" backgroundAlpha="255" lineSizeType="MM" penWidth="0">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory diagramOrientation="Up" minScaleDenominator="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penColor="#000000" backgroundAlpha="255" barWidth="5" backgroundColor="#ffffff" lineSizeType="MM" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" height="15" scaleBasedVisibility="0" minimumSize="0" penAlpha="255" maxScaleDenominator="1e+08" penWidth="0" enabled="0" width="15" rotationOffset="270" opacity="1">
           <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+          <attribute color="#000000" field="" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" priority="0" linePlacementFlags="18" placement="0" showAll="1" dist="0">
+      <DiagramLayerSettings placement="0" priority="0" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -12534,8 +12520,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -12544,8 +12530,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -12554,8 +12540,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -12564,8 +12550,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -12574,8 +12560,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -12584,8 +12570,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -12594,8 +12580,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -12604,8 +12590,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -12614,8 +12600,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -12624,8 +12610,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -12660,90 +12646,90 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <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="Distance"/>
-        <alias index="6" name="" field="RouteLen"/>
-        <alias index="7" name="" field="length_m"/>
-        <alias index="8" name="" field="length_km"/>
-        <alias index="9" name="" field="Source"/>
-        <alias index="10" name="" field="org_fid"/>
-        <alias index="11" name="" field="distance_1"/>
-        <alias index="12" name="" field="first_runn"/>
-        <alias index="13" name="" field="last_runne"/>
+        <alias name="" field="Name" index="0"/>
+        <alias name="" field="descriptio" index="1"/>
+        <alias name="" field="timestamp" index="2"/>
+        <alias name="" field="begin" index="3"/>
+        <alias name="" field="end" index="4"/>
+        <alias name="" field="Distance" index="5"/>
+        <alias name="" field="RouteLen" index="6"/>
+        <alias name="" field="length_m" index="7"/>
+        <alias name="" field="length_km" index="8"/>
+        <alias name="" field="Source" index="9"/>
+        <alias name="" field="org_fid" index="10"/>
+        <alias name="" field="distance_1" index="11"/>
+        <alias name="" field="first_runn" index="12"/>
+        <alias name="" field="last_runne" index="13"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <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="Distance"/>
-        <default expression="" applyOnUpdate="0" field="RouteLen"/>
-        <default expression="" applyOnUpdate="0" field="length_m"/>
-        <default expression="" applyOnUpdate="0" field="length_km"/>
-        <default expression="" applyOnUpdate="0" field="Source"/>
-        <default expression="" applyOnUpdate="0" field="org_fid"/>
-        <default expression="" applyOnUpdate="0" field="distance_1"/>
-        <default expression="" applyOnUpdate="0" field="first_runn"/>
-        <default expression="" applyOnUpdate="0" field="last_runne"/>
+        <default applyOnUpdate="0" field="Name" expression=""/>
+        <default applyOnUpdate="0" field="descriptio" expression=""/>
+        <default applyOnUpdate="0" field="timestamp" expression=""/>
+        <default applyOnUpdate="0" field="begin" expression=""/>
+        <default applyOnUpdate="0" field="end" expression=""/>
+        <default applyOnUpdate="0" field="Distance" expression=""/>
+        <default applyOnUpdate="0" field="RouteLen" expression=""/>
+        <default applyOnUpdate="0" field="length_m" expression=""/>
+        <default applyOnUpdate="0" field="length_km" expression=""/>
+        <default applyOnUpdate="0" field="Source" expression=""/>
+        <default applyOnUpdate="0" field="org_fid" expression=""/>
+        <default applyOnUpdate="0" field="distance_1" expression=""/>
+        <default applyOnUpdate="0" field="first_runn" expression=""/>
+        <default applyOnUpdate="0" field="last_runne" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Name"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="descriptio"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="timestamp"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="begin"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="end"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Distance"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="RouteLen"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="length_m"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="length_km"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Source"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="org_fid"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="distance_1"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="first_runn"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="last_runne"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="Name"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="descriptio"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="timestamp"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="begin"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="end"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="Distance"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="RouteLen"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="length_m"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="length_km"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="Source"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="org_fid"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="distance_1"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="first_runn"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="last_runne"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="Name"/>
-        <constraint desc="" exp="" field="descriptio"/>
-        <constraint desc="" exp="" field="timestamp"/>
-        <constraint desc="" exp="" field="begin"/>
-        <constraint desc="" exp="" field="end"/>
-        <constraint desc="" exp="" field="Distance"/>
-        <constraint desc="" exp="" field="RouteLen"/>
-        <constraint desc="" exp="" field="length_m"/>
-        <constraint desc="" exp="" field="length_km"/>
-        <constraint desc="" exp="" field="Source"/>
-        <constraint desc="" exp="" field="org_fid"/>
-        <constraint desc="" exp="" field="distance_1"/>
-        <constraint desc="" exp="" field="first_runn"/>
-        <constraint desc="" exp="" field="last_runne"/>
+        <constraint desc="" field="Name" exp=""/>
+        <constraint desc="" field="descriptio" exp=""/>
+        <constraint desc="" field="timestamp" exp=""/>
+        <constraint desc="" field="begin" exp=""/>
+        <constraint desc="" field="end" exp=""/>
+        <constraint desc="" field="Distance" exp=""/>
+        <constraint desc="" field="RouteLen" exp=""/>
+        <constraint desc="" field="length_m" exp=""/>
+        <constraint desc="" field="length_km" exp=""/>
+        <constraint desc="" field="Source" exp=""/>
+        <constraint desc="" field="org_fid" exp=""/>
+        <constraint desc="" field="distance_1" exp=""/>
+        <constraint desc="" field="first_runn" exp=""/>
+        <constraint desc="" field="last_runne" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;display&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;display&quot;" sortOrder="0">
         <columns>
-          <column name="Name" width="-1" hidden="0" type="field"/>
-          <column name="descriptio" width="-1" hidden="0" type="field"/>
-          <column name="timestamp" width="-1" hidden="0" type="field"/>
-          <column name="begin" width="179" hidden="0" type="field"/>
-          <column name="end" width="-1" hidden="0" type="field"/>
-          <column name="Distance" width="-1" hidden="0" type="field"/>
-          <column name="RouteLen" width="-1" hidden="0" type="field"/>
-          <column name="length_m" width="-1" hidden="0" type="field"/>
-          <column name="length_km" width="-1" hidden="0" type="field"/>
-          <column name="Source" width="-1" hidden="0" type="field"/>
-          <column name="org_fid" width="-1" hidden="0" type="field"/>
-          <column name="distance" width="177" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
+          <column type="field" name="Name" width="-1" hidden="0"/>
+          <column type="field" name="descriptio" width="-1" hidden="0"/>
+          <column type="field" name="timestamp" width="-1" hidden="0"/>
+          <column type="field" name="begin" width="179" hidden="0"/>
+          <column type="field" name="end" width="-1" hidden="0"/>
+          <column type="field" name="Distance" width="-1" hidden="0"/>
+          <column type="field" name="RouteLen" width="-1" hidden="0"/>
+          <column type="field" name="length_m" width="-1" hidden="0"/>
+          <column type="field" name="length_km" width="-1" hidden="0"/>
+          <column type="field" name="Source" width="-1" hidden="0"/>
+          <column type="field" name="org_fid" width="-1" hidden="0"/>
+          <column type="field" name="distance" width="177" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -12774,25 +12760,25 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Source"/>
-        <field editable="0" name="auxiliary_storage_labeling_positionx"/>
-        <field editable="0" name="auxiliary_storage_labeling_positiony"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="display"/>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="end"/>
-        <field editable="1" name="first_runner"/>
-        <field editable="1" name="first_runner_s"/>
-        <field editable="1" name="last_runner"/>
-        <field editable="1" name="last_runner_s"/>
-        <field editable="1" name="length_km"/>
-        <field editable="1" name="length_m"/>
-        <field editable="1" name="org_fid"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="auxiliary_storage_labeling_positionx" editable="0"/>
+        <field name="auxiliary_storage_labeling_positiony" editable="0"/>
+        <field name="begin" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="display" editable="1"/>
+        <field name="distance" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="first_runner" editable="1"/>
+        <field name="first_runner_s" editable="1"/>
+        <field name="last_runner" editable="1"/>
+        <field name="last_runner_s" editable="1"/>
+        <field name="length_km" editable="1"/>
+        <field name="length_m" editable="1"/>
+        <field name="org_fid" editable="1"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
         <field name="Distance" labelOnTop="0"/>
@@ -12819,7 +12805,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" readOnly="0" maxScale="0" type="vector" minScale="1e+08" simplifyLocal="1" wkbType="MultiPolygon" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" geometry="Polygon" simplifyDrawingHints="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" labelsEnabled="1">
+    <maplayer simplifyDrawingTol="1" readOnly="0" maxScale="0" simplifyLocal="1" simplifyDrawingHints="1" labelsEnabled="1" geometry="Polygon" type="vector" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" autoRefreshTime="0" simplifyMaxScale="1" minScale="1e+08" autoRefreshEnabled="0" refreshOnNotifyMessage="" wkbType="MultiPolygon">
       <extent>
         <xmin>18.37549461152003971</xmin>
         <ymin>-33.94162201868364548</ymin>
@@ -12876,7 +12862,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" maxx="0" minz="0" miny="0" crs="" dimensions="2" maxz="0" minx="0"/>
+          <spatial maxy="0" maxz="0" maxx="0" minx="0" minz="0" dimensions="2" crs="" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -12903,22 +12889,22 @@ def my_form_open(dialog, layer, feature):
       <renderer-v2 type="nullSymbol"/>
       <labeling type="rule-based">
         <rules key="{5dc8b36b-2058-4678-ad09-9a66ad011982}">
-          <rule filter="CASE&#xa;WHEN attribute( @atlas_feature , 'RouteLen' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'RouteLen' ) ) THEN 1&#xa;ELSE 0&#xa;END" key="{6ef417ce-9c3a-42d0-a533-3a83b1a257ea}" description="Show water tables">
+          <rule key="{6ef417ce-9c3a-42d0-a533-3a83b1a257ea}" filter="CASE&#xa;WHEN attribute( @atlas_feature , 'RouteLen' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'RouteLen' ) ) THEN 1&#xa;ELSE 0&#xa;END" description="Show water tables">
             <settings>
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="31,120,180,255" fontSize="8" namedStyle="Bold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="0.9" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="0" fontStrikeout="0" fieldName="label" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="75" useSubstitutions="0">
-                <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="0.4" bufferColor="255,255,255,255" bufferSize="0.75"/>
-                <background shapeOffsetY="-0.15" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="31,120,206,255" shapeType="0" shapeJoinStyle="128" shapeRadiiY="0.5" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,204" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="0.5" shapeBorderWidth="0.75" shapeSizeY="0.3" shapeOffsetUnit="MM" shapeOpacity="0.6" shapeSVGFile="" shapeSizeX="0.75" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+              <text-style blendMode="0" fontSizeUnit="Point" isExpression="0" textOpacity="0.9" fontStrikeout="0" useSubstitutions="0" textColor="31,120,180,255" fontSize="8" fontUnderline="0" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fieldName="label" fontFamily="Myriad Pro" fontLetterSpacing="0" multilineHeight="1" namedStyle="Bold" fontWeight="75" fontCapitals="0">
+                <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferSize="0.75" bufferSizeUnits="MM" bufferBlendMode="0" bufferDraw="0" bufferOpacity="0.4" bufferColor="255,255,255,255"/>
+                <background shapeOffsetX="0" shapeSVGFile="" shapeSizeType="0" shapeSizeUnit="MM" shapeFillColor="255,255,255,204" shapeRadiiY="0.5" shapeSizeX="0.75" shapeRotation="0" shapeRadiiUnit="MM" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.3" shapeOpacity="0.6" shapeBorderWidthUnit="MM" shapeJoinStyle="128" shapeBlendMode="0" shapeRadiiX="0.5" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="31,120,206,255" shapeType="0" shapeOffsetY="-0.15" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeBorderWidth="0.75"/>
+                <shadow shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowUnder="0" shadowBlendMode="6"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="1" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-              <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="1" placement="0" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="5" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="0" maxCurvedCharAngleIn="25" centroidInside="0" centroidWhole="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" yOffset="0" xOffset="1" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-              <rendering drawLabels="1" maxNumLabels="6" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="0" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="5" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="1" scaleVisibility="0" obstacleFactor="0.76" fontMaxPixelSize="10000" obstacleType="0"/>
+              <text-format wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" reverseDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0"/>
+              <placement fitInPolygonOnly="0" repeatDistance="0" placement="0" priority="5" centroidWhole="1" placementFlags="10" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" maxCurvedCharAngleIn="25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" maxCurvedCharAngleOut="-25" xOffset="1" yOffset="0" dist="0" centroidInside="0" repeatDistanceUnits="MM" offsetType="0" quadOffset="1" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0"/>
+              <rendering scaleVisibility="0" maxNumLabels="6" fontLimitPixelSize="0" minFeatureSize="0" upsidedownLabels="0" displayAll="0" mergeLines="0" fontMinPixelSize="3" limitNumLabels="0" scaleMin="1" obstacleFactor="0.76" drawLabels="1" zIndex="5" obstacleType="0" labelPerPart="0" fontMaxPixelSize="10000" scaleMax="10000000" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </settings>
@@ -12926,26 +12912,26 @@ def my_form_open(dialog, layer, feature):
         </rules>
       </labeling>
       <customproperties>
-        <property value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="dualview/previewExpressions" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minimumSize="0" opacity="1" penAlpha="255" penColor="#000000" enabled="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeType="MM" diagramOrientation="Up" labelPlacementMethod="XHeight" scaleBasedVisibility="0" width="15" minScaleDenominator="0" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" barWidth="5" backgroundAlpha="255" lineSizeType="MM" penWidth="0">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory diagramOrientation="Up" minScaleDenominator="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penColor="#000000" backgroundAlpha="255" barWidth="5" backgroundColor="#ffffff" lineSizeType="MM" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" height="15" scaleBasedVisibility="0" minimumSize="0" penAlpha="255" maxScaleDenominator="1e+08" penWidth="0" enabled="0" width="15" rotationOffset="270" opacity="1">
           <fontProperties style="" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+          <attribute color="#000000" field="" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" priority="0" linePlacementFlags="2" placement="0" showAll="1" dist="0">
+      <DiagramLayerSettings placement="0" priority="0" linePlacementFlags="2" obstacle="0" dist="0" zIndex="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -12958,8 +12944,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -12968,8 +12954,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -12978,8 +12964,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -12993,42 +12979,42 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <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 name="" field="id" index="0"/>
+        <alias name="" field="table_set" index="1"/>
+        <alias name="" field="label" index="2"/>
+        <alias name="" field="races" index="3"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <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 applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="table_set" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="races" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="id"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="table_set"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="label"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="races"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="id"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="table_set"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="label"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="races"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="table_set"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="races"/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="table_set" exp=""/>
+        <constraint desc="" field="label" exp=""/>
+        <constraint desc="" field="races" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;table_set&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;table_set&quot;" sortOrder="0">
         <columns>
-          <column name="id" width="-1" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column name="table_set" width="-1" hidden="0" type="field"/>
-          <column name="label" width="-1" hidden="0" type="field"/>
-          <column name="races" width="130" hidden="0" type="field"/>
+          <column type="field" name="id" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="table_set" width="-1" hidden="0"/>
+          <column type="field" name="label" width="-1" hidden="0"/>
+          <column type="field" name="races" width="130" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13059,10 +13045,10 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="label"/>
-        <field editable="1" name="races"/>
-        <field editable="1" name="table_set"/>
+        <field name="id" editable="1"/>
+        <field name="label" editable="1"/>
+        <field name="races" editable="1"/>
+        <field name="table_set" editable="1"/>
       </editable>
       <labelOnTop>
         <field name="id" labelOnTop="0"/>
@@ -13100,7 +13086,7 @@ def my_form_open(dialog, layer, feature):
     <layer id="timelapse_55fe61aa_52c4_42b5_a917_d0927767c9d7"/>
     <layer id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
     <layer id="proposed_routes_f10ccfbd_1547_42d0_8c19_862e4ffde38b"/>
-    <layer id="proposed_road_markers_2b454f1d_6ad8_4b91_805f_f503490286b2"/>
+    <layer id="proposed_route_markers_b3dac0b0_ee05_431b_a89e_52cc9d9162b0"/>
   </layerorder>
   <properties>
     <DefaultStyles>
@@ -13276,7 +13262,7 @@ def my_form_open(dialog, layer, feature):
       <disabledLayers type="QStringList"/>
     </Identify>
     <Layouts>
-      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/Routes/20191002 - Gun Run 2019 - Routes rev 1.71.pdf</lastLayoutExportDir>
+      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/Routes</lastLayoutExportDir>
     </Layouts>
     <Legend>
       <filterByMap type="bool">false</filterByMap>
@@ -13415,273 +13401,268 @@ def my_form_open(dialog, layer, feature):
   </properties>
   <visibility-presets>
     <visibility-preset name="Access Routes" has-expanded-info="1">
-      <layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" style="default" expanded="1"/>
-      <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="0"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0"/>
+      <layer expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" style="default" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
+      <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
+      <layer expanded="0" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Elevation"/>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="All Routes" has-expanded-info="1">
-      <layer id="all_routes20170907054841602" style="default" expanded="1"/>
+      <layer expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" style="default" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer expanded="1" style="default" id="all_routes20170907054841602"/>
       <checked-legend-nodes id="all_routes20170907054841602">
+        <checked-legend-node id="{13a555f1-0140-4584-9ca0-a5c3268249fa}"/>
+        <checked-legend-node id="{189f7600-691f-4bc6-a9c0-bc9a9a18e5fa}"/>
         <checked-legend-node id="{bdaba96f-7e1b-4d42-b7dd-7e0ac1c340de}"/>
         <checked-legend-node id="{3047fdca-b9ef-4659-af1a-dbbd7cd48473}"/>
-        <checked-legend-node id="{5a375156-c44c-4982-93d6-82ae53deda3e}"/>
-        <checked-legend-node id="{189f7600-691f-4bc6-a9c0-bc9a9a18e5fa}"/>
         <checked-legend-node id="{915c5fda-fe09-44ca-bed3-6346c6df4966}"/>
+        <checked-legend-node id="{5a375156-c44c-4982-93d6-82ae53deda3e}"/>
         <checked-legend-node id="{b026320a-2fe6-4a3f-85ba-a22f63a10db1}"/>
-        <checked-legend-node id="{13a555f1-0140-4584-9ca0-a5c3268249fa}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes20170907054841602">
         <expanded-legend-node id="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
       </expanded-legend-nodes>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer id="water_tables20170921142016467" style="default" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="1"/>
+      <layer expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Residents Access"/>
+        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Elevation"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshal pages"/>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Residents Access"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Fencing and Cones"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Ask Me" has-expanded-info="1">
-      <layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" style="default" expanded="0"/>
-      <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="0"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0"/>
+      <layer expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" style="default" expanded="1"/>
+      <layer expanded="1" style="default" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
       <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
+      <layer expanded="0" style="default" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
+      <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
+      <layer expanded="0" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Elevation"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Elevation"/>
+        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Ask Me"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Fencing" has-expanded-info="1">
-      <layer id="all_routes20170907054841602" style="default" expanded="1"/>
+      <layer expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" style="default" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer expanded="1" style="default" id="route_markers_400718de_4c66_4725_81c9_caa6b73d2d82"/>
+      <expanded-legend-nodes id="route_markers_400718de_4c66_4725_81c9_caa6b73d2d82"/>
+      <layer expanded="1" style="default" id="all_routes20170907054841602"/>
       <expanded-legend-nodes id="all_routes20170907054841602">
         <expanded-legend-node id="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
       </expanded-legend-nodes>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer id="route_markers_400718de_4c66_4725_81c9_caa6b73d2d82" style="default" expanded="1"/>
-      <expanded-legend-nodes id="route_markers_400718de_4c66_4725_81c9_caa6b73d2d82"/>
-      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="default" expanded="1"/>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer id="water_tables20170921142016467" style="default" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" expanded="1"/>
+      <layer expanded="1" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" style="default" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Residents Access"/>
+        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Elevation"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshal pages"/>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Residents Access"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Fencing and Cones"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Marshal map - inset" has-expanded-info="1">
-      <layer id="all_routes20170907054841602" style="default" expanded="1"/>
+      <layer expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" style="default" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer expanded="1" style="default" id="extra_security20170921130834191"/>
+      <expanded-legend-nodes id="extra_security20170921130834191"/>
+      <layer expanded="1" style="default" id="all_routes20170907054841602"/>
       <expanded-legend-nodes id="all_routes20170907054841602">
         <expanded-legend-node id="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
       </expanded-legend-nodes>
-      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" expanded="1"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer id="water_tables20170921142016467" style="default" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" expanded="1"/>
+      <layer expanded="1" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="extra_security20170921130834191" style="default" expanded="1"/>
-      <expanded-legend-nodes id="extra_security20170921130834191"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Elevation"/>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Marshal map - main" has-expanded-info="1">
-      <layer id="all_routes20170907054841602" style="default" expanded="1"/>
+      <layer expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" style="default" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer expanded="1" style="default" id="extra_security20170921130834191"/>
+      <expanded-legend-nodes id="extra_security20170921130834191"/>
+      <layer expanded="1" style="default" id="all_routes20170907054841602"/>
       <expanded-legend-nodes id="all_routes20170907054841602">
         <expanded-legend-node id="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
       </expanded-legend-nodes>
-      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" expanded="1"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer id="water_tables20170921142016467" style="default" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="0"/>
+      <layer expanded="0" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="extra_security20170921130834191" style="default" expanded="1"/>
-      <expanded-legend-nodes id="extra_security20170921130834191"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Elevation"/>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Marshal overview" has-expanded-info="1">
-      <layer id="all_routes20170907054841602" style="default" expanded="1"/>
+      <layer expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" style="default" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer expanded="1" style="default" id="extra_security20170921130834191"/>
+      <expanded-legend-nodes id="extra_security20170921130834191"/>
+      <layer expanded="1" style="default" id="all_routes20170907054841602"/>
       <expanded-legend-nodes id="all_routes20170907054841602">
         <expanded-legend-node id="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
       </expanded-legend-nodes>
-      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" expanded="1"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer id="water_tables20170921142016467" style="default" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" expanded="1"/>
+      <layer expanded="1" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="extra_security20170921130834191" style="default" expanded="1"/>
-      <expanded-legend-nodes id="extra_security20170921130834191"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Elevation"/>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Proposed Routes" has-expanded-info="1">
-      <layer id="proposed_road_markers_2b454f1d_6ad8_4b91_805f_f503490286b2" style="default" expanded="1"/>
-      <expanded-legend-nodes id="proposed_road_markers_2b454f1d_6ad8_4b91_805f_f503490286b2"/>
-      <layer id="proposed_routes_f10ccfbd_1547_42d0_8c19_862e4ffde38b" style="default" expanded="1"/>
-      <checked-legend-nodes id="proposed_routes_f10ccfbd_1547_42d0_8c19_862e4ffde38b">
-        <checked-legend-node id="{3047fdca-b9ef-4659-af1a-dbbd7cd48473}"/>
-        <checked-legend-node id="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
-        <checked-legend-node id="{915c5fda-fe09-44ca-bed3-6346c6df4966}"/>
-        <checked-legend-node id="{13a555f1-0140-4584-9ca0-a5c3268249fa}"/>
-      </checked-legend-nodes>
+      <layer expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" style="default" id="proposed_route_markers_b3dac0b0_ee05_431b_a89e_52cc9d9162b0"/>
+      <expanded-legend-nodes id="proposed_route_markers_b3dac0b0_ee05_431b_a89e_52cc9d9162b0"/>
+      <layer expanded="1" style="default" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer expanded="1" style="default" id="proposed_routes_f10ccfbd_1547_42d0_8c19_862e4ffde38b"/>
       <expanded-legend-nodes id="proposed_routes_f10ccfbd_1547_42d0_8c19_862e4ffde38b">
         <expanded-legend-node id="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
       </expanded-legend-nodes>
-      <layer id="water_tables20170921142016467" style="default" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="1"/>
+      <layer expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Map"/>
-        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Routes" has-expanded-info="1">
-      <layer id="route_markers_400718de_4c66_4725_81c9_caa6b73d2d82" style="default" expanded="1"/>
+      <layer expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" style="default" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer expanded="1" style="default" id="route_markers_400718de_4c66_4725_81c9_caa6b73d2d82"/>
       <expanded-legend-nodes id="route_markers_400718de_4c66_4725_81c9_caa6b73d2d82"/>
-      <layer id="all_routes20170907054841602" style="default" expanded="1"/>
+      <layer expanded="1" style="default" id="all_routes20170907054841602"/>
       <checked-legend-nodes id="all_routes20170907054841602">
-        <checked-legend-node id="{3047fdca-b9ef-4659-af1a-dbbd7cd48473}"/>
         <checked-legend-node id="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
-        <checked-legend-node id="{915c5fda-fe09-44ca-bed3-6346c6df4966}"/>
         <checked-legend-node id="{13a555f1-0140-4584-9ca0-a5c3268249fa}"/>
+        <checked-legend-node id="{3047fdca-b9ef-4659-af1a-dbbd7cd48473}"/>
+        <checked-legend-node id="{915c5fda-fe09-44ca-bed3-6346c6df4966}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes20170907054841602">
-        <expanded-legend-node id="{5a375156-c44c-4982-93d6-82ae53deda3e}"/>
         <expanded-legend-node id="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
+        <expanded-legend-node id="{5a375156-c44c-4982-93d6-82ae53deda3e}"/>
       </expanded-legend-nodes>
-      <layer id="water_tables20170921142016467" style="default" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="1"/>
+      <layer expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Map"/>
-        <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Start/Finish" has-expanded-info="1">
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="default" expanded="1"/>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" expanded="1"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0"/>
+      <layer expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" style="default" expanded="1"/>
+      <layer expanded="1" style="default" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
       <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
-      <layer id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" style="default" expanded="1"/>
+      <layer expanded="1" style="default" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe"/>
       <expanded-legend-nodes id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe"/>
+      <layer expanded="1" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer expanded="1" style="default" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Residents Access"/>
+        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Elevation"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshal pages"/>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Residents Access"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Fencing and Cones"/>
       </expanded-group-nodes>
     </visibility-preset>
   </visibility-presets>
@@ -13708,272 +13689,272 @@ def my_form_open(dialog, layer, feature):
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout name="Routes" worldFileMap="" units="mm" printResolution="192">
-      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
-      <Grid resolution="10" offsetY="0" resUnits="mm" offsetUnits="mm" offsetX="0"/>
+    <Layout name="Routes" printResolution="192" units="mm" worldFileMap="">
+      <Snapper snapToItems="1" snapToGrid="0" tolerance="5" snapToGuides="1"/>
+      <Grid resUnits="mm" offsetY="0" offsetX="0" offsetUnits="mm" resolution="10"/>
       <PageCollection>
-        <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-          <layer enabled="1" pass="0" class="SimpleFill" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol type="fill" name="" force_rhr="0" clip_to_extent="1" alpha="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="color" v="255,255,255,255"/>
+            <prop k="joinstyle" v="miter"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="no"/>
+            <prop k="outline_width" v="0.26"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="0" itemRotation="0" positionOnPage="0,0,mm" background="true" id="" type="65638" excludeFromExports="0" position="0,0,mm" blendMode="0" referencePoint="0" frame="false" uuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" visibility="1" templateUuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" positionLock="false" groupUuid="" frameJoinStyle="miter" size="297,210,mm">
-          <FrameColor red="0" green="0" alpha="255" blue="0"/>
-          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+        <LayoutItem excludeFromExports="0" groupUuid="" blendMode="0" itemRotation="0" type="65638" id="" zValue="0" templateUuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" uuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" referencePoint="0" background="true" position="0,0,mm" positionOnPage="0,0,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="297,210,mm" positionLock="false" opacity="1">
+          <FrameColor red="0" green="0" blue="0" alpha="255"/>
+          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
           </LayoutObject>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide page="0" orientation="2" units="mm" position="0"/>
+          <Guide page="0" orientation="2" position="0" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="9" marginX="1" itemRotation="0" positionOnPage="9.44946,191.611,mm" background="false" id="" type="65641" excludeFromExports="0" position="9.44946,191.611,mm" blendMode="0" halign="1" referencePoint="0" frame="false" uuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" valign="64" visibility="1" templateUuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" positionLock="true" marginY="1" groupUuid="" labelText="[%&quot;Distance&quot;%]" frameJoinStyle="miter" size="14.1764,7.471,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" htmlState="0" groupUuid="" blendMode="0" itemRotation="0" type="65641" id="" halign="1" zValue="9" templateUuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" uuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" labelText="[%&quot;Distance&quot;%]" valign="64" referencePoint="0" background="false" position="9.44946,191.611,mm" marginX="1" positionOnPage="9.44946,191.611,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="14.1764,7.471,mm" positionLock="true" marginY="1" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Semibold" description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor red="0" green="0" blue="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="8" marginX="0" itemRotation="0" positionOnPage="24.2445,191.81,mm" background="false" id="" type="65641" excludeFromExports="0" position="24.2445,191.81,mm" blendMode="0" halign="1" referencePoint="0" frame="false" uuid="{d9f4225c-620f-4a62-a293-599f109f5206}" valign="64" visibility="1" templateUuid="{d9f4225c-620f-4a62-a293-599f109f5206}" positionLock="true" marginY="1" groupUuid="" labelText="RACE ROUTE" frameJoinStyle="miter" size="29.2025,7.272,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" htmlState="0" groupUuid="" blendMode="0" itemRotation="0" type="65641" id="" halign="1" zValue="8" templateUuid="{d9f4225c-620f-4a62-a293-599f109f5206}" uuid="{d9f4225c-620f-4a62-a293-599f109f5206}" labelText="RACE ROUTE" valign="64" referencePoint="0" background="false" position="24.2445,191.81,mm" marginX="0" positionOnPage="24.2445,191.81,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="29.2025,7.272,mm" positionLock="true" marginY="1" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor red="0" green="0" blue="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="6" marginX="1" itemRotation="0" positionOnPage="204.225,191.81,mm" background="false" id="" type="65641" excludeFromExports="0" position="204.225,191.81,mm" blendMode="0" halign="2" referencePoint="0" frame="false" uuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" valign="64" visibility="1" templateUuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" positionLock="true" marginY="1" groupUuid="" labelText="REVISION 1.71 (proposed)" frameJoinStyle="miter" size="57.4836,6.8714,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" htmlState="0" groupUuid="" blendMode="0" itemRotation="0" type="65641" id="" halign="2" zValue="6" templateUuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" uuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" labelText="REVISION 1.72 (proposed)" valign="64" referencePoint="0" background="false" position="204.225,191.81,mm" marginX="1" positionOnPage="204.225,191.81,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="57.4836,6.8714,mm" positionLock="true" marginY="1" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor red="0" green="0" blue="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="5" marginX="1" itemRotation="0" positionOnPage="210.038,199.082,mm" background="false" id="" type="65641" excludeFromExports="0" position="210.038,199.082,mm" blendMode="0" halign="2" referencePoint="0" frame="false" uuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" valign="64" visibility="1" templateUuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" positionLock="true" marginY="1" groupUuid="" labelText="Sunday, 20 October 2019" frameJoinStyle="miter" size="51.6706,6.60801,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" htmlState="0" groupUuid="" blendMode="0" itemRotation="0" type="65641" id="" halign="2" zValue="5" templateUuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" uuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" labelText="Sunday, 20 October 2019" valign="64" referencePoint="0" background="false" position="210.038,199.082,mm" marginX="1" positionOnPage="210.038,199.082,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="51.6706,6.60801,mm" positionLock="true" marginY="1" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor red="0" green="0" blue="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" svgBorderWidth="0.2" outlineWidthM="0.3,mm" anchorPoint="4" opacity="1" svgFillColor="255,255,255,255" zValue="4" itemRotation="0" northOffset="0" positionOnPage="262.196,188.218,mm" background="false" id="" type="65640" excludeFromExports="0" pictureRotation="0" position="262.196,188.218,mm" blendMode="0" resizeMode="0" referencePoint="0" frame="false" uuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" mapUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" visibility="1" templateUuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" positionLock="true" groupUuid="" frameJoinStyle="miter" pictureWidth="29.7523" northMode="0" size="29.7523,17.4718,mm" pictureHeight="17.4074">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" file="../Gun_Run_Logo.png" groupUuid="" pictureWidth="29.7523" pictureRotation="0" svgBorderWidth="0.2" blendMode="0" svgBorderColor="0,0,0,255" pictureHeight="17.4074" northOffset="0" itemRotation="0" svgFillColor="255,255,255,255" type="65640" id="" zValue="4" mapUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" templateUuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" uuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" referencePoint="0" anchorPoint="4" northMode="0" background="false" position="262.196,188.218,mm" resizeMode="0" positionOnPage="262.196,188.218,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="29.7523,17.4718,mm" positionLock="true" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value=""/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" shapeType="1" zValue="3" itemRotation="0" positionOnPage="9.59946,198.832,mm" background="false" id="" type="65643" excludeFromExports="0" position="9.59946,198.832,mm" blendMode="0" referencePoint="0" frame="false" uuid="{5e005555-54ea-40fd-a5a7-20254950b890}" visibility="1" templateUuid="{5e005555-54ea-40fd-a5a7-20254950b890}" positionLock="true" groupUuid="" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" size="251.959,0.1,mm">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" groupUuid="" blendMode="0" itemRotation="0" type="65643" id="" zValue="3" templateUuid="{5e005555-54ea-40fd-a5a7-20254950b890}" uuid="{5e005555-54ea-40fd-a5a7-20254950b890}" referencePoint="0" background="false" position="9.59946,198.832,mm" cornerRadiusMeasure="0,mm" positionOnPage="9.59946,198.832,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" shapeType="1" size="251.959,0.1,mm" positionLock="true" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-          <layer enabled="1" pass="0" class="SimpleFill" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol type="fill" name="" force_rhr="0" clip_to_extent="1" alpha="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="color" v="0,0,0,255"/>
+            <prop k="joinstyle" v="miter"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="solid"/>
+            <prop k="outline_width" v="0.3"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem followPreset="true" outlineWidthM="0.3,mm" opacity="1" keepLayerSet="false" zValue="2" itemRotation="0" mapFlags="0" positionOnPage="5.86559,4.09761,mm" background="true" id="" type="65639" excludeFromExports="0" position="5.86559,4.09761,mm" blendMode="0" referencePoint="0" frame="true" uuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" visibility="1" templateUuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" positionLock="true" groupUuid="" frameJoinStyle="miter" mapRotation="0" labelMargin="0,mm" drawCanvasItems="false" size="67.7828,166.874,mm" followPresetName="Proposed Routes">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" mapRotation="0" keepLayerSet="false" followPresetName="Proposed Routes" groupUuid="" blendMode="0" mapFlags="0" itemRotation="0" type="65639" id="" zValue="2" templateUuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" uuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" referencePoint="0" drawCanvasItems="false" followPreset="true" background="true" position="5.86559,4.09761,mm" labelMargin="0,mm" positionOnPage="5.86559,4.09761,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="true" size="67.7828,166.874,mm" positionLock="true" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapXMax" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMax">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" 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"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMin">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapYMax" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMax">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" 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"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMin">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedOpacity" type="Map">
-                  <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 type="Map" name="dataDefinedOpacity">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmax="18.38563681624126289" ymax="-33.91513741583252539" ymin="-33.94652930000000168" xmin="18.37288570000000121"/>
+        <Extent ymin="-33.94652930000000168" ymax="-33.91513741583252539" xmax="18.38563681624126289" xmin="18.37288570000000121"/>
         <LayerSet/>
-        <ComposerMapGrid leftAnnotationPosition="1" topAnnotationDirection="0" name="Grid 1" unit="0" gridFrameMargin="0" topFrameDivisions="0" offsetY="0" leftFrameDivisions="0" position="3" annotationPrecision="3" blendMode="0" bottomAnnotationDirection="0" rightAnnotationDisplay="0" frameAnnotationDistance="1" rightAnnotationPosition="1" frameFillColor2="0,0,0,255" showAnnotation="0" gridFramePenThickness="0.5" gridFrameStyle="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" show="0" gridStyle="0" annotationFontColor="0,0,0,255" crossLength="3" offsetX="0" rightAnnotationDirection="0" intervalY="0" frameFillColor1="255,255,255,255" leftAnnotationDisplay="0" leftAnnotationDirection="0" gridFramePenColor="0,0,0,255" intervalX="0" rightFrameDivisions="0" annotationExpression="" gridFrameWidth="2" bottomAnnotationPosition="1" gridFrameSideFlags="15" annotationFormat="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" bottomFrameDivisions="0" topAnnotationPosition="1">
+        <ComposerMapGrid annotationPrecision="3" annotationExpression="" annotationFormat="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" unit="0" topAnnotationDisplay="0" annotationFontColor="0,0,0,255" blendMode="0" leftAnnotationDisplay="0" topAnnotationPosition="1" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" frameAnnotationDistance="1" intervalX="0" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" show="0" frameFillColor2="0,0,0,255" gridFrameSideFlags="15" position="3" bottomFrameDivisions="0" name="Grid 1" showAnnotation="0" leftAnnotationDirection="0" leftFrameDivisions="0" leftAnnotationPosition="1" intervalY="0" rightAnnotationDirection="0" rightAnnotationPosition="1" gridFrameMargin="0" crossLength="3" bottomAnnotationDirection="0" topFrameDivisions="0" bottomAnnotationDisplay="0" bottomAnnotationPosition="1" gridFrameStyle="0" rightFrameDivisions="0" offsetX="0" offsetY="0" frameFillColor1="255,255,255,255" gridFrameWidth="2" gridStyle="0">
           <lineStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-              <layer enabled="1" pass="0" class="SimpleLine" locked="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" 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"/>
+            <symbol type="line" name="" force_rhr="0" clip_to_extent="1" alpha="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-              <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol type="marker" name="" force_rhr="0" clip_to_extent="1" alpha="1">
+              <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -13984,93 +13965,93 @@ def my_form_open(dialog, layer, feature):
         <AtlasMap atlasDriven="0" margin="0.05" scalingMode="2"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutItem followPreset="true" outlineWidthM="0.15,mm" opacity="1" keepLayerSet="false" zValue="1" itemRotation="0" mapFlags="0" positionOnPage="9.44946,9.08557,mm" background="true" id="" type="65639" excludeFromExports="0" position="9.44946,9.08557,mm" blendMode="0" referencePoint="0" frame="true" uuid="{b35d820c-6054-4426-a840-5216bed2ca94}" visibility="1" templateUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" positionLock="true" groupUuid="" frameJoinStyle="round" mapRotation="0" labelMargin="0,mm" drawCanvasItems="true" size="282.012,182.649,mm" followPresetName="Proposed Routes">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" mapRotation="0" keepLayerSet="false" followPresetName="Proposed Routes" groupUuid="" blendMode="0" mapFlags="0" itemRotation="0" type="65639" id="" zValue="1" templateUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" uuid="{b35d820c-6054-4426-a840-5216bed2ca94}" referencePoint="0" drawCanvasItems="true" followPreset="true" background="true" position="9.44946,9.08557,mm" labelMargin="0,mm" positionOnPage="9.44946,9.08557,mm" frameJoinStyle="round" outlineWidthM="0.15,mm" visibility="1" frame="true" size="282.012,182.649,mm" positionLock="true" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '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 type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" 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"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.368'&#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 type="Map" name="dataDefinedMapXMin">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.368'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.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 type="Map" name="dataDefinedMapYMin">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" 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"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmax="18.41993426871829342" ymax="-33.89747009916650455" ymin="-33.91199999999999903" xmin="18.39750000000000085"/>
+        <Extent ymin="-33.91199999999999903" ymax="-33.89747009916649034" xmax="18.41993426871829342" xmin="18.39750000000000085"/>
         <LayerSet/>
-        <ComposerMapGrid leftAnnotationPosition="1" topAnnotationDirection="0" name="Grid 1" unit="0" gridFrameMargin="0" topFrameDivisions="0" offsetY="0" leftFrameDivisions="0" position="3" annotationPrecision="3" blendMode="0" bottomAnnotationDirection="0" rightAnnotationDisplay="0" frameAnnotationDistance="1" rightAnnotationPosition="1" frameFillColor2="0,0,0,255" showAnnotation="0" gridFramePenThickness="0.5" gridFrameStyle="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" show="0" gridStyle="0" annotationFontColor="0,0,0,255" crossLength="3" offsetX="0" rightAnnotationDirection="0" intervalY="0" frameFillColor1="255,255,255,255" leftAnnotationDisplay="0" leftAnnotationDirection="0" gridFramePenColor="0,0,0,255" intervalX="0" rightFrameDivisions="0" annotationExpression="" gridFrameWidth="2" bottomAnnotationPosition="1" gridFrameSideFlags="15" annotationFormat="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" bottomFrameDivisions="0" topAnnotationPosition="1">
+        <ComposerMapGrid annotationPrecision="3" annotationExpression="" annotationFormat="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" unit="0" topAnnotationDisplay="0" annotationFontColor="0,0,0,255" blendMode="0" leftAnnotationDisplay="0" topAnnotationPosition="1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" frameAnnotationDistance="1" intervalX="0" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" show="0" frameFillColor2="0,0,0,255" gridFrameSideFlags="15" position="3" bottomFrameDivisions="0" name="Grid 1" showAnnotation="0" leftAnnotationDirection="0" leftFrameDivisions="0" leftAnnotationPosition="1" intervalY="0" rightAnnotationDirection="0" rightAnnotationPosition="1" gridFrameMargin="0" crossLength="3" bottomAnnotationDirection="0" topFrameDivisions="0" bottomAnnotationDisplay="0" bottomAnnotationPosition="1" gridFrameStyle="0" rightFrameDivisions="0" offsetX="0" offsetY="0" frameFillColor1="255,255,255,255" gridFrameWidth="2" gridStyle="0">
           <lineStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-              <layer enabled="1" pass="0" class="SimpleLine" locked="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" 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"/>
+            <symbol type="line" name="" force_rhr="0" clip_to_extent="1" alpha="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-              <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol type="marker" name="" force_rhr="0" clip_to_extent="1" alpha="1">
+              <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -14082,56 +14063,56 @@ def my_form_open(dialog, layer, feature):
         <labelBlockingItems/>
       </LayoutItem>
       <customproperties>
-        <property value="png" key="atlasRasterFormat"/>
-        <property value="0" key="forceVector"/>
-        <property value="true" key="imageAntialias"/>
-        <property value="0" key="imageCropMarginBottom"/>
-        <property value="0" key="imageCropMarginLeft"/>
-        <property value="0" key="imageCropMarginRight"/>
-        <property value="0" key="imageCropMarginTop"/>
-        <property value="false" key="imageCropToContents"/>
-        <property value="0" key="pdfDisableRasterTiles"/>
-        <property value="1" key="pdfIncludeMetadata"/>
-        <property value="0" key="pdfTextFormat"/>
-        <property value="true" key="singleFile"/>
+        <property key="atlasRasterFormat" value="png"/>
+        <property key="forceVector" value="0"/>
+        <property key="imageAntialias" value="true"/>
+        <property key="imageCropMarginBottom" value="0"/>
+        <property key="imageCropMarginLeft" value="0"/>
+        <property key="imageCropMarginRight" value="0"/>
+        <property key="imageCropMarginTop" value="0"/>
+        <property key="imageCropToContents" value="false"/>
+        <property key="pdfDisableRasterTiles" value="0"/>
+        <property key="pdfIncludeMetadata" value="1"/>
+        <property key="pdfTextFormat" value="0"/>
+        <property key="singleFile" value="true"/>
       </customproperties>
-      <Atlas coverageLayer="proposed_routes_f10ccfbd_1547_42d0_8c19_862e4ffde38b" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/proposed_routes.shp|layername=proposed_routes" pageNameExpression="&quot;Distance&quot;" enabled="1" sortAscending="0" coverageLayerProvider="ogr" coverageLayerName="proposed_routes" filterFeatures="1" hideCoverage="0" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortKey="length_m" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21)' )" sortFeatures="1"/>
+      <Atlas coverageLayerName="proposed_routes" hideCoverage="0" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/proposed_routes.shp|layername=proposed_routes" coverageLayerProvider="ogr" sortFeatures="1" enabled="1" sortAscending="0" filterFeatures="1" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" coverageLayer="proposed_routes_f10ccfbd_1547_42d0_8c19_862e4ffde38b" pageNameExpression="&quot;Distance&quot;" sortKey="length_m" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21)' )"/>
     </Layout>
-    <Layout name="Marshals" worldFileMap="" units="mm" printResolution="120">
-      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
-      <Grid resolution="10" offsetY="0" resUnits="mm" offsetUnits="mm" offsetX="0"/>
+    <Layout name="Marshals" printResolution="120" units="mm" worldFileMap="">
+      <Snapper snapToItems="1" snapToGrid="0" tolerance="5" snapToGuides="1"/>
+      <Grid resUnits="mm" offsetY="0" offsetX="0" offsetUnits="mm" resolution="10"/>
       <PageCollection>
-        <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-          <layer enabled="1" pass="0" class="SimpleFill" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol type="fill" name="" force_rhr="0" clip_to_extent="1" alpha="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="color" v="255,255,255,255"/>
+            <prop k="joinstyle" v="miter"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="no"/>
+            <prop k="outline_width" v="0.26"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="0" itemRotation="0" positionOnPage="0,0,mm" background="true" id="" type="65638" excludeFromExports="0" position="0,0,mm" blendMode="0" referencePoint="0" frame="false" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" visibility="1" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" positionLock="false" groupUuid="" frameJoinStyle="miter" size="297,210,mm">
-          <FrameColor red="0" green="0" alpha="255" blue="0"/>
-          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+        <LayoutItem excludeFromExports="0" groupUuid="" blendMode="0" itemRotation="0" type="65638" id="" zValue="0" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" referencePoint="0" background="true" position="0,0,mm" positionOnPage="0,0,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="297,210,mm" positionLock="false" opacity="1">
+          <FrameColor red="0" green="0" blue="0" alpha="255"/>
+          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
@@ -14139,15 +14120,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem splitLayer="0" rasterBorderColor="0,0,0,255" position="128.239,3.58,mm" visibility="1" blendMode="0" rasterBorderWidth="0" itemRotation="0" background="true" legendFilterByAtlas="0" size="19.9422,26,mm" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" wmsLegendWidth="50" columnSpace="2" frame="true" symbolAlignment="1" outlineWidthM="0.1,mm" opacity="1" symbolWidth="7" symbolHeight="4" boxSpace="2" resizeToContents="1" rasterBorder="1" id="" wrapChar="" referencePoint="0" equalColumnWidth="1" groupUuid="" columnCount="1" positionLock="true" fontColor="#000000" type="65642" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" excludeFromExports="0" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" lineSpacing="1" zValue="5" titleAlignment="1" title="" wmsLegendHeight="25" positionOnPage="128.239,3.58,mm" frameJoinStyle="bevel">
-        <FrameColor red="128" green="128" alpha="255" blue="128"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem id="" fontColor="#000000" blendMode="0" columnSpace="2" outlineWidthM="0.1,mm" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" frameJoinStyle="bevel" lineSpacing="1" visibility="1" wrapChar="" positionLock="true" symbolWidth="7" columnCount="1" rasterBorderColor="0,0,0,255" resizeToContents="1" wmsLegendWidth="50" opacity="1" rasterBorderWidth="0" excludeFromExports="0" zValue="5" title="" boxSpace="2" position="128.239,3.58,mm" positionOnPage="128.239,3.58,mm" titleAlignment="1" type="65642" background="true" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" rasterBorder="1" symbolHeight="4" legendFilterByAtlas="0" size="19.9422,26,mm" groupUuid="" wmsLegendHeight="25" symbolAlignment="1" referencePoint="0" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" equalColumnWidth="1" splitLayer="0" itemRotation="0" frame="true">
+        <FrameColor red="128" green="128" blue="128" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
@@ -14159,103 +14140,103 @@ def my_form_open(dialog, layer, feature):
           <style name="group" alignment="1">
             <styleFont style="Semibold" description="Myriad Pro,11,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
-          <style name="subgroup" marginTop="1" alignment="1">
+          <style marginTop="1" name="subgroup" alignment="1">
             <styleFont style="Semibold" description="Myriad Pro,9,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
-          <style name="symbol" marginTop="2" alignment="1">
+          <style marginTop="2" name="symbol" alignment="1">
             <styleFont style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style name="symbolLabel" marginLeft="2" marginTop="2" alignment="1">
+          <style marginTop="2" name="symbolLabel" alignment="1" marginLeft="2">
             <styleFont style="Semibold" description="Myriad Pro,8,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties/>
-          <layer-tree-group name="Routes" checked="Qt::Checked" expanded="1">
+          <layer-tree-group checked="Qt::Checked" expanded="1" name="Routes">
             <customproperties/>
-            <layer-tree-layer name="all_routes" checked="Qt::Checked" id="all_routes20170907054841602" providerKey="ogr" expanded="1" source="./all_routes.shp">
+            <layer-tree-layer checked="Qt::Checked" expanded="1" name="all_routes" id="all_routes20170907054841602" source="./all_routes.shp" providerKey="ogr">
               <customproperties>
-                <property value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" key="expandedLegendNodes"/>
-                <property value="1,2,3" key="legend/node-order"/>
-                <property value="hidden" key="legend/title-style"/>
-                <property value="0" key="showFeatureCount"/>
+                <property key="expandedLegendNodes" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
+                <property key="legend/node-order" value="1,2,3"/>
+                <property key="legend/title-style" value="hidden"/>
+                <property key="showFeatureCount" value="0"/>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem followPreset="true" outlineWidthM="0.2,mm" opacity="1" keepLayerSet="false" zValue="4" itemRotation="0" mapFlags="0" positionOnPage="102.986,142.175,mm" background="true" id="" type="65639" excludeFromExports="0" position="102.986,142.175,mm" blendMode="0" referencePoint="0" frame="true" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" visibility="1" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" positionLock="true" groupUuid="" frameJoinStyle="miter" mapRotation="0" labelMargin="0,mm" drawCanvasItems="false" size="50.4055,50.7436,mm" followPresetName="Marshal map - inset">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" mapRotation="0" keepLayerSet="false" followPresetName="Marshal map - inset" groupUuid="" blendMode="0" mapFlags="0" itemRotation="0" type="65639" id="" zValue="4" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" referencePoint="0" drawCanvasItems="false" followPreset="true" background="true" position="102.986,142.175,mm" labelMargin="0,mm" positionOnPage="102.986,142.175,mm" frameJoinStyle="miter" outlineWidthM="0.2,mm" visibility="1" frame="true" size="50.4055,50.7436,mm" positionLock="true" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmax="18.40867058941471512" ymax="-33.9047436175620831" ymin="-33.90511059368537161" xmin="18.40830605842002043"/>
+        <Extent ymin="-33.90511059368537161" ymax="-33.9047436175620831" xmax="18.40867058941471512" xmin="18.40830605842002043"/>
         <LayerSet/>
-        <ComposerMapGrid leftAnnotationPosition="1" topAnnotationDirection="0" name="Grid 1" unit="0" gridFrameMargin="0" topFrameDivisions="0" offsetY="0" leftFrameDivisions="0" position="3" annotationPrecision="3" blendMode="0" bottomAnnotationDirection="0" rightAnnotationDisplay="0" frameAnnotationDistance="1" rightAnnotationPosition="1" frameFillColor2="0,0,0,255" showAnnotation="0" gridFramePenThickness="0.5" gridFrameStyle="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" show="0" gridStyle="0" annotationFontColor="0,0,0,255" crossLength="3" offsetX="0" rightAnnotationDirection="0" intervalY="0" frameFillColor1="255,255,255,255" leftAnnotationDisplay="0" leftAnnotationDirection="0" gridFramePenColor="0,0,0,255" intervalX="0" rightFrameDivisions="0" annotationExpression="" gridFrameWidth="2" bottomAnnotationPosition="1" gridFrameSideFlags="15" annotationFormat="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" bottomFrameDivisions="0" topAnnotationPosition="1">
+        <ComposerMapGrid annotationPrecision="3" annotationExpression="" annotationFormat="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" unit="0" topAnnotationDisplay="0" annotationFontColor="0,0,0,255" blendMode="0" leftAnnotationDisplay="0" topAnnotationPosition="1" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" frameAnnotationDistance="1" intervalX="0" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" show="0" frameFillColor2="0,0,0,255" gridFrameSideFlags="15" position="3" bottomFrameDivisions="0" name="Grid 1" showAnnotation="0" leftAnnotationDirection="0" leftFrameDivisions="0" leftAnnotationPosition="1" intervalY="0" rightAnnotationDirection="0" rightAnnotationPosition="1" gridFrameMargin="0" crossLength="3" bottomAnnotationDirection="0" topFrameDivisions="0" bottomAnnotationDisplay="0" bottomAnnotationPosition="1" gridFrameStyle="0" rightFrameDivisions="0" offsetX="0" offsetY="0" frameFillColor1="255,255,255,255" gridFrameWidth="2" gridStyle="0">
           <lineStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-              <layer enabled="1" pass="0" class="SimpleLine" locked="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" 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"/>
+            <symbol type="line" name="" force_rhr="0" clip_to_extent="1" alpha="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-              <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol type="marker" name="" force_rhr="0" clip_to_extent="1" alpha="1">
+              <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -14263,25 +14244,25 @@ def my_form_open(dialog, layer, feature):
           </markerStyle>
           <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <ComposerMapOverview name="Overview 1" centered="1" blendMode="0" inverted="0" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" show="1" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" position="3">
-          <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-            <layer enabled="1" pass="0" class="SimpleFill" locked="0">
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="0,65,170,102" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,102" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
+        <ComposerMapOverview inverted="0" name="Overview 1" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" blendMode="0" position="3" centered="1" show="1" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}">
+          <symbol type="fill" name="" force_rhr="0" clip_to_extent="1" alpha="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="color" v="0,65,170,102"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="35,35,35,102"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0.26"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -14290,77 +14271,77 @@ def my_form_open(dialog, layer, feature):
         <AtlasMap atlasDriven="1" margin="0.10000000000000001" scalingMode="0"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutItem followPreset="true" outlineWidthM="0.3,mm" opacity="1" keepLayerSet="false" zValue="3" itemRotation="0" mapFlags="0" positionOnPage="3.53,6.0007,mm" background="false" id="" type="65639" excludeFromExports="0" position="3.53,6.0007,mm" blendMode="0" referencePoint="0" frame="false" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" visibility="1" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" positionLock="true" groupUuid="" frameJoinStyle="miter" mapRotation="0" labelMargin="0,mm" drawCanvasItems="true" size="142,181,mm" followPresetName="Marshal map - main">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" mapRotation="0" keepLayerSet="false" followPresetName="Marshal map - main" groupUuid="" blendMode="0" mapFlags="0" itemRotation="0" type="65639" id="" zValue="3" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" referencePoint="0" drawCanvasItems="true" followPreset="true" background="false" position="3.53,6.0007,mm" labelMargin="0,mm" positionOnPage="3.53,6.0007,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="142,181,mm" positionLock="true" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmax="18.41054220300782873" ymax="-33.90230913298024973" ymin="-33.90754507826720499" xmin="18.40643444482690683"/>
+        <Extent ymin="-33.90754507826720499" ymax="-33.90230913298024973" xmax="18.41054220300782873" xmin="18.40643444482690683"/>
         <LayerSet/>
-        <ComposerMapGrid leftAnnotationPosition="1" topAnnotationDirection="0" name="Grid 1" unit="0" gridFrameMargin="0" topFrameDivisions="0" offsetY="0" leftFrameDivisions="0" position="3" annotationPrecision="3" blendMode="0" bottomAnnotationDirection="0" rightAnnotationDisplay="0" frameAnnotationDistance="1" rightAnnotationPosition="1" frameFillColor2="0,0,0,255" showAnnotation="0" gridFramePenThickness="0.5" gridFrameStyle="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" show="0" gridStyle="0" annotationFontColor="0,0,0,255" crossLength="3" offsetX="0" rightAnnotationDirection="0" intervalY="0" frameFillColor1="255,255,255,255" leftAnnotationDisplay="0" leftAnnotationDirection="0" gridFramePenColor="0,0,0,255" intervalX="0" rightFrameDivisions="0" annotationExpression="" gridFrameWidth="2" bottomAnnotationPosition="1" gridFrameSideFlags="15" annotationFormat="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" bottomFrameDivisions="0" topAnnotationPosition="1">
+        <ComposerMapGrid annotationPrecision="3" annotationExpression="" annotationFormat="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" unit="0" topAnnotationDisplay="0" annotationFontColor="0,0,0,255" blendMode="0" leftAnnotationDisplay="0" topAnnotationPosition="1" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" frameAnnotationDistance="1" intervalX="0" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" show="0" frameFillColor2="0,0,0,255" gridFrameSideFlags="15" position="3" bottomFrameDivisions="0" name="Grid 1" showAnnotation="0" leftAnnotationDirection="0" leftFrameDivisions="0" leftAnnotationPosition="1" intervalY="0" rightAnnotationDirection="0" rightAnnotationPosition="1" gridFrameMargin="0" crossLength="3" bottomAnnotationDirection="0" topFrameDivisions="0" bottomAnnotationDisplay="0" bottomAnnotationPosition="1" gridFrameStyle="0" rightFrameDivisions="0" offsetX="0" offsetY="0" frameFillColor1="255,255,255,255" gridFrameWidth="2" gridStyle="0">
           <lineStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-              <layer enabled="1" pass="0" class="SimpleLine" locked="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" 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"/>
+            <symbol type="line" name="" force_rhr="0" clip_to_extent="1" alpha="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-              <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol type="marker" name="" force_rhr="0" clip_to_extent="1" alpha="1">
+              <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -14371,107 +14352,107 @@ def my_form_open(dialog, layer, feature):
         <AtlasMap atlasDriven="1" margin="0.10000000000000001" scalingMode="0"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="2" hideBackgroundIfEmpty="0" itemRotation="0" hidePageIfEmpty="0" positionOnPage="277.3,6.0007,mm" background="false" id="" type="65647" excludeFromExports="0" position="277.3,6.0007,mm" blendMode="0" sectionX="0" referencePoint="2" frame="false" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" sectionWidth="127.436" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" visibility="1" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" positionLock="true" groupUuid="" frameJoinStyle="round" sectionY="0" size="127.436,159.418,mm" sectionHeight="159.418">
-        <FrameColor red="119" green="119" alpha="255" blue="119"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" hideBackgroundIfEmpty="0" groupUuid="" sectionHeight="159.418" blendMode="0" itemRotation="0" type="65647" sectionWidth="127.436" id="" zValue="2" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" referencePoint="2" sectionY="0" background="false" position="277.3,6.0007,mm" hidePageIfEmpty="0" positionOnPage="277.3,6.0007,mm" frameJoinStyle="round" outlineWidthM="0.3,mm" visibility="1" frame="false" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" size="127.436,159.418,mm" positionLock="true" sectionX="0" opacity="1">
+        <FrameColor red="119" green="119" blue="119" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem svgBorderColor="0,0,0,255" file="../Gun_Run_Logo_2018.png" svgBorderWidth="0.2" outlineWidthM="0.3,mm" anchorPoint="0" opacity="1" svgFillColor="255,255,255,255" zValue="1" itemRotation="0" northOffset="0" positionOnPage="230.194,167.419,mm" background="false" id="" type="65640" excludeFromExports="0" pictureRotation="0" position="230.194,167.419,mm" blendMode="0" resizeMode="0" referencePoint="0" frame="false" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" mapUuid="" visibility="1" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" positionLock="true" groupUuid="" frameJoinStyle="miter" pictureWidth="27.4317" northMode="0" size="47.1065,27.6,mm" pictureHeight="27.6">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" file="../Gun_Run_Logo_2018.png" groupUuid="" pictureWidth="27.4317" pictureRotation="0" svgBorderWidth="0.2" blendMode="0" svgBorderColor="0,0,0,255" pictureHeight="27.6" northOffset="0" itemRotation="0" svgFillColor="255,255,255,255" type="65640" id="" zValue="1" mapUuid="" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" referencePoint="0" anchorPoint="0" northMode="0" background="false" position="230.194,167.419,mm" resizeMode="0" positionOnPage="230.194,167.419,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="47.1065,27.6,mm" positionLock="true" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value=""/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutMultiFrame maxBreakDistance="12" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;tr>&lt;td>Name&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', &quot;csv_name&quot;, '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;/td>&lt;/tr>', '')%]&#xa;&lt;tr>&lt;td>Club&lt;/td>&lt;td>[%csv_club%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%csv_captain%]&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>&lt;b>VOC&lt;/b>&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;tr>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&amp;nbsp;&lt;/td>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain_phone&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;/td>&lt;tr>')%]&#xa;&#xa;&lt;tr>&lt;td>Roger Steward&lt;/td>&lt;td>081 037 3033&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Timothy Allen&lt;/td>&lt;td>072 703 9574&lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please return your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephen Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>" resizeMode="0" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" contentMode="1" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}" stylesheetEnabled="true" evaluateExpressions="true" type="65648" useSmartBreaks="true" url="">
-        <childFrame uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}"/>
+      <LayoutMultiFrame type="65648" evaluateExpressions="true" useSmartBreaks="true" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" contentMode="1" maxBreakDistance="12" 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" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;tr>&lt;td>Name&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', &quot;csv_name&quot;, '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;/td>&lt;/tr>', '')%]&#xa;&lt;tr>&lt;td>Club&lt;/td>&lt;td>[%csv_club%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%csv_captain%]&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>&lt;b>VOC&lt;/b>&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;tr>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&amp;nbsp;&lt;/td>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain_phone&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;/td>&lt;tr>')%]&#xa;&#xa;&lt;tr>&lt;td>Roger Steward&lt;/td>&lt;td>081 037 3033&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Timothy Allen&lt;/td>&lt;td>072 703 9574&lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please return your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephen Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" url="" stylesheetEnabled="true">
+        <childFrame templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutMultiFrame>
       <customproperties>
-        <property value="jpg" key="atlasRasterFormat"/>
-        <property value="false" key="forceVector"/>
-        <property value="true" key="imageAntialias"/>
-        <property value="0" key="imageCropMarginBottom"/>
-        <property value="0" key="imageCropMarginLeft"/>
-        <property value="0" key="imageCropMarginRight"/>
-        <property value="0" key="imageCropMarginTop"/>
-        <property value="0" key="imageCropMarginUnit"/>
-        <property value="false" key="imageCropToContents"/>
-        <property value="false" key="rasterize"/>
-        <property value="3.53" key="resizeToContentsBottomMargin"/>
-        <property value="3.53" key="resizeToContentsLeftMargin"/>
-        <property value="3.53" key="resizeToContentsRightMargin"/>
-        <property value="3.53" key="resizeToContentsTopMargin"/>
-        <property value="false" key="singleFile"/>
+        <property key="atlasRasterFormat" value="jpg"/>
+        <property key="forceVector" value="false"/>
+        <property key="imageAntialias" value="true"/>
+        <property key="imageCropMarginBottom" value="0"/>
+        <property key="imageCropMarginLeft" value="0"/>
+        <property key="imageCropMarginRight" value="0"/>
+        <property key="imageCropMarginTop" value="0"/>
+        <property key="imageCropMarginUnit" value="0"/>
+        <property key="imageCropToContents" value="false"/>
+        <property key="rasterize" value="false"/>
+        <property key="resizeToContentsBottomMargin" value="3.53"/>
+        <property key="resizeToContentsLeftMargin" value="3.53"/>
+        <property key="resizeToContentsRightMargin" value="3.53"/>
+        <property key="resizeToContentsTopMargin" value="3.53"/>
+        <property key="singleFile" value="false"/>
       </customproperties>
-      <Atlas coverageLayer="all_routes20170907054841602" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/all_routes.shp" pageNameExpression="&quot;position&quot;" enabled="1" sortAscending="1" coverageLayerProvider="ogr" coverageLayerName="all_routes" filterFeatures="0" hideCoverage="0" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" sortKey="position" sortFeatures="1"/>
+      <Atlas coverageLayerName="all_routes" hideCoverage="0" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/all_routes.shp" coverageLayerProvider="ogr" sortFeatures="1" enabled="1" sortAscending="1" filterFeatures="0" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" coverageLayer="all_routes20170907054841602" pageNameExpression="&quot;position&quot;" sortKey="position"/>
     </Layout>
-    <Layout name="Marshal Plan" worldFileMap="" units="mm" printResolution="120">
-      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
-      <Grid resolution="10" offsetY="0" resUnits="mm" offsetUnits="mm" offsetX="0"/>
+    <Layout name="Marshal Plan" printResolution="120" units="mm" worldFileMap="">
+      <Snapper snapToItems="1" snapToGrid="0" tolerance="5" snapToGuides="1"/>
+      <Grid resUnits="mm" offsetY="0" offsetX="0" offsetUnits="mm" resolution="10"/>
       <PageCollection>
-        <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-          <layer enabled="1" pass="0" class="SimpleFill" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol type="fill" name="" force_rhr="0" clip_to_extent="1" alpha="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="color" v="255,255,255,255"/>
+            <prop k="joinstyle" v="miter"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="no"/>
+            <prop k="outline_width" v="0.26"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="0" itemRotation="0" positionOnPage="0,0,mm" background="true" id="" type="65638" excludeFromExports="0" position="0,0,mm" blendMode="0" referencePoint="0" frame="false" uuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" visibility="1" templateUuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" positionLock="false" groupUuid="" frameJoinStyle="miter" size="297,420,mm">
-          <FrameColor red="0" green="0" alpha="255" blue="0"/>
-          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+        <LayoutItem excludeFromExports="0" groupUuid="" blendMode="0" itemRotation="0" type="65638" id="" zValue="0" templateUuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" uuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" referencePoint="0" background="true" position="0,0,mm" positionOnPage="0,0,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="297,420,mm" positionLock="false" opacity="1">
+          <FrameColor red="0" green="0" blue="0" alpha="255"/>
+          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
@@ -14479,15 +14460,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem splitLayer="0" rasterBorderColor="0,0,0,255" position="15.6525,12.5708,mm" visibility="1" blendMode="0" rasterBorderWidth="0" itemRotation="0" background="true" legendFilterByAtlas="0" size="21.6797,27,mm" map_uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" wmsLegendWidth="50" columnSpace="2" frame="false" symbolAlignment="1" outlineWidthM="0.3,mm" opacity="1" symbolWidth="7" symbolHeight="4" boxSpace="2" resizeToContents="1" rasterBorder="1" id="" wrapChar="" referencePoint="0" equalColumnWidth="1" groupUuid="" columnCount="1" positionLock="true" fontColor="#000000" type="65642" uuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" excludeFromExports="0" templateUuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" lineSpacing="1" zValue="8" titleAlignment="1" title="" wmsLegendHeight="25" positionOnPage="15.6525,12.5708,mm" frameJoinStyle="miter">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem id="" fontColor="#000000" blendMode="0" columnSpace="2" outlineWidthM="0.3,mm" uuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" frameJoinStyle="miter" lineSpacing="1" visibility="1" wrapChar="" positionLock="true" symbolWidth="7" columnCount="1" rasterBorderColor="0,0,0,255" resizeToContents="1" wmsLegendWidth="50" opacity="1" rasterBorderWidth="0" excludeFromExports="0" zValue="8" title="" boxSpace="2" position="15.6525,12.5708,mm" positionOnPage="15.6525,12.5708,mm" titleAlignment="1" type="65642" background="true" templateUuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" rasterBorder="1" symbolHeight="4" legendFilterByAtlas="0" size="21.6797,27,mm" groupUuid="" wmsLegendHeight="25" symbolAlignment="1" referencePoint="0" map_uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" equalColumnWidth="1" splitLayer="0" itemRotation="0" frame="false">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
@@ -14499,226 +14480,226 @@ def my_form_open(dialog, layer, feature):
           <style name="group" alignment="1">
             <styleFont style="Semibold" description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
-          <style name="subgroup" marginTop="1" alignment="1">
+          <style marginTop="1" name="subgroup" alignment="1">
             <styleFont style="Semibold" description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
-          <style name="symbol" marginTop="2" alignment="1">
+          <style marginTop="2" name="symbol" alignment="1">
             <styleFont style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style name="symbolLabel" marginLeft="2" marginTop="2" alignment="1">
+          <style marginTop="2" name="symbolLabel" alignment="1" marginLeft="2">
             <styleFont style="Semibold" description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties/>
-          <layer-tree-group name="Routes" checked="Qt::Checked" expanded="1">
+          <layer-tree-group checked="Qt::Checked" expanded="1" name="Routes">
             <customproperties/>
-            <layer-tree-layer name="all_routes" checked="Qt::Checked" id="all_routes20170907054841602" providerKey="ogr" expanded="1" source="./all_routes.shp">
+            <layer-tree-layer checked="Qt::Checked" expanded="1" name="all_routes" id="all_routes20170907054841602" source="./all_routes.shp" providerKey="ogr">
               <customproperties>
-                <property value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" key="expandedLegendNodes"/>
-                <property value="1,2,3" key="legend/node-order"/>
-                <property value="hidden" key="legend/title-style"/>
-                <property value="0" key="showFeatureCount"/>
+                <property key="expandedLegendNodes" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
+                <property key="legend/node-order" value="1,2,3"/>
+                <property key="legend/title-style" value="hidden"/>
+                <property key="showFeatureCount" value="0"/>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="7" marginX="1" itemRotation="0" positionOnPage="5.69321,399.106,mm" background="false" id="" type="65641" excludeFromExports="0" position="5.69321,399.106,mm" blendMode="0" halign="1" referencePoint="0" frame="false" uuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" valign="64" visibility="1" templateUuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" positionLock="true" marginY="1" groupUuid="" labelText="MARSHAL POSITIONS" frameJoinStyle="miter" size="45.1194,7.36972,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" htmlState="0" groupUuid="" blendMode="0" itemRotation="0" type="65641" id="" halign="1" zValue="7" templateUuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" uuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" labelText="MARSHAL POSITIONS" valign="64" referencePoint="0" background="false" position="5.69321,399.106,mm" marginX="1" positionOnPage="5.69321,399.106,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="45.1194,7.36972,mm" positionLock="true" marginY="1" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Semibold" description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor red="0" green="0" blue="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="6" marginX="1" itemRotation="0" positionOnPage="5.69321,406.988,mm" background="false" id="" type="65641" excludeFromExports="0" position="5.69321,406.988,mm" blendMode="0" halign="1" referencePoint="0" frame="false" uuid="{619c5aac-2a47-4730-9726-57b172205ef7}" valign="32" visibility="1" templateUuid="{619c5aac-2a47-4730-9726-57b172205ef7}" positionLock="true" marginY="1" groupUuid="" labelText="Page [% &quot;page&quot; %]" frameJoinStyle="miter" size="16.2476,7.80192,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" htmlState="0" groupUuid="" blendMode="0" itemRotation="0" type="65641" id="" halign="1" zValue="6" templateUuid="{619c5aac-2a47-4730-9726-57b172205ef7}" uuid="{619c5aac-2a47-4730-9726-57b172205ef7}" labelText="Page [% &quot;page&quot; %]" valign="32" referencePoint="0" background="false" position="5.69321,406.988,mm" marginX="1" positionOnPage="5.69321,406.988,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="16.2476,7.80192,mm" positionLock="true" marginY="1" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor red="0" green="0" blue="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="5" marginX="1" itemRotation="0" positionOnPage="214.292,406.988,mm" background="false" id="" type="65641" excludeFromExports="0" position="214.292,406.988,mm" blendMode="0" halign="2" referencePoint="0" frame="false" uuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" valign="32" visibility="1" templateUuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" positionLock="true" marginY="1" groupUuid="" labelText="REVISION 3.2" frameJoinStyle="miter" size="27.7839,7.51682,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" htmlState="0" groupUuid="" blendMode="0" itemRotation="0" type="65641" id="" halign="2" zValue="5" templateUuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" uuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" labelText="REVISION 3.2" valign="32" referencePoint="0" background="false" position="214.292,406.988,mm" marginX="1" positionOnPage="214.292,406.988,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="27.7839,7.51682,mm" positionLock="true" marginY="1" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor red="0" green="0" blue="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="4" marginX="1" itemRotation="0" positionOnPage="185.72,399.107,mm" background="false" id="" type="65641" excludeFromExports="0" position="185.72,399.107,mm" blendMode="0" halign="2" referencePoint="0" frame="false" uuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" valign="64" visibility="1" templateUuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" positionLock="true" marginY="1" groupUuid="" labelText="Sunday, 20 October 2019" frameJoinStyle="miter" size="56.3557,7.36902,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" htmlState="0" groupUuid="" blendMode="0" itemRotation="0" type="65641" id="" halign="2" zValue="4" templateUuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" uuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" labelText="Sunday, 20 October 2019" valign="64" referencePoint="0" background="false" position="185.72,399.107,mm" marginX="1" positionOnPage="185.72,399.107,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="56.3557,7.36902,mm" positionLock="true" marginY="1" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor red="0" green="0" blue="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem svgBorderColor="0,0,0,255" file="../Gun_Run_Logo_2018.png" svgBorderWidth="0.2" outlineWidthM="0.3,mm" anchorPoint="8" opacity="1" svgFillColor="255,255,255,255" zValue="3" itemRotation="0" northOffset="0" positionOnPage="243.319,382.696,mm" background="false" id="" type="65640" excludeFromExports="0" pictureRotation="0" position="243.319,382.696,mm" blendMode="0" resizeMode="0" referencePoint="0" frame="false" uuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" mapUuid="" visibility="1" templateUuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" positionLock="true" groupUuid="" frameJoinStyle="miter" pictureWidth="31.1059" northMode="0" size="49.3143,31.2967,mm" pictureHeight="31.2967">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" file="../Gun_Run_Logo_2018.png" groupUuid="" pictureWidth="31.1059" pictureRotation="0" svgBorderWidth="0.2" blendMode="0" svgBorderColor="0,0,0,255" pictureHeight="31.2967" northOffset="0" itemRotation="0" svgFillColor="255,255,255,255" type="65640" id="" zValue="3" mapUuid="" templateUuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" uuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" referencePoint="0" anchorPoint="8" northMode="0" background="false" position="243.319,382.696,mm" resizeMode="0" positionOnPage="243.319,382.696,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="49.3143,31.2967,mm" positionLock="true" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value=""/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" shapeType="1" zValue="2" itemRotation="0" positionOnPage="5.84321,406.626,mm" background="false" id="" type="65643" excludeFromExports="0" position="5.84321,406.626,mm" blendMode="0" referencePoint="0" frame="false" uuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" visibility="1" templateUuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" positionLock="true" groupUuid="" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" size="236.083,0.14328,mm">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" groupUuid="" blendMode="0" itemRotation="0" type="65643" id="" zValue="2" templateUuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" uuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" referencePoint="0" background="false" position="5.84321,406.626,mm" cornerRadiusMeasure="0,mm" positionOnPage="5.84321,406.626,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" shapeType="1" size="236.083,0.14328,mm" positionLock="true" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-          <layer enabled="1" pass="0" class="SimpleFill" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol type="fill" name="" force_rhr="0" clip_to_extent="1" alpha="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="color" v="0,0,0,255"/>
+            <prop k="joinstyle" v="miter"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="solid"/>
+            <prop k="outline_width" v="0.3"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem followPreset="true" outlineWidthM="0.3,mm" opacity="1" keepLayerSet="false" zValue="1" itemRotation="0" mapFlags="0" positionOnPage="5.03,5.9483,mm" background="true" id="" type="65639" excludeFromExports="0" position="5.03,5.9483,mm" blendMode="0" referencePoint="0" frame="false" uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" visibility="1" templateUuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" positionLock="true" groupUuid="" frameJoinStyle="miter" mapRotation="0" labelMargin="0,mm" drawCanvasItems="false" size="286.94,392.396,mm" followPresetName="Marshal overview">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" mapRotation="0" keepLayerSet="false" followPresetName="Marshal overview" groupUuid="" blendMode="0" mapFlags="0" itemRotation="0" type="65639" id="" zValue="1" templateUuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" referencePoint="0" drawCanvasItems="false" followPreset="true" background="true" position="5.03,5.9483,mm" labelMargin="0,mm" positionOnPage="5.03,5.9483,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="286.94,392.396,mm" positionLock="true" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="field" value="" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="field" value=""/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="field" value="" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMin">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="field" value=""/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="field" value="" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMin">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="field" value=""/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmax="18.42124635930919041" ymax="-33.89547273009495854" ymin="-33.91857233280978789" xmin="18.4043547521658617"/>
+        <Extent ymin="-33.91857233280978789" ymax="-33.89547273009495854" xmax="18.42124635930919041" xmin="18.4043547521658617"/>
         <LayerSet/>
         <AtlasMap atlasDriven="1" margin="0" scalingMode="2"/>
         <labelBlockingItems/>
       </LayoutItem>
       <customproperties>
-        <property value="png" key="atlasRasterFormat"/>
+        <property key="atlasRasterFormat" value="png"/>
       </customproperties>
-      <Atlas coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" pageNameExpression="&quot;page&quot;" enabled="1" sortAscending="1" coverageLayerProvider="ogr" coverageLayerName="marshal overviews" filterFeatures="0" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" sortKey="page" sortFeatures="1"/>
+      <Atlas coverageLayerName="marshal overviews" hideCoverage="1" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" coverageLayerProvider="ogr" sortFeatures="1" enabled="1" sortAscending="1" filterFeatures="0" filenamePattern="'output_'||@atlas_featurenumber" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" pageNameExpression="&quot;page&quot;" sortKey="page"/>
     </Layout>
-    <Layout name="Start &amp; Finish Backgrounds" worldFileMap="" units="mm" printResolution="300">
-      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
-      <Grid resolution="10" offsetY="0" resUnits="mm" offsetUnits="mm" offsetX="0"/>
+    <Layout name="Start &amp; Finish Backgrounds" printResolution="300" units="mm" worldFileMap="">
+      <Snapper snapToItems="1" snapToGrid="0" tolerance="5" snapToGuides="1"/>
+      <Grid resUnits="mm" offsetY="0" offsetX="0" offsetUnits="mm" resolution="10"/>
       <PageCollection>
-        <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-          <layer enabled="1" pass="0" class="SimpleFill" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol type="fill" name="" force_rhr="0" clip_to_extent="1" alpha="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="color" v="255,255,255,255"/>
+            <prop k="joinstyle" v="miter"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="no"/>
+            <prop k="outline_width" v="0.26"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="0" itemRotation="0" positionOnPage="0,0,mm" background="true" id="" type="65638" excludeFromExports="0" position="0,0,mm" blendMode="0" referencePoint="0" frame="false" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" visibility="1" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" positionLock="false" groupUuid="" frameJoinStyle="miter" size="297,210,mm">
-          <FrameColor red="0" green="0" alpha="255" blue="0"/>
-          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+        <LayoutItem excludeFromExports="0" groupUuid="" blendMode="0" itemRotation="0" type="65638" id="" zValue="0" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" referencePoint="0" background="true" position="0,0,mm" positionOnPage="0,0,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="297,210,mm" positionLock="false" opacity="1">
+          <FrameColor red="0" green="0" blue="0" alpha="255"/>
+          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
@@ -14726,151 +14707,151 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem svgBorderColor="0,0,0,255" file="arrows/NorthArrow_11.svg" svgBorderWidth="0.2" outlineWidthM="0.3,mm" anchorPoint="0" opacity="1" svgFillColor="255,255,255,255" zValue="4" itemRotation="0" northOffset="0" positionOnPage="286.027,2,mm" background="false" id="" type="65640" excludeFromExports="0" pictureRotation="330" position="286.027,2,mm" blendMode="0" resizeMode="0" referencePoint="0" frame="false" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" visibility="1" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" positionLock="true" groupUuid="" frameJoinStyle="miter" pictureWidth="6.31767" northMode="0" size="9.45865,11,mm" pictureHeight="7.97477">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" file="arrows/NorthArrow_11.svg" groupUuid="" pictureWidth="6.31767" pictureRotation="330" svgBorderWidth="0.2" blendMode="0" svgBorderColor="0,0,0,255" pictureHeight="7.97477" northOffset="0" itemRotation="0" svgFillColor="255,255,255,255" type="65640" id="" zValue="4" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" referencePoint="0" anchorPoint="0" northMode="0" background="false" position="286.027,2,mm" resizeMode="0" positionOnPage="286.027,2,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="9.45865,11,mm" positionLock="true" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value=""/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="3" marginX="1" itemRotation="270" positionOnPage="285.027,205.886,mm" background="false" id="" type="65641" excludeFromExports="0" position="285.027,205.886,mm" blendMode="0" halign="1" referencePoint="0" frame="false" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" valign="64" visibility="1" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" positionLock="true" marginY="1" groupUuid="" labelText="[%upper( &quot;area&quot; )%]" frameJoinStyle="miter" size="142.543,10.3185,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" htmlState="0" groupUuid="" blendMode="0" itemRotation="270" type="65641" id="" halign="1" zValue="3" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" labelText="[%upper( &quot;area&quot; )%]" valign="64" referencePoint="0" background="false" position="285.027,205.886,mm" marginX="1" positionOnPage="285.027,205.886,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="142.543,10.3185,mm" positionLock="true" marginY="1" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor red="0" green="0" blue="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem outlineWidth="0.3" segmentMillimeters="26.485" position="7,189.669,mm" visibility="1" blendMode="0" maxBarWidth="150" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" height="3" itemRotation="0" background="false" size="144.798,16.2165,mm" lineJoinStyle="miter" labelBarSpace="3" frame="false" lineCapStyle="square" numUnitsPerSegment="30" outlineWidthM="0.3,mm" opacity="1" style="Single Box" minBarWidth="50" id="" referencePoint="0" groupUuid="" unitType="meters" numMapUnitsPerScaleBarUnit="1" positionLock="true" numSegmentsLeft="2" numSegments="4" alignment="0" type="65646" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" boxContentSpace="1" excludeFromExports="0" segmentSizeMode="1" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" zValue="2" unitLabel="m" positionOnPage="7,189.669,mm" frameJoinStyle="miter">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem numSegmentsLeft="2" id="" blendMode="0" outlineWidthM="0.3,mm" minBarWidth="50" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" frameJoinStyle="miter" visibility="1" boxContentSpace="1" segmentMillimeters="26.485" positionLock="true" opacity="1" excludeFromExports="0" zValue="2" numMapUnitsPerScaleBarUnit="1" position="7,189.669,mm" positionOnPage="7,189.669,mm" lineJoinStyle="miter" numSegments="4" numUnitsPerSegment="30" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" type="65646" background="false" segmentSizeMode="1" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" labelBarSpace="3" size="144.798,16.2165,mm" groupUuid="" unitLabel="m" style="Single Box" referencePoint="0" unitType="meters" maxBarWidth="150" lineCapStyle="square" itemRotation="0" frame="false" alignment="0" height="3" outlineWidth="0.3">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <text-style fontUnderline="0" fontCapitals="0" fontItalic="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" textColor="0,0,0,255" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" blendMode="0" fontWeight="50" fontSize="12" fontLetterSpacing="0" multilineHeight="1">
-          <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-          <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeJoinStyle="64" shapeRadiiY="0" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+        <text-style fontSize="12" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontWeight="50" fontStrikeout="0" textOpacity="1" fontSizeUnit="Point" blendMode="0" fontWordSpacing="0" fontFamily="Myriad Pro" textColor="0,0,0,255" fontCapitals="0" fontItalic="0" multilineHeight="1" fontLetterSpacing="0" namedStyle="">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferSize="1" bufferSizeUnits="MM" bufferBlendMode="0" bufferDraw="0" bufferOpacity="1" bufferColor="255,255,255,255"/>
+          <background shapeOffsetX="0" shapeSVGFile="" shapeSizeType="0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeX="0" shapeRotation="0" shapeRadiiUnit="MM" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeOpacity="1" shapeBorderWidthUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeType="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeBorderWidth="0"/>
+          <shadow shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowUnder="0" shadowBlendMode="6"/>
         </text-style>
-        <fillColor red="0" green="0" alpha="255" blue="0"/>
-        <fillColor2 red="255" green="255" alpha="255" blue="255"/>
-        <strokeColor red="0" green="0" alpha="255" blue="0"/>
+        <fillColor red="0" green="0" blue="0" alpha="255"/>
+        <fillColor2 red="255" green="255" blue="255" alpha="255"/>
+        <strokeColor red="0" green="0" blue="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem followPreset="true" outlineWidthM="0.3,mm" opacity="1" keepLayerSet="false" zValue="1" itemRotation="0" mapFlags="0" positionOnPage="7,5.5,mm" background="false" id="" type="65639" excludeFromExports="0" position="7,5.5,mm" blendMode="0" referencePoint="0" frame="false" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" visibility="1" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" positionLock="true" groupUuid="" frameJoinStyle="miter" mapRotation="330" labelMargin="0,mm" drawCanvasItems="false" size="278.027,180.318,mm" followPresetName="Start/Finish">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" mapRotation="330" keepLayerSet="false" followPresetName="Start/Finish" groupUuid="" blendMode="0" mapFlags="0" itemRotation="0" type="65639" id="" zValue="1" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" referencePoint="0" drawCanvasItems="false" followPreset="true" background="false" position="7,5.5,mm" labelMargin="0,mm" positionOnPage="7,5.5,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="278.027,180.318,mm" positionLock="true" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapRotation" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="field" value="rotation" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapRotation">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="field" value="rotation"/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="field" value="id" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="field" value="id"/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
-                <Option name="dataDefinedRotation" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="field" value="angle" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                <Option type="Map" name="dataDefinedRotation">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="field" value="angle"/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmax="18.41529351624939181" ymax="-33.90054080002538228" ymin="-33.90274914295450515" xmin="18.41188853742018949"/>
+        <Extent ymin="-33.90274914295450515" ymax="-33.90054080002538228" xmax="18.41529351624939181" xmin="18.41188853742018949"/>
         <LayerSet/>
-        <ComposerMapGrid leftAnnotationPosition="1" topAnnotationDirection="0" name="Grid 1" unit="1" gridFrameMargin="0" topFrameDivisions="0" offsetY="0" leftFrameDivisions="0" position="3" annotationPrecision="3" blendMode="0" bottomAnnotationDirection="0" rightAnnotationDisplay="3" frameAnnotationDistance="1" rightAnnotationPosition="1" frameFillColor2="0,0,0,255" showAnnotation="0" gridFramePenThickness="0.5" gridFrameStyle="0" bottomAnnotationDisplay="3" topAnnotationDisplay="3" show="0" gridStyle="0" annotationFontColor="0,0,0,255" crossLength="3" offsetX="0" rightAnnotationDirection="0" intervalY="5" frameFillColor1="255,255,255,255" leftAnnotationDisplay="3" leftAnnotationDirection="0" gridFramePenColor="0,0,0,255" intervalX="5" rightFrameDivisions="0" annotationExpression="" gridFrameWidth="2" bottomAnnotationPosition="1" gridFrameSideFlags="15" annotationFormat="4" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" bottomFrameDivisions="0" topAnnotationPosition="1">
+        <ComposerMapGrid annotationPrecision="3" annotationExpression="" annotationFormat="4" gridFramePenThickness="0.5" rightAnnotationDisplay="3" unit="1" topAnnotationDisplay="3" annotationFontColor="0,0,0,255" blendMode="0" leftAnnotationDisplay="3" topAnnotationPosition="1" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" frameAnnotationDistance="1" intervalX="5" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" show="0" frameFillColor2="0,0,0,255" gridFrameSideFlags="15" position="3" bottomFrameDivisions="0" name="Grid 1" showAnnotation="0" leftAnnotationDirection="0" leftFrameDivisions="0" leftAnnotationPosition="1" intervalY="5" rightAnnotationDirection="0" rightAnnotationPosition="1" gridFrameMargin="0" crossLength="3" bottomAnnotationDirection="0" topFrameDivisions="0" bottomAnnotationDisplay="3" bottomAnnotationPosition="1" gridFrameStyle="0" rightFrameDivisions="0" offsetX="0" offsetY="0" frameFillColor1="255,255,255,255" gridFrameWidth="2" gridStyle="0">
           <lineStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-              <layer enabled="1" pass="0" class="SimpleLine" locked="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="195,195,195,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" 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"/>
+            <symbol type="line" name="" force_rhr="0" clip_to_extent="1" alpha="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="195,195,195,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-              <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol type="marker" name="" force_rhr="0" clip_to_extent="1" alpha="1">
+              <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -14892,56 +14873,56 @@ def my_form_open(dialog, layer, feature):
         <labelBlockingItems/>
       </LayoutItem>
       <customproperties>
-        <property value="png" key="atlasRasterFormat"/>
-        <property value="0" key="forceVector"/>
-        <property value="true" key="imageAntialias"/>
-        <property value="0" key="imageCropMarginBottom"/>
-        <property value="0" key="imageCropMarginLeft"/>
-        <property value="0" key="imageCropMarginRight"/>
-        <property value="0" key="imageCropMarginTop"/>
-        <property value="false" key="imageCropToContents"/>
-        <property value="0" key="pdfDisableRasterTiles"/>
-        <property value="1" key="pdfIncludeMetadata"/>
-        <property value="0" key="pdfTextFormat"/>
-        <property value="true" key="singleFile"/>
+        <property key="atlasRasterFormat" value="png"/>
+        <property key="forceVector" value="0"/>
+        <property key="imageAntialias" value="true"/>
+        <property key="imageCropMarginBottom" value="0"/>
+        <property key="imageCropMarginLeft" value="0"/>
+        <property key="imageCropMarginRight" value="0"/>
+        <property key="imageCropMarginTop" value="0"/>
+        <property key="imageCropToContents" value="false"/>
+        <property key="pdfDisableRasterTiles" value="0"/>
+        <property key="pdfIncludeMetadata" value="1"/>
+        <property key="pdfTextFormat" value="0"/>
+        <property key="singleFile" value="true"/>
       </customproperties>
-      <Atlas coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/start_finish_area.shp" pageNameExpression="&quot;area&quot;" enabled="1" sortAscending="1" coverageLayerProvider="ogr" coverageLayerName="start_finish_area" filterFeatures="0" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" sortKey="area" sortFeatures="1"/>
+      <Atlas coverageLayerName="start_finish_area" hideCoverage="1" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/start_finish_area.shp" coverageLayerProvider="ogr" sortFeatures="1" enabled="1" sortAscending="1" filterFeatures="0" filenamePattern="'output_'||@atlas_featurenumber" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" pageNameExpression="&quot;area&quot;" sortKey="area"/>
     </Layout>
-    <Layout name="Fencing" worldFileMap="" units="mm" printResolution="300">
-      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
-      <Grid resolution="10" offsetY="0" resUnits="mm" offsetUnits="mm" offsetX="0"/>
+    <Layout name="Fencing" printResolution="300" units="mm" worldFileMap="">
+      <Snapper snapToItems="1" snapToGrid="0" tolerance="5" snapToGuides="1"/>
+      <Grid resUnits="mm" offsetY="0" offsetX="0" offsetUnits="mm" resolution="10"/>
       <PageCollection>
-        <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-          <layer enabled="1" pass="0" class="SimpleFill" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol type="fill" name="" force_rhr="0" clip_to_extent="1" alpha="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="color" v="255,255,255,255"/>
+            <prop k="joinstyle" v="miter"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="no"/>
+            <prop k="outline_width" v="0.26"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="0" itemRotation="0" positionOnPage="0,0,mm" background="true" id="" type="65638" excludeFromExports="0" position="0,0,mm" blendMode="0" referencePoint="0" frame="false" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" visibility="1" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" positionLock="false" groupUuid="" frameJoinStyle="miter" size="297,210,mm">
-          <FrameColor red="0" green="0" alpha="255" blue="0"/>
-          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+        <LayoutItem excludeFromExports="0" groupUuid="" blendMode="0" itemRotation="0" type="65638" id="" zValue="0" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" referencePoint="0" background="true" position="0,0,mm" positionOnPage="0,0,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="297,210,mm" positionLock="false" opacity="1">
+          <FrameColor red="0" green="0" blue="0" alpha="255"/>
+          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
@@ -14949,157 +14930,157 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="9" marginX="1" itemRotation="0" positionOnPage="6.76779,190.27,mm" background="false" id="" type="65641" excludeFromExports="0" position="6.76779,190.27,mm" blendMode="0" halign="1" referencePoint="0" frame="false" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" valign="64" visibility="1" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" positionLock="true" marginY="1" groupUuid="" labelText="FENCING: [% &quot;name&quot; %]" frameJoinStyle="miter" size="148.46,7.36972,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" htmlState="0" groupUuid="" blendMode="0" itemRotation="0" type="65641" id="" halign="1" zValue="9" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" labelText="FENCING: [% &quot;name&quot; %]" valign="64" referencePoint="0" background="false" position="6.76779,190.27,mm" marginX="1" positionOnPage="6.76779,190.27,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="148.46,7.36972,mm" positionLock="true" marginY="1" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Semibold" description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor red="0" green="0" blue="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="8" marginX="1" itemRotation="0" positionOnPage="6.76779,198.083,mm" background="false" id="" type="65641" excludeFromExports="0" position="6.76779,198.083,mm" blendMode="0" halign="1" referencePoint="0" frame="false" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" valign="32" visibility="1" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" positionLock="true" marginY="1" groupUuid="" labelText="Page [%@layout_page %]" frameJoinStyle="miter" size="148.46,7.80192,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" htmlState="0" groupUuid="" blendMode="0" itemRotation="0" type="65641" id="" halign="1" zValue="8" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" labelText="Page [%@layout_page %]" valign="32" referencePoint="0" background="false" position="6.76779,198.083,mm" marginX="1" positionOnPage="6.76779,198.083,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="148.46,7.80192,mm" positionLock="true" marginY="1" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor red="0" green="0" blue="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="7" marginX="1" itemRotation="0" positionOnPage="211.295,197.64,mm" background="false" id="" type="65641" excludeFromExports="0" position="211.295,197.64,mm" blendMode="0" halign="2" referencePoint="0" frame="false" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" valign="32" visibility="1" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" positionLock="true" marginY="1" groupUuid="" labelText="REVISION 1.0" frameJoinStyle="miter" size="27.7839,7.51682,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" htmlState="0" groupUuid="" blendMode="0" itemRotation="0" type="65641" id="" halign="2" zValue="7" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" labelText="REVISION 1.0" valign="32" referencePoint="0" background="false" position="211.295,197.64,mm" marginX="1" positionOnPage="211.295,197.64,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="27.7839,7.51682,mm" positionLock="true" marginY="1" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor red="0" green="0" blue="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="6" marginX="1" itemRotation="0" positionOnPage="182.723,190.271,mm" background="false" id="" type="65641" excludeFromExports="0" position="182.723,190.271,mm" blendMode="0" halign="2" referencePoint="0" frame="false" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" valign="64" visibility="1" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" positionLock="true" marginY="1" groupUuid="" labelText="Sunday, 20 October 2019" frameJoinStyle="miter" size="56.3557,7.36902,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" htmlState="0" groupUuid="" blendMode="0" itemRotation="0" type="65641" id="" halign="2" zValue="6" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" labelText="Sunday, 20 October 2019" valign="64" referencePoint="0" background="false" position="182.723,190.271,mm" marginX="1" positionOnPage="182.723,190.271,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="56.3557,7.36902,mm" positionLock="true" marginY="1" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor red="0" green="0" blue="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" svgBorderWidth="0.2" outlineWidthM="0.3,mm" anchorPoint="8" opacity="1" svgFillColor="255,255,255,255" zValue="5" itemRotation="0" northOffset="0" positionOnPage="243.098,175.353,mm" background="false" id="" type="65640" excludeFromExports="0" pictureRotation="0" position="243.098,175.353,mm" blendMode="0" resizeMode="0" referencePoint="0" frame="false" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" mapUuid="" visibility="1" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" positionLock="true" groupUuid="" frameJoinStyle="miter" pictureWidth="49.3143" northMode="0" size="49.3143,29.8354,mm" pictureHeight="28.8527">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" file="../Gun_Run_Logo.png" groupUuid="" pictureWidth="49.3143" pictureRotation="0" svgBorderWidth="0.2" blendMode="0" svgBorderColor="0,0,0,255" pictureHeight="28.8527" northOffset="0" itemRotation="0" svgFillColor="255,255,255,255" type="65640" id="" zValue="5" mapUuid="" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" referencePoint="0" anchorPoint="8" northMode="0" background="false" position="243.098,175.353,mm" resizeMode="0" positionOnPage="243.098,175.353,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="49.3143,29.8354,mm" positionLock="true" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value=""/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" shapeType="1" zValue="4" itemRotation="0" positionOnPage="6.91779,197.79,mm" background="false" id="" type="65643" excludeFromExports="0" position="6.91779,197.79,mm" blendMode="0" referencePoint="0" frame="false" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" visibility="1" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" positionLock="true" groupUuid="" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" size="232.01,0.14328,mm">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" groupUuid="" blendMode="0" itemRotation="0" type="65643" id="" zValue="4" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" referencePoint="0" background="false" position="6.91779,197.79,mm" cornerRadiusMeasure="0,mm" positionOnPage="6.91779,197.79,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" shapeType="1" size="232.01,0.14328,mm" positionLock="true" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-          <layer enabled="1" pass="0" class="SimpleFill" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol type="fill" name="" force_rhr="0" clip_to_extent="1" alpha="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="color" v="0,0,0,255"/>
+            <prop k="joinstyle" v="miter"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="solid"/>
+            <prop k="outline_width" v="0.3"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem outlineWidth="0.2" segmentMillimeters="33.1642" position="6.76779,2.8482,mm" visibility="1" blendMode="0" maxBarWidth="100" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" height="2" itemRotation="0" background="false" size="112.219,15.8378,mm" lineJoinStyle="round" labelBarSpace="1" frame="false" lineCapStyle="square" numUnitsPerSegment="600" outlineWidthM="0.3,mm" opacity="1" style="Double Box" minBarWidth="25" id="" referencePoint="0" groupUuid="" unitType="meters" numMapUnitsPerScaleBarUnit="1" positionLock="true" numSegmentsLeft="2" numSegments="2" alignment="0" type="65646" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" boxContentSpace="0.2" excludeFromExports="0" segmentSizeMode="1" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" zValue="3" unitLabel="m" positionOnPage="6.76779,2.8482,mm" frameJoinStyle="miter">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem numSegmentsLeft="2" id="" blendMode="0" outlineWidthM="0.3,mm" minBarWidth="25" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" frameJoinStyle="miter" visibility="1" boxContentSpace="0.2" segmentMillimeters="33.1642" positionLock="true" opacity="1" excludeFromExports="0" zValue="3" numMapUnitsPerScaleBarUnit="1" position="6.76779,2.8482,mm" positionOnPage="6.76779,2.8482,mm" lineJoinStyle="round" numSegments="2" numUnitsPerSegment="600" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" type="65646" background="false" segmentSizeMode="1" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" labelBarSpace="1" size="112.219,15.8378,mm" groupUuid="" unitLabel="m" style="Double Box" referencePoint="0" unitType="meters" maxBarWidth="100" lineCapStyle="square" itemRotation="0" frame="false" alignment="0" height="2" outlineWidth="0.2">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <text-style fontUnderline="0" fontCapitals="0" fontItalic="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" textColor="0,0,0,255" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" blendMode="0" fontWeight="50" fontSize="12" fontLetterSpacing="0" multilineHeight="1">
-          <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-          <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeJoinStyle="64" shapeRadiiY="0" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+        <text-style fontSize="12" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontWeight="50" fontStrikeout="0" textOpacity="1" fontSizeUnit="Point" blendMode="0" fontWordSpacing="0" fontFamily="Myriad Pro" textColor="0,0,0,255" fontCapitals="0" fontItalic="0" multilineHeight="1" fontLetterSpacing="0" namedStyle="">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferSize="1" bufferSizeUnits="MM" bufferBlendMode="0" bufferDraw="0" bufferOpacity="1" bufferColor="255,255,255,255"/>
+          <background shapeOffsetX="0" shapeSVGFile="" shapeSizeType="0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeX="0" shapeRotation="0" shapeRadiiUnit="MM" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeOpacity="1" shapeBorderWidthUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeType="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeBorderWidth="0"/>
+          <shadow shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowUnder="0" shadowBlendMode="6"/>
         </text-style>
-        <fillColor red="0" green="0" alpha="255" blue="0"/>
-        <fillColor2 red="255" green="255" alpha="255" blue="255"/>
-        <strokeColor red="0" green="0" alpha="255" blue="0"/>
+        <fillColor red="0" green="0" blue="0" alpha="255"/>
+        <fillColor2 red="255" green="255" blue="255" alpha="255"/>
+        <strokeColor red="0" green="0" blue="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem splitLayer="0" rasterBorderColor="0,0,0,255" position="9.94906,16.8614,mm" visibility="1" blendMode="0" rasterBorderWidth="0" itemRotation="0" background="true" legendFilterByAtlas="0" size="38.1563,54.9504,mm" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" wmsLegendWidth="50" columnSpace="2" frame="true" symbolAlignment="1" outlineWidthM="0.3,mm" opacity="1" symbolWidth="7" symbolHeight="4" boxSpace="2" resizeToContents="0" rasterBorder="1" id="" wrapChar="" referencePoint="0" equalColumnWidth="1" groupUuid="" columnCount="1" positionLock="false" fontColor="#000000" type="65642" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" excludeFromExports="0" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" lineSpacing="1" zValue="2" titleAlignment="1" title="" wmsLegendHeight="25" positionOnPage="9.94906,16.8614,mm" frameJoinStyle="miter">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem id="" fontColor="#000000" blendMode="0" columnSpace="2" outlineWidthM="0.3,mm" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" frameJoinStyle="miter" lineSpacing="1" visibility="1" wrapChar="" positionLock="false" symbolWidth="7" columnCount="1" rasterBorderColor="0,0,0,255" resizeToContents="0" wmsLegendWidth="50" opacity="1" rasterBorderWidth="0" excludeFromExports="0" zValue="2" title="" boxSpace="2" position="9.94906,16.8614,mm" positionOnPage="9.94906,16.8614,mm" titleAlignment="1" type="65642" background="true" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" rasterBorder="1" symbolHeight="4" legendFilterByAtlas="0" size="38.1563,54.9504,mm" groupUuid="" wmsLegendHeight="25" symbolAlignment="1" referencePoint="0" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" equalColumnWidth="1" splitLayer="0" itemRotation="0" frame="true">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
@@ -15108,138 +15089,138 @@ def my_form_open(dialog, layer, feature):
           <style name="title" alignment="1">
             <styleFont style="Bold" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold"/>
           </style>
-          <style name="group" marginTop="3" alignment="1">
+          <style marginTop="3" name="group" alignment="1">
             <styleFont style="Semibold" description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
-          <style name="subgroup" marginTop="3" alignment="1">
+          <style marginTop="3" name="subgroup" alignment="1">
             <styleFont style="Semibold" description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
-          <style name="symbol" marginTop="2.5" alignment="1">
+          <style marginTop="2.5" name="symbol" alignment="1">
             <styleFont style="" description="Myriad Pro,9,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style name="symbolLabel" marginLeft="2" marginTop="2" alignment="1">
+          <style marginTop="2" name="symbolLabel" alignment="1" marginLeft="2">
             <styleFont style="Regular" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties/>
-          <layer-tree-group name="Fencing and Cones" checked="Qt::Checked" expanded="1">
+          <layer-tree-group checked="Qt::Checked" expanded="1" name="Fencing and Cones">
             <customproperties/>
-            <layer-tree-layer name="fencing" checked="Qt::Checked" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" expanded="1" source="./fencing.shp|layername=fencing">
+            <layer-tree-layer checked="Qt::Checked" expanded="1" name="fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" source="./fencing.shp|layername=fencing" providerKey="ogr">
               <customproperties>
-                <property value="0,1,2" key="legend/node-order"/>
-                <property value="hidden" key="legend/title-style"/>
+                <property key="legend/node-order" value="0,1,2"/>
+                <property key="legend/title-style" value="hidden"/>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group name="Routes" checked="Qt::Checked" expanded="1">
+          <layer-tree-group checked="Qt::Checked" expanded="1" name="Routes">
             <customproperties/>
-            <layer-tree-layer name="all_routes" checked="Qt::Checked" id="all_routes20170907054841602" providerKey="ogr" expanded="1" source="./all_routes.shp">
+            <layer-tree-layer checked="Qt::Checked" expanded="1" name="all_routes" id="all_routes20170907054841602" source="./all_routes.shp" providerKey="ogr">
               <customproperties>
-                <property value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" key="expandedLegendNodes"/>
-                <property value="1,2,3" key="legend/node-order"/>
-                <property value="hidden" key="legend/title-style"/>
-                <property value="1" key="overview"/>
-                <property value="0" key="showFeatureCount"/>
+                <property key="expandedLegendNodes" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
+                <property key="legend/node-order" value="1,2,3"/>
+                <property key="legend/title-style" value="hidden"/>
+                <property key="overview" value="1"/>
+                <property key="showFeatureCount" value="0"/>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem followPreset="true" outlineWidthM="0.3,mm" opacity="0.9" keepLayerSet="false" zValue="1" itemRotation="0" mapFlags="0" positionOnPage="6.76779,9.35102,mm" background="false" id="" type="65639" excludeFromExports="0" position="6.76779,9.35102,mm" blendMode="0" referencePoint="0" frame="false" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" visibility="1" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" positionLock="true" groupUuid="" frameJoinStyle="miter" mapRotation="0" labelMargin="0,mm" drawCanvasItems="false" size="283.418,180.92,mm" followPresetName="Fencing">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" mapRotation="0" keepLayerSet="false" followPresetName="Fencing" groupUuid="" blendMode="0" mapFlags="0" itemRotation="0" type="65639" id="" zValue="1" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" referencePoint="0" drawCanvasItems="false" followPreset="true" background="false" position="6.76779,9.35102,mm" labelMargin="0,mm" positionOnPage="6.76779,9.35102,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="283.418,180.92,mm" positionLock="true" opacity="0.9">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapRotation" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="transformer" type="Map">
-                    <Option name="d" type="Map">
-                      <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 type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapRotation">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value=""/>
+                  <Option type="Map" name="transformer">
+                    <Option type="Map" name="d">
+                      <Option type="double" name="exponent" value="1"/>
+                      <Option type="double" name="maxOutput" value="360"/>
+                      <Option type="double" name="maxValue" value="0"/>
+                      <Option type="double" name="minOutput" value="0"/>
+                      <Option type="double" name="minValue" value="0"/>
+                      <Option type="double" name="nullOutput" value="0"/>
                     </Option>
-                    <Option name="t" value="0" type="int"/>
+                    <Option type="int" name="t" value="0"/>
                   </Option>
-                  <Option name="type" value="3" type="int"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedRotation" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="field" value="angle" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                <Option type="Map" name="dataDefinedRotation">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="field" value="angle"/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmax="18.40911192436379196" ymax="-33.91548345873710701" ymin="-33.95089278916222497" xmin="18.35364178617763997"/>
+        <Extent ymin="-33.95089278916222497" ymax="-33.91548345873710701" xmax="18.40911192436379196" xmin="18.35364178617763997"/>
         <LayerSet/>
-        <ComposerMapGrid leftAnnotationPosition="1" topAnnotationDirection="0" name="Grid 1" unit="1" gridFrameMargin="0" topFrameDivisions="0" offsetY="0" leftFrameDivisions="0" position="3" annotationPrecision="3" blendMode="0" bottomAnnotationDirection="0" rightAnnotationDisplay="3" frameAnnotationDistance="1" rightAnnotationPosition="1" frameFillColor2="0,0,0,255" showAnnotation="0" gridFramePenThickness="0.5" gridFrameStyle="0" bottomAnnotationDisplay="3" topAnnotationDisplay="3" show="0" gridStyle="0" annotationFontColor="0,0,0,255" crossLength="3" offsetX="0" rightAnnotationDirection="0" intervalY="5" frameFillColor1="255,255,255,255" leftAnnotationDisplay="3" leftAnnotationDirection="0" gridFramePenColor="0,0,0,255" intervalX="5" rightFrameDivisions="0" annotationExpression="" gridFrameWidth="2" bottomAnnotationPosition="1" gridFrameSideFlags="15" annotationFormat="4" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" bottomFrameDivisions="0" topAnnotationPosition="1">
+        <ComposerMapGrid annotationPrecision="3" annotationExpression="" annotationFormat="4" gridFramePenThickness="0.5" rightAnnotationDisplay="3" unit="1" topAnnotationDisplay="3" annotationFontColor="0,0,0,255" blendMode="0" leftAnnotationDisplay="3" topAnnotationPosition="1" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" frameAnnotationDistance="1" intervalX="5" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" show="0" frameFillColor2="0,0,0,255" gridFrameSideFlags="15" position="3" bottomFrameDivisions="0" name="Grid 1" showAnnotation="0" leftAnnotationDirection="0" leftFrameDivisions="0" leftAnnotationPosition="1" intervalY="5" rightAnnotationDirection="0" rightAnnotationPosition="1" gridFrameMargin="0" crossLength="3" bottomAnnotationDirection="0" topFrameDivisions="0" bottomAnnotationDisplay="3" bottomAnnotationPosition="1" gridFrameStyle="0" rightFrameDivisions="0" offsetX="0" offsetY="0" frameFillColor1="255,255,255,255" gridFrameWidth="2" gridStyle="0">
           <lineStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-              <layer enabled="1" pass="0" class="SimpleLine" locked="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="195,195,195,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" 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"/>
+            <symbol type="line" name="" force_rhr="0" clip_to_extent="1" alpha="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="195,195,195,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-              <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol type="marker" name="" force_rhr="0" clip_to_extent="1" alpha="1">
+              <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -15261,84 +15242,84 @@ def my_form_open(dialog, layer, feature):
         <labelBlockingItems/>
       </LayoutItem>
       <customproperties>
-        <property value="png" key="atlasRasterFormat"/>
-        <property value="0" key="forceVector"/>
-        <property value="0" key="pdfDisableRasterTiles"/>
-        <property value="1" key="pdfIncludeMetadata"/>
-        <property value="0" key="pdfTextFormat"/>
-        <property value="true" key="rasterize"/>
+        <property key="atlasRasterFormat" value="png"/>
+        <property key="forceVector" value="0"/>
+        <property key="pdfDisableRasterTiles" value="0"/>
+        <property key="pdfIncludeMetadata" value="1"/>
+        <property key="pdfTextFormat" value="0"/>
+        <property key="rasterize" value="true"/>
       </customproperties>
-      <Atlas coverageLayer="fence_groups_f376bd8f_41c6_452b_8e99_04d721ae7517" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20fencing%20GROUP%20BY%20%22group%22" pageNameExpression="&quot;name&quot;" enabled="1" sortAscending="1" coverageLayerProvider="virtual" coverageLayerName="fence_groups" filterFeatures="0" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" sortKey="group" sortFeatures="1"/>
+      <Atlas coverageLayerName="fence_groups" hideCoverage="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20fencing%20GROUP%20BY%20%22group%22" coverageLayerProvider="virtual" sortFeatures="1" enabled="1" sortAscending="1" filterFeatures="0" filenamePattern="'output_'||@atlas_featurenumber" coverageLayer="fence_groups_f376bd8f_41c6_452b_8e99_04d721ae7517" pageNameExpression="&quot;name&quot;" sortKey="group"/>
     </Layout>
-    <Layout name="Access Roads" worldFileMap="" units="mm" printResolution="192">
-      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
-      <Grid resolution="10" offsetY="0" resUnits="mm" offsetUnits="mm" offsetX="0"/>
+    <Layout name="Access Roads" printResolution="192" units="mm" worldFileMap="">
+      <Snapper snapToItems="1" snapToGrid="0" tolerance="5" snapToGuides="1"/>
+      <Grid resUnits="mm" offsetY="0" offsetX="0" offsetUnits="mm" resolution="10"/>
       <PageCollection>
-        <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-          <layer enabled="1" pass="0" class="SimpleFill" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol type="fill" name="" force_rhr="0" clip_to_extent="1" alpha="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="color" v="255,255,255,255"/>
+            <prop k="joinstyle" v="miter"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="no"/>
+            <prop k="outline_width" v="0.26"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="0" itemRotation="0" positionOnPage="0,0,mm" background="true" id="" type="65638" excludeFromExports="0" position="0,0,mm" blendMode="0" referencePoint="0" frame="false" uuid="{e7a46ede-6ed1-40d7-9752-ba4364902d22}" visibility="1" templateUuid="{e7a46ede-6ed1-40d7-9752-ba4364902d22}" positionLock="false" groupUuid="" frameJoinStyle="miter" size="297,210,mm">
-          <FrameColor red="0" green="0" alpha="255" blue="0"/>
-          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+        <LayoutItem excludeFromExports="0" groupUuid="" blendMode="0" itemRotation="0" type="65638" id="" zValue="0" templateUuid="{e7a46ede-6ed1-40d7-9752-ba4364902d22}" uuid="{e7a46ede-6ed1-40d7-9752-ba4364902d22}" referencePoint="0" background="true" position="0,0,mm" positionOnPage="0,0,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="297,210,mm" positionLock="false" opacity="1">
+          <FrameColor red="0" green="0" blue="0" alpha="255"/>
+          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
           </LayoutObject>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide page="0" orientation="2" units="mm" position="0"/>
+          <Guide page="0" orientation="2" position="0" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="8" marginX="1" itemRotation="0" positionOnPage="8.71559,188.218,mm" background="false" id="" type="65641" excludeFromExports="0" position="8.71559,188.218,mm" blendMode="0" halign="1" referencePoint="0" frame="false" uuid="{01e42ab4-6e28-4fb2-b1a1-06b256ff505b}" valign="64" visibility="1" templateUuid="{01e42ab4-6e28-4fb2-b1a1-06b256ff505b}" positionLock="true" marginY="1" groupUuid="" labelText="ACCESS ROADS FOR RESIDENTS" frameJoinStyle="miter" size="110.769,6.8714,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" htmlState="0" groupUuid="" blendMode="0" itemRotation="0" type="65641" id="" halign="1" zValue="8" templateUuid="{01e42ab4-6e28-4fb2-b1a1-06b256ff505b}" uuid="{01e42ab4-6e28-4fb2-b1a1-06b256ff505b}" labelText="ACCESS ROADS FOR RESIDENTS" valign="64" referencePoint="0" background="false" position="8.71559,188.218,mm" marginX="1" positionOnPage="8.71559,188.218,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="110.769,6.8714,mm" positionLock="true" marginY="1" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor red="0" green="0" blue="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem splitLayer="0" rasterBorderColor="0,0,0,255" position="249.711,156.015,mm" visibility="1" blendMode="0" rasterBorderWidth="0" itemRotation="0" background="true" legendFilterByAtlas="0" size="34.45,8.3,mm" map_uuid="{6abeaf6e-4f52-413a-a7ff-23ce2850a84c}" wmsLegendWidth="50" columnSpace="2" frame="true" symbolAlignment="1" outlineWidthM="0.3,mm" opacity="1" symbolWidth="7" symbolHeight="4" boxSpace="2" resizeToContents="1" rasterBorder="1" id="" wrapChar="" referencePoint="0" equalColumnWidth="0" groupUuid="" columnCount="1" positionLock="true" fontColor="#000000" type="65642" uuid="{ef1ab7a2-aa35-40d9-a9c1-feff185d19f4}" excludeFromExports="0" templateUuid="{ef1ab7a2-aa35-40d9-a9c1-feff185d19f4}" lineSpacing="1" zValue="8" titleAlignment="1" title="" wmsLegendHeight="25" positionOnPage="249.711,156.015,mm" frameJoinStyle="miter">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="185" blue="255"/>
+      <LayoutItem id="" fontColor="#000000" blendMode="0" columnSpace="2" outlineWidthM="0.3,mm" uuid="{ef1ab7a2-aa35-40d9-a9c1-feff185d19f4}" frameJoinStyle="miter" lineSpacing="1" visibility="1" wrapChar="" positionLock="true" symbolWidth="7" columnCount="1" rasterBorderColor="0,0,0,255" resizeToContents="1" wmsLegendWidth="50" opacity="1" rasterBorderWidth="0" excludeFromExports="0" zValue="8" title="" boxSpace="2" position="249.711,156.015,mm" positionOnPage="249.711,156.015,mm" titleAlignment="1" type="65642" background="true" templateUuid="{ef1ab7a2-aa35-40d9-a9c1-feff185d19f4}" rasterBorder="1" symbolHeight="4" legendFilterByAtlas="0" size="34.45,8.3,mm" groupUuid="" wmsLegendHeight="25" symbolAlignment="1" referencePoint="0" map_uuid="{6abeaf6e-4f52-413a-a7ff-23ce2850a84c}" equalColumnWidth="0" splitLayer="0" itemRotation="0" frame="true">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="185"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
@@ -15347,165 +15328,165 @@ def my_form_open(dialog, layer, feature):
           <style name="title" alignment="1">
             <styleFont style="Semibold" description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
-          <style name="group" marginTop="3" alignment="1">
+          <style marginTop="3" name="group" alignment="1">
             <styleFont style="Semibold" description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
-          <style name="subgroup" marginTop="3" alignment="1">
+          <style marginTop="3" name="subgroup" alignment="1">
             <styleFont style="Semibold" description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
-          <style name="symbol" marginTop="2.5" alignment="1">
+          <style marginTop="2.5" name="symbol" alignment="1">
             <styleFont style="" description="Myriad Pro,9,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style name="symbolLabel" marginLeft="2" marginTop="2" alignment="1">
+          <style marginTop="2" name="symbolLabel" alignment="1" marginLeft="2">
             <styleFont style="Regular" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties/>
-          <layer-tree-group name="Residents Access" checked="Qt::Checked" expanded="1">
+          <layer-tree-group checked="Qt::Checked" expanded="1" name="Residents Access">
             <customproperties/>
-            <layer-tree-layer name="residents_access_roads" checked="Qt::Checked" id="residents_access_roads_a7a1b453_729e_4ac7_bb64_95381b84aa35" expanded="1">
+            <layer-tree-layer checked="Qt::Checked" expanded="1" name="residents_access_roads" id="residents_access_roads_a7a1b453_729e_4ac7_bb64_95381b84aa35">
               <customproperties>
-                <property value="hidden" key="legend/title-style"/>
+                <property key="legend/title-style" value="hidden"/>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="6" marginX="1" itemRotation="0" positionOnPage="221.927,188.418,mm" background="false" id="" type="65641" excludeFromExports="0" position="221.927,188.418,mm" blendMode="0" halign="2" referencePoint="0" frame="false" uuid="{8ccb6d0c-ddd6-4cad-aadd-4083b1b576f7}" valign="32" visibility="1" templateUuid="{8ccb6d0c-ddd6-4cad-aadd-4083b1b576f7}" positionLock="true" marginY="1" groupUuid="" labelText="REVISION 1.0" frameJoinStyle="miter" size="27.7839,6.8714,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" htmlState="0" groupUuid="" blendMode="0" itemRotation="0" type="65641" id="" halign="2" zValue="6" templateUuid="{8ccb6d0c-ddd6-4cad-aadd-4083b1b576f7}" uuid="{8ccb6d0c-ddd6-4cad-aadd-4083b1b576f7}" labelText="REVISION 1.0" valign="32" referencePoint="0" background="false" position="221.927,188.418,mm" marginX="1" positionOnPage="221.927,188.418,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="27.7839,6.8714,mm" positionLock="true" marginY="1" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor red="0" green="0" blue="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="5" marginX="1" itemRotation="0" positionOnPage="198.04,195.289,mm" background="false" id="" type="65641" excludeFromExports="0" position="198.04,195.289,mm" blendMode="0" halign="2" referencePoint="0" frame="false" uuid="{3bbaa5f9-89ac-48d3-a353-2300ae2ee77a}" valign="64" visibility="1" templateUuid="{3bbaa5f9-89ac-48d3-a353-2300ae2ee77a}" positionLock="true" marginY="1" groupUuid="" labelText="Sunday, 20 October 2019" frameJoinStyle="miter" size="51.6706,6.60801,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" htmlState="0" groupUuid="" blendMode="0" itemRotation="0" type="65641" id="" halign="2" zValue="5" templateUuid="{3bbaa5f9-89ac-48d3-a353-2300ae2ee77a}" uuid="{3bbaa5f9-89ac-48d3-a353-2300ae2ee77a}" labelText="Sunday, 20 October 2019" valign="64" referencePoint="0" background="false" position="198.04,195.289,mm" marginX="1" positionOnPage="198.04,195.289,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="51.6706,6.60801,mm" positionLock="true" marginY="1" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor red="0" green="0" blue="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem svgBorderColor="0,0,0,255" file="../Gun_Run_Logo_2018.png" svgBorderWidth="0.2" outlineWidthM="0.3,mm" anchorPoint="4" opacity="1" svgFillColor="255,255,255,255" zValue="4" itemRotation="0" northOffset="0" positionOnPage="258.483,187.425,mm" background="false" id="" type="65640" excludeFromExports="0" pictureRotation="0" position="258.483,187.425,mm" blendMode="0" resizeMode="0" referencePoint="0" frame="false" uuid="{2cfcbf86-f98d-4d23-aa32-aeea01173940}" mapUuid="" visibility="1" templateUuid="{2cfcbf86-f98d-4d23-aa32-aeea01173940}" positionLock="true" groupUuid="" frameJoinStyle="miter" pictureWidth="17.3653" northMode="0" size="29.7523,17.4718,mm" pictureHeight="17.4718">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" file="../Gun_Run_Logo_2018.png" groupUuid="" pictureWidth="17.3653" pictureRotation="0" svgBorderWidth="0.2" blendMode="0" svgBorderColor="0,0,0,255" pictureHeight="17.4718" northOffset="0" itemRotation="0" svgFillColor="255,255,255,255" type="65640" id="" zValue="4" mapUuid="" templateUuid="{2cfcbf86-f98d-4d23-aa32-aeea01173940}" uuid="{2cfcbf86-f98d-4d23-aa32-aeea01173940}" referencePoint="0" anchorPoint="4" northMode="0" background="false" position="258.483,187.425,mm" resizeMode="0" positionOnPage="258.483,187.425,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="29.7523,17.4718,mm" positionLock="true" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value=""/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" shapeType="1" zValue="3" itemRotation="0" positionOnPage="8.86559,195.239,mm" background="false" id="" type="65643" excludeFromExports="0" position="8.86559,195.239,mm" blendMode="0" referencePoint="0" frame="false" uuid="{7a78f7dc-95f1-4b1c-a72d-cb0ca03341de}" visibility="1" templateUuid="{7a78f7dc-95f1-4b1c-a72d-cb0ca03341de}" positionLock="true" groupUuid="" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" size="240.695,0.1,mm">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" groupUuid="" blendMode="0" itemRotation="0" type="65643" id="" zValue="3" templateUuid="{7a78f7dc-95f1-4b1c-a72d-cb0ca03341de}" uuid="{7a78f7dc-95f1-4b1c-a72d-cb0ca03341de}" referencePoint="0" background="false" position="8.86559,195.239,mm" cornerRadiusMeasure="0,mm" positionOnPage="8.86559,195.239,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" shapeType="1" size="240.695,0.1,mm" positionLock="true" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-          <layer enabled="1" pass="0" class="SimpleFill" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol type="fill" name="" force_rhr="0" clip_to_extent="1" alpha="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="color" v="0,0,0,255"/>
+            <prop k="joinstyle" v="miter"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="solid"/>
+            <prop k="outline_width" v="0.3"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem followPreset="true" outlineWidthM="0.3,mm" opacity="1" keepLayerSet="false" zValue="2" itemRotation="0" mapFlags="0" positionOnPage="8.86559,6.09761,mm" background="false" id="" type="65639" excludeFromExports="0" position="8.86559,6.09761,mm" blendMode="0" referencePoint="0" frame="true" uuid="{6abeaf6e-4f52-413a-a7ff-23ce2850a84c}" visibility="1" templateUuid="{6abeaf6e-4f52-413a-a7ff-23ce2850a84c}" positionLock="true" groupUuid="" frameJoinStyle="miter" mapRotation="0" labelMargin="0,mm" drawCanvasItems="false" size="67.7828,163.668,mm" followPresetName="Access Routes">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" mapRotation="0" keepLayerSet="false" followPresetName="Access Routes" groupUuid="" blendMode="0" mapFlags="0" itemRotation="0" type="65639" id="" zValue="2" templateUuid="{6abeaf6e-4f52-413a-a7ff-23ce2850a84c}" uuid="{6abeaf6e-4f52-413a-a7ff-23ce2850a84c}" referencePoint="0" drawCanvasItems="false" followPreset="true" background="false" position="8.86559,6.09761,mm" labelMargin="0,mm" positionOnPage="8.86559,6.09761,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="true" size="67.7828,163.668,mm" positionLock="true" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="type" value="1" type="int"/>
-                  <Option name="val" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="int" name="type" value="1"/>
+                  <Option type="QString" name="val" value=""/>
                 </Option>
-                <Option name="dataDefinedMapXMax" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="type" value="1" type="int"/>
-                  <Option name="val" value="" type="QString"/>
+                <Option type="Map" name="dataDefinedMapXMax">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="int" name="type" value="1"/>
+                  <Option type="QString" name="val" value=""/>
                 </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="type" value="1" type="int"/>
-                  <Option name="val" value="" type="QString"/>
+                <Option type="Map" name="dataDefinedMapXMin">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="int" name="type" value="1"/>
+                  <Option type="QString" name="val" value=""/>
                 </Option>
-                <Option name="dataDefinedMapYMax" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="type" value="1" type="int"/>
-                  <Option name="val" value="" type="QString"/>
+                <Option type="Map" name="dataDefinedMapYMax">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="int" name="type" value="1"/>
+                  <Option type="QString" name="val" value=""/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="type" value="1" type="int"/>
-                  <Option name="val" value="" type="QString"/>
+                <Option type="Map" name="dataDefinedMapYMin">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="int" name="type" value="1"/>
+                  <Option type="QString" name="val" value=""/>
                 </Option>
-                <Option name="dataDefinedOpacity" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="type" value="1" type="int"/>
-                  <Option name="val" value="" type="QString"/>
+                <Option type="Map" name="dataDefinedOpacity">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="int" name="type" value="1"/>
+                  <Option type="QString" name="val" value=""/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmax="2046661.64490731596015394" ymax="-4017906.13508340576663613" ymin="-4021465.24033112963661551" xmin="2045187.64490581233985722"/>
+        <Extent ymin="-4021465.24033112963661551" ymax="-4017906.13508340576663613" xmax="2046661.64490731596015394" xmin="2045187.64490581233985722"/>
         <crs>
           <spatialrefsys>
             <proj4>+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs</proj4>
@@ -15519,62 +15500,62 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid leftAnnotationPosition="1" topAnnotationDirection="0" name="Grid 1" unit="0" gridFrameMargin="0" topFrameDivisions="0" offsetY="0" leftFrameDivisions="0" position="3" annotationPrecision="3" blendMode="0" bottomAnnotationDirection="0" rightAnnotationDisplay="0" frameAnnotationDistance="1" rightAnnotationPosition="1" frameFillColor2="0,0,0,255" showAnnotation="0" gridFramePenThickness="0.5" gridFrameStyle="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" show="0" gridStyle="0" annotationFontColor="0,0,0,255" crossLength="3" offsetX="0" rightAnnotationDirection="0" intervalY="0" frameFillColor1="255,255,255,255" leftAnnotationDisplay="0" leftAnnotationDirection="0" gridFramePenColor="0,0,0,255" intervalX="0" rightFrameDivisions="0" annotationExpression="" gridFrameWidth="2" bottomAnnotationPosition="1" gridFrameSideFlags="15" annotationFormat="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" bottomFrameDivisions="0" topAnnotationPosition="1">
+        <ComposerMapGrid annotationPrecision="3" annotationExpression="" annotationFormat="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" unit="0" topAnnotationDisplay="0" annotationFontColor="0,0,0,255" blendMode="0" leftAnnotationDisplay="0" topAnnotationPosition="1" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" frameAnnotationDistance="1" intervalX="0" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" show="0" frameFillColor2="0,0,0,255" gridFrameSideFlags="15" position="3" bottomFrameDivisions="0" name="Grid 1" showAnnotation="0" leftAnnotationDirection="0" leftFrameDivisions="0" leftAnnotationPosition="1" intervalY="0" rightAnnotationDirection="0" rightAnnotationPosition="1" gridFrameMargin="0" crossLength="3" bottomAnnotationDirection="0" topFrameDivisions="0" bottomAnnotationDisplay="0" bottomAnnotationPosition="1" gridFrameStyle="0" rightFrameDivisions="0" offsetX="0" offsetY="0" frameFillColor1="255,255,255,255" gridFrameWidth="2" gridStyle="0">
           <lineStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-              <layer enabled="1" pass="0" class="SimpleLine" locked="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" 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"/>
+            <symbol type="line" name="" force_rhr="0" clip_to_extent="1" alpha="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-              <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol type="marker" name="" force_rhr="0" clip_to_extent="1" alpha="1">
+              <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -15585,93 +15566,93 @@ def my_form_open(dialog, layer, feature):
         <AtlasMap atlasDriven="0" margin="0.05" scalingMode="2"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutItem followPreset="true" outlineWidthM="0.3,mm" opacity="1" keepLayerSet="false" zValue="1" itemRotation="0" mapFlags="0" positionOnPage="13.1173,10.4109,mm" background="true" id="" type="65639" excludeFromExports="0" position="13.1173,10.4109,mm" blendMode="0" referencePoint="0" frame="false" uuid="{e6d5cba2-adb8-4057-b9c6-f66d2bf54203}" visibility="1" templateUuid="{e6d5cba2-adb8-4057-b9c6-f66d2bf54203}" positionLock="true" groupUuid="" frameJoinStyle="miter" mapRotation="0" labelMargin="0,mm" drawCanvasItems="false" size="275.118,177.014,mm" followPresetName="Access Routes">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" mapRotation="0" keepLayerSet="false" followPresetName="Access Routes" groupUuid="" blendMode="0" mapFlags="0" itemRotation="0" type="65639" id="" zValue="1" templateUuid="{e6d5cba2-adb8-4057-b9c6-f66d2bf54203}" uuid="{e6d5cba2-adb8-4057-b9c6-f66d2bf54203}" referencePoint="0" drawCanvasItems="false" followPreset="true" background="true" position="13.1173,10.4109,mm" labelMargin="0,mm" positionOnPage="13.1173,10.4109,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="275.118,177.014,mm" positionLock="true" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '22000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18500'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '8000'&#xa;END" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '22000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18500'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '8000'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '2044839.118'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '2045355.615'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '2048192.807'&#xa;END" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMin">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '2044839.118'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '2045355.615'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '2048192.807'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-4018735.754'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-4018312.632'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-4016466.779'&#xa;END" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMin">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-4018735.754'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-4018312.632'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-4016466.779'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmax="2050675.64756914228200912" ymax="-4015136.43659120844677091" ymin="-4019029.07624835893511772" xmin="2044625.64756297133862972"/>
+        <Extent ymin="-4019029.07624835893511772" ymax="-4015136.43659120844677091" xmax="2050675.64756914228200912" xmin="2044625.64756297133862972"/>
         <LayerSet/>
-        <ComposerMapGrid leftAnnotationPosition="1" topAnnotationDirection="0" name="Grid 1" unit="0" gridFrameMargin="0" topFrameDivisions="0" offsetY="0" leftFrameDivisions="0" position="3" annotationPrecision="3" blendMode="0" bottomAnnotationDirection="0" rightAnnotationDisplay="0" frameAnnotationDistance="1" rightAnnotationPosition="1" frameFillColor2="0,0,0,255" showAnnotation="0" gridFramePenThickness="0.5" gridFrameStyle="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" show="0" gridStyle="0" annotationFontColor="0,0,0,255" crossLength="3" offsetX="0" rightAnnotationDirection="0" intervalY="0" frameFillColor1="255,255,255,255" leftAnnotationDisplay="0" leftAnnotationDirection="0" gridFramePenColor="0,0,0,255" intervalX="0" rightFrameDivisions="0" annotationExpression="" gridFrameWidth="2" bottomAnnotationPosition="1" gridFrameSideFlags="15" annotationFormat="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" bottomFrameDivisions="0" topAnnotationPosition="1">
+        <ComposerMapGrid annotationPrecision="3" annotationExpression="" annotationFormat="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" unit="0" topAnnotationDisplay="0" annotationFontColor="0,0,0,255" blendMode="0" leftAnnotationDisplay="0" topAnnotationPosition="1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" frameAnnotationDistance="1" intervalX="0" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" show="0" frameFillColor2="0,0,0,255" gridFrameSideFlags="15" position="3" bottomFrameDivisions="0" name="Grid 1" showAnnotation="0" leftAnnotationDirection="0" leftFrameDivisions="0" leftAnnotationPosition="1" intervalY="0" rightAnnotationDirection="0" rightAnnotationPosition="1" gridFrameMargin="0" crossLength="3" bottomAnnotationDirection="0" topFrameDivisions="0" bottomAnnotationDisplay="0" bottomAnnotationPosition="1" gridFrameStyle="0" rightFrameDivisions="0" offsetX="0" offsetY="0" frameFillColor1="255,255,255,255" gridFrameWidth="2" gridStyle="0">
           <lineStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-              <layer enabled="1" pass="0" class="SimpleLine" locked="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" 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"/>
+            <symbol type="line" name="" force_rhr="0" clip_to_extent="1" alpha="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-              <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol type="marker" name="" force_rhr="0" clip_to_extent="1" alpha="1">
+              <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -15683,102 +15664,102 @@ def my_form_open(dialog, layer, feature):
         <labelBlockingItems/>
       </LayoutItem>
       <customproperties>
-        <property value="png" key="atlasRasterFormat"/>
-        <property value="true" key="imageAntialias"/>
-        <property value="0" key="imageCropMarginBottom"/>
-        <property value="0" key="imageCropMarginLeft"/>
-        <property value="0" key="imageCropMarginRight"/>
-        <property value="0" key="imageCropMarginTop"/>
-        <property value="false" key="imageCropToContents"/>
-        <property value="false" key="singleFile"/>
+        <property key="atlasRasterFormat" value="png"/>
+        <property key="imageAntialias" value="true"/>
+        <property key="imageCropMarginBottom" value="0"/>
+        <property key="imageCropMarginLeft" value="0"/>
+        <property key="imageCropMarginRight" value="0"/>
+        <property key="imageCropMarginTop" value="0"/>
+        <property key="imageCropToContents" value="false"/>
+        <property key="singleFile" value="false"/>
       </customproperties>
-      <Atlas coverageLayer="" pageNameExpression="&quot;type&quot;" enabled="0" filterFeatures="0" hideCoverage="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" sortFeatures="0"/>
+      <Atlas hideCoverage="0" sortFeatures="0" enabled="0" filterFeatures="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayer="" pageNameExpression="&quot;type&quot;"/>
     </Layout>
-    <Layout name="Ask Me" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" units="mm" printResolution="192">
-      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
-      <Grid resolution="10" offsetY="0" resUnits="mm" offsetUnits="mm" offsetX="0"/>
+    <Layout name="Ask Me" printResolution="192" units="mm" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
+      <Snapper snapToItems="1" snapToGrid="0" tolerance="5" snapToGuides="1"/>
+      <Grid resUnits="mm" offsetY="0" offsetX="0" offsetUnits="mm" resolution="10"/>
       <PageCollection>
-        <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-          <layer enabled="1" pass="0" class="SimpleFill" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol type="fill" name="" force_rhr="0" clip_to_extent="1" alpha="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="color" v="255,255,255,255"/>
+            <prop k="joinstyle" v="miter"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="no"/>
+            <prop k="outline_width" v="0.26"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="0" itemRotation="0" positionOnPage="0,0,mm" background="true" id="" type="65638" excludeFromExports="0" position="0,0,mm" blendMode="0" referencePoint="0" frame="false" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" visibility="1" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" positionLock="false" groupUuid="" frameJoinStyle="miter" size="297,210,mm">
-          <FrameColor red="0" green="0" alpha="255" blue="0"/>
-          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+        <LayoutItem excludeFromExports="0" groupUuid="" blendMode="0" itemRotation="0" type="65638" id="" zValue="0" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" referencePoint="0" background="true" position="0,0,mm" positionOnPage="0,0,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="297,210,mm" positionLock="false" opacity="1">
+          <FrameColor red="0" green="0" blue="0" alpha="255"/>
+          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
           </LayoutObject>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide page="0" orientation="2" units="mm" position="0"/>
+          <Guide page="0" orientation="2" position="0" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="8" marginX="1" itemRotation="0" positionOnPage="7.9389,188.218,mm" background="false" id="" type="65641" excludeFromExports="0" position="7.9389,188.218,mm" blendMode="0" halign="1" referencePoint="0" frame="false" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" valign="64" visibility="1" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" positionLock="true" marginY="1" groupUuid="" labelText="Directions to Start of Race" frameJoinStyle="miter" size="83.9998,7.071,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" htmlState="0" groupUuid="" blendMode="0" itemRotation="0" type="65641" id="" halign="1" zValue="8" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" labelText="Directions to Start of Race" valign="64" referencePoint="0" background="false" position="7.9389,188.218,mm" marginX="1" positionOnPage="7.9389,188.218,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="83.9998,7.071,mm" positionLock="true" marginY="1" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="" description="Myriad Pro,12,-1,5,50,0,0,0,0,0"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor red="0" green="0" blue="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="7" marginX="1" itemRotation="0" positionOnPage="7.93888,195.489,mm" background="false" id="" type="65641" excludeFromExports="0" position="7.93888,195.489,mm" blendMode="0" halign="1" referencePoint="0" frame="false" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" valign="32" visibility="1" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" positionLock="true" marginY="1" groupUuid="" labelText="Gun Run" frameJoinStyle="miter" size="48.2923,6.60801,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" htmlState="0" groupUuid="" blendMode="0" itemRotation="0" type="65641" id="" halign="1" zValue="7" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" labelText="Gun Run" valign="32" referencePoint="0" background="false" position="7.93888,195.489,mm" marginX="1" positionOnPage="7.93888,195.489,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="48.2923,6.60801,mm" positionLock="true" marginY="1" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="" description="Myriad Pro,12,-1,5,50,0,0,0,0,0"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor red="0" green="0" blue="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem splitLayer="0" rasterBorderColor="0,0,0,255" position="10.096,10.8563,mm" visibility="1" blendMode="0" rasterBorderWidth="0" itemRotation="0" background="true" legendFilterByAtlas="0" size="53.2969,71,mm" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" wmsLegendWidth="50" columnSpace="2" frame="true" symbolAlignment="1" outlineWidthM="0.3,mm" opacity="1" symbolWidth="7" symbolHeight="4" boxSpace="2" resizeToContents="1" rasterBorder="1" id="" wrapChar="" referencePoint="0" equalColumnWidth="0" groupUuid="" columnCount="1" positionLock="true" fontColor="#000000" type="65642" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" excludeFromExports="0" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" lineSpacing="1" zValue="6" titleAlignment="1" title="" wmsLegendHeight="25" positionOnPage="10.096,10.8563,mm" frameJoinStyle="round">
-        <FrameColor red="139" green="139" alpha="255" blue="139"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem id="" fontColor="#000000" blendMode="0" columnSpace="2" outlineWidthM="0.3,mm" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" frameJoinStyle="round" lineSpacing="1" visibility="1" wrapChar="" positionLock="true" symbolWidth="7" columnCount="1" rasterBorderColor="0,0,0,255" resizeToContents="1" wmsLegendWidth="50" opacity="1" rasterBorderWidth="0" excludeFromExports="0" zValue="6" title="" boxSpace="2" position="10.096,10.8563,mm" positionOnPage="10.096,10.8563,mm" titleAlignment="1" type="65642" background="true" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" rasterBorder="1" symbolHeight="4" legendFilterByAtlas="0" size="53.2969,71,mm" groupUuid="" wmsLegendHeight="25" symbolAlignment="1" referencePoint="0" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" equalColumnWidth="0" splitLayer="0" itemRotation="0" frame="true">
+        <FrameColor red="139" green="139" blue="139" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
@@ -15787,223 +15768,223 @@ def my_form_open(dialog, layer, feature):
           <style name="title" alignment="1">
             <styleFont style="" description="Myriad Pro,16,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style name="group" marginTop="3" alignment="1">
+          <style marginTop="3" name="group" alignment="1">
             <styleFont style="" description="Myriad Pro,14,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style name="subgroup" marginTop="3" alignment="1">
+          <style marginTop="3" name="subgroup" alignment="1">
             <styleFont style="" description="Myriad Pro,12,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style name="symbol" marginTop="2.5" alignment="1">
+          <style marginTop="2.5" name="symbol" alignment="1">
             <styleFont style="" description="Myriad Pro,12,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style name="symbolLabel" marginLeft="2" marginTop="2" alignment="1">
+          <style marginTop="2" name="symbolLabel" alignment="1" marginLeft="2">
             <styleFont style="" description="Myriad Pro,12,-1,5,50,0,0,0,0,0"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties/>
-          <layer-tree-group name="Ask Me" checked="Qt::Checked" expanded="1">
+          <layer-tree-group checked="Qt::Checked" expanded="1" name="Ask Me">
             <customproperties>
-              <property value="hidden" key="legend/title-style"/>
+              <property key="legend/title-style" value="hidden"/>
             </customproperties>
-            <layer-tree-layer name="poi_labels" checked="Qt::Checked" id="poi_labels_59d3855d_466f_419c_8119_94b9ad7c140d" expanded="1">
+            <layer-tree-layer checked="Qt::Checked" expanded="1" name="poi_labels" id="poi_labels_59d3855d_466f_419c_8119_94b9ad7c140d">
               <customproperties>
-                <property value="Start/Finish" key="legend/label-0"/>
-                <property value="Toilets" key="legend/label-1"/>
-                <property value="Tog Bag Drop-off" key="legend/label-2"/>
-                <property value="Road Closed to Cars" key="legend/label-3"/>
-                <property value="MyCiti Drop-off" key="legend/label-4"/>
-                <property value="Parking" key="legend/label-5"/>
-                <property value="hidden" key="legend/title-style"/>
+                <property key="legend/label-0" value="Start/Finish"/>
+                <property key="legend/label-1" value="Toilets"/>
+                <property key="legend/label-2" value="Tog Bag Drop-off"/>
+                <property key="legend/label-3" value="Road Closed to Cars"/>
+                <property key="legend/label-4" value="MyCiti Drop-off"/>
+                <property key="legend/label-5" value="Parking"/>
+                <property key="legend/title-style" value="hidden"/>
               </customproperties>
             </layer-tree-layer>
-            <layer-tree-layer name="directions_to_start" checked="Qt::Checked" id="directions_to_start_cf338b4b_1403_45e8_b11f_47b48dd39657" expanded="1">
+            <layer-tree-layer checked="Qt::Checked" expanded="1" name="directions_to_start" id="directions_to_start_cf338b4b_1403_45e8_b11f_47b48dd39657">
               <customproperties>
-                <property value="To 21KM start (6:30AM)" key="legend/label-0"/>
-                <property value="To 10KM start (7:15AM)" key="legend/label-1"/>
-                <property value="To 5KM start   (8:30AM)" key="legend/label-2"/>
-                <property value="hidden" key="legend/title-style"/>
+                <property key="legend/label-0" value="To 21KM start (6:30AM)"/>
+                <property key="legend/label-1" value="To 10KM start (7:15AM)"/>
+                <property key="legend/label-2" value="To 5KM start   (8:30AM)"/>
+                <property key="legend/title-style" value="hidden"/>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="5" marginX="1" itemRotation="0" positionOnPage="228.202,188.218,mm" background="false" id="" type="65641" excludeFromExports="0" position="228.202,188.218,mm" blendMode="0" halign="2" referencePoint="0" frame="false" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" valign="32" visibility="1" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" positionLock="true" marginY="1" groupUuid="" labelText="REVISION 1.1" frameJoinStyle="miter" size="27.7839,6.8714,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" htmlState="0" groupUuid="" blendMode="0" itemRotation="0" type="65641" id="" halign="2" zValue="5" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" labelText="REVISION 1.1" valign="32" referencePoint="0" background="false" position="228.202,188.218,mm" marginX="1" positionOnPage="228.202,188.218,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="27.7839,6.8714,mm" positionLock="true" marginY="1" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor red="0" green="0" blue="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="4" marginX="1" itemRotation="0" positionOnPage="204.316,195.489,mm" background="false" id="" type="65641" excludeFromExports="0" position="204.316,195.489,mm" blendMode="0" halign="2" referencePoint="0" frame="false" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" valign="64" visibility="1" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" positionLock="true" marginY="1" groupUuid="" labelText="Sunday, 20 October 2019" frameJoinStyle="miter" size="51.6706,6.60801,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" htmlState="0" groupUuid="" blendMode="0" itemRotation="0" type="65641" id="" halign="2" zValue="4" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" labelText="Sunday, 20 October 2019" valign="64" referencePoint="0" background="false" position="204.316,195.489,mm" marginX="1" positionOnPage="204.316,195.489,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="51.6706,6.60801,mm" positionLock="true" marginY="1" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor red="0" green="0" blue="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem svgBorderColor="0,0,0,255" file="../Gun_Run_Logo_2018.png" svgBorderWidth="0.2" outlineWidthM="0.3,mm" anchorPoint="4" opacity="1" svgFillColor="255,255,255,255" zValue="3" itemRotation="0" northOffset="0" positionOnPage="258.483,187.425,mm" background="false" id="" type="65640" excludeFromExports="0" pictureRotation="0" position="258.483,187.425,mm" blendMode="0" resizeMode="0" referencePoint="0" frame="false" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" visibility="1" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" positionLock="true" groupUuid="" frameJoinStyle="miter" pictureWidth="17.3653" northMode="0" size="29.7523,17.4718,mm" pictureHeight="17.4718">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" file="../Gun_Run_Logo_2018.png" groupUuid="" pictureWidth="17.3653" pictureRotation="0" svgBorderWidth="0.2" blendMode="0" svgBorderColor="0,0,0,255" pictureHeight="17.4718" northOffset="0" itemRotation="0" svgFillColor="255,255,255,255" type="65640" id="" zValue="3" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" referencePoint="0" anchorPoint="4" northMode="0" background="false" position="258.483,187.425,mm" resizeMode="0" positionOnPage="258.483,187.425,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="29.7523,17.4718,mm" positionLock="true" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value=""/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" shapeType="1" zValue="2" itemRotation="0" positionOnPage="8.08888,195.239,mm" background="false" id="" type="65643" excludeFromExports="0" position="8.08888,195.239,mm" blendMode="0" referencePoint="0" frame="false" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" visibility="1" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" positionLock="true" groupUuid="" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" size="247.747,0.1,mm">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" groupUuid="" blendMode="0" itemRotation="0" type="65643" id="" zValue="2" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" referencePoint="0" background="false" position="8.08888,195.239,mm" cornerRadiusMeasure="0,mm" positionOnPage="8.08888,195.239,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" shapeType="1" size="247.747,0.1,mm" positionLock="true" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-          <layer enabled="1" pass="0" class="SimpleFill" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol type="fill" name="" force_rhr="0" clip_to_extent="1" alpha="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="color" v="0,0,0,255"/>
+            <prop k="joinstyle" v="miter"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="solid"/>
+            <prop k="outline_width" v="0.3"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem followPreset="true" outlineWidthM="0.3,mm" opacity="1" keepLayerSet="false" zValue="1" itemRotation="0" mapFlags="0" positionOnPage="7.93888,6.411,mm" background="true" id="" type="65639" excludeFromExports="0" position="7.93888,6.411,mm" blendMode="0" referencePoint="0" frame="false" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" visibility="1" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" positionLock="true" groupUuid="" frameJoinStyle="miter" mapRotation="0" labelMargin="0,mm" drawCanvasItems="false" size="280.297,177.014,mm" followPresetName="Ask Me">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" mapRotation="0" keepLayerSet="false" followPresetName="Ask Me" groupUuid="" blendMode="0" mapFlags="0" itemRotation="0" type="65639" id="" zValue="1" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" referencePoint="0" drawCanvasItems="false" followPreset="true" background="true" position="7.93888,6.411,mm" labelMargin="0,mm" positionOnPage="7.93888,6.411,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="280.297,177.014,mm" positionLock="true" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="type" value="1" type="int"/>
-                  <Option name="val" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="int" name="type" value="1"/>
+                  <Option type="QString" name="val" value=""/>
                 </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="type" value="1" type="int"/>
-                  <Option name="val" value="" type="QString"/>
+                <Option type="Map" name="dataDefinedMapXMin">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="int" name="type" value="1"/>
+                  <Option type="QString" name="val" value=""/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="type" value="1" type="int"/>
-                  <Option name="val" value="" type="QString"/>
+                <Option type="Map" name="dataDefinedMapYMin">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="int" name="type" value="1"/>
+                  <Option type="QString" name="val" value=""/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmax="2050144.97328941966407001" ymax="-4015152.22678980929777026" ymin="-4016655.25382941775023937" xmin="2047764.97328699217177927"/>
+        <Extent ymin="-4016655.25382941775023937" ymax="-4015152.22678980929777026" xmax="2050144.97328941966407001" xmin="2047764.97328699217177927"/>
         <LayerSet/>
-        <ComposerMapGrid leftAnnotationPosition="1" topAnnotationDirection="0" name="Grid 1" unit="0" gridFrameMargin="0" topFrameDivisions="0" offsetY="0" leftFrameDivisions="0" position="3" annotationPrecision="3" blendMode="0" bottomAnnotationDirection="0" rightAnnotationDisplay="0" frameAnnotationDistance="1" rightAnnotationPosition="1" frameFillColor2="0,0,0,255" showAnnotation="0" gridFramePenThickness="0.5" gridFrameStyle="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" show="0" gridStyle="0" annotationFontColor="0,0,0,255" crossLength="3" offsetX="0" rightAnnotationDirection="0" intervalY="0" frameFillColor1="255,255,255,255" leftAnnotationDisplay="0" leftAnnotationDirection="0" gridFramePenColor="0,0,0,255" intervalX="0" rightFrameDivisions="0" annotationExpression="" gridFrameWidth="2" bottomAnnotationPosition="1" gridFrameSideFlags="15" annotationFormat="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" bottomFrameDivisions="0" topAnnotationPosition="1">
+        <ComposerMapGrid annotationPrecision="3" annotationExpression="" annotationFormat="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" unit="0" topAnnotationDisplay="0" annotationFontColor="0,0,0,255" blendMode="0" leftAnnotationDisplay="0" topAnnotationPosition="1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" frameAnnotationDistance="1" intervalX="0" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" show="0" frameFillColor2="0,0,0,255" gridFrameSideFlags="15" position="3" bottomFrameDivisions="0" name="Grid 1" showAnnotation="0" leftAnnotationDirection="0" leftFrameDivisions="0" leftAnnotationPosition="1" intervalY="0" rightAnnotationDirection="0" rightAnnotationPosition="1" gridFrameMargin="0" crossLength="3" bottomAnnotationDirection="0" topFrameDivisions="0" bottomAnnotationDisplay="0" bottomAnnotationPosition="1" gridFrameStyle="0" rightFrameDivisions="0" offsetX="0" offsetY="0" frameFillColor1="255,255,255,255" gridFrameWidth="2" gridStyle="0">
           <lineStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-              <layer enabled="1" pass="0" class="SimpleLine" locked="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" 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"/>
+            <symbol type="line" name="" force_rhr="0" clip_to_extent="1" alpha="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-              <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol type="marker" name="" force_rhr="0" clip_to_extent="1" alpha="1">
+              <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -16015,102 +15996,102 @@ def my_form_open(dialog, layer, feature):
         <labelBlockingItems/>
       </LayoutItem>
       <customproperties>
-        <property value="png" key="atlasRasterFormat"/>
-        <property value="true" key="imageAntialias"/>
-        <property value="0" key="imageCropMarginBottom"/>
-        <property value="0" key="imageCropMarginLeft"/>
-        <property value="0" key="imageCropMarginRight"/>
-        <property value="0" key="imageCropMarginTop"/>
-        <property value="false" key="imageCropToContents"/>
-        <property value="true" key="singleFile"/>
+        <property key="atlasRasterFormat" value="png"/>
+        <property key="imageAntialias" value="true"/>
+        <property key="imageCropMarginBottom" value="0"/>
+        <property key="imageCropMarginLeft" value="0"/>
+        <property key="imageCropMarginRight" value="0"/>
+        <property key="imageCropMarginTop" value="0"/>
+        <property key="imageCropToContents" value="false"/>
+        <property key="singleFile" value="true"/>
       </customproperties>
-      <Atlas coverageLayer="" pageNameExpression="" enabled="0" filterFeatures="0" hideCoverage="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" sortFeatures="0"/>
+      <Atlas hideCoverage="0" sortFeatures="0" enabled="0" filterFeatures="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" coverageLayer="" pageNameExpression=""/>
     </Layout>
-    <Layout name="Start Directions A3" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" units="mm" printResolution="192">
-      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
-      <Grid resolution="10" offsetY="0" resUnits="mm" offsetUnits="mm" offsetX="0"/>
+    <Layout name="Start Directions A3" printResolution="192" units="mm" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
+      <Snapper snapToItems="1" snapToGrid="0" tolerance="5" snapToGuides="1"/>
+      <Grid resUnits="mm" offsetY="0" offsetX="0" offsetUnits="mm" resolution="10"/>
       <PageCollection>
-        <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-          <layer enabled="1" pass="0" class="SimpleFill" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol type="fill" name="" force_rhr="0" clip_to_extent="1" alpha="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="color" v="255,255,255,255"/>
+            <prop k="joinstyle" v="miter"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="no"/>
+            <prop k="outline_width" v="0.26"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="0" itemRotation="0" positionOnPage="0,0,mm" background="true" id="" type="65638" excludeFromExports="0" position="0,0,mm" blendMode="0" referencePoint="0" frame="false" uuid="{b28ffb1c-1d0f-4594-8e5b-4e48117a1c41}" visibility="1" templateUuid="{b28ffb1c-1d0f-4594-8e5b-4e48117a1c41}" positionLock="false" groupUuid="" frameJoinStyle="miter" size="420,297,mm">
-          <FrameColor red="0" green="0" alpha="255" blue="0"/>
-          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+        <LayoutItem excludeFromExports="0" groupUuid="" blendMode="0" itemRotation="0" type="65638" id="" zValue="0" templateUuid="{b28ffb1c-1d0f-4594-8e5b-4e48117a1c41}" uuid="{b28ffb1c-1d0f-4594-8e5b-4e48117a1c41}" referencePoint="0" background="true" position="0,0,mm" positionOnPage="0,0,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="420,297,mm" positionLock="false" opacity="1">
+          <FrameColor red="0" green="0" blue="0" alpha="255"/>
+          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
           </LayoutObject>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide page="0" orientation="2" units="mm" position="0"/>
+          <Guide page="0" orientation="2" position="0" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="8" marginX="1" itemRotation="0" positionOnPage="5.9389,269.29,mm" background="false" id="" type="65641" excludeFromExports="0" position="5.9389,269.29,mm" blendMode="0" halign="1" referencePoint="0" frame="false" uuid="{e4d6b258-f3b5-461f-8d86-a5f6db979e30}" valign="64" visibility="1" templateUuid="{e4d6b258-f3b5-461f-8d86-a5f6db979e30}" positionLock="true" marginY="1" groupUuid="" labelText="Directions to Start of Race" frameJoinStyle="miter" size="118.017,10.9992,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" htmlState="0" groupUuid="" blendMode="0" itemRotation="0" type="65641" id="" halign="1" zValue="8" templateUuid="{e4d6b258-f3b5-461f-8d86-a5f6db979e30}" uuid="{e4d6b258-f3b5-461f-8d86-a5f6db979e30}" labelText="Directions to Start of Race" valign="64" referencePoint="0" background="false" position="5.9389,269.29,mm" marginX="1" positionOnPage="5.9389,269.29,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="118.017,10.9992,mm" positionLock="true" marginY="1" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor red="0" green="0" blue="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="7" marginX="1" itemRotation="0" positionOnPage="5.93888,280.489,mm" background="false" id="" type="65641" excludeFromExports="0" position="5.93888,280.489,mm" blendMode="0" halign="1" referencePoint="0" frame="false" uuid="{6986ebd7-8029-45cc-88e5-77be3eb365d2}" valign="32" visibility="1" templateUuid="{6986ebd7-8029-45cc-88e5-77be3eb365d2}" positionLock="true" marginY="1" groupUuid="" labelText="Gun Run" frameJoinStyle="miter" size="118.017,9.4078,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" htmlState="0" groupUuid="" blendMode="0" itemRotation="0" type="65641" id="" halign="1" zValue="7" templateUuid="{6986ebd7-8029-45cc-88e5-77be3eb365d2}" uuid="{6986ebd7-8029-45cc-88e5-77be3eb365d2}" labelText="Gun Run" valign="32" referencePoint="0" background="false" position="5.93888,280.489,mm" marginX="1" positionOnPage="5.93888,280.489,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="118.017,9.4078,mm" positionLock="true" marginY="1" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor red="0" green="0" blue="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem splitLayer="0" rasterBorderColor="0,0,0,255" position="10.096,10.8563,mm" visibility="1" blendMode="0" rasterBorderWidth="0" itemRotation="0" background="true" legendFilterByAtlas="0" size="4,4,mm" map_uuid="{71033437-b2de-4b77-9244-4e66d0df0499}" wmsLegendWidth="50" columnSpace="2" frame="true" symbolAlignment="1" outlineWidthM="0.3,mm" opacity="1" symbolWidth="7" symbolHeight="4" boxSpace="2" resizeToContents="1" rasterBorder="1" id="" wrapChar="" referencePoint="0" equalColumnWidth="0" groupUuid="" columnCount="1" positionLock="true" fontColor="#000000" type="65642" uuid="{e5e363a7-db58-46d4-b7a1-7b81c03804fb}" excludeFromExports="0" templateUuid="{e5e363a7-db58-46d4-b7a1-7b81c03804fb}" lineSpacing="1" zValue="6" titleAlignment="1" title="" wmsLegendHeight="25" positionOnPage="10.096,10.8563,mm" frameJoinStyle="round">
-        <FrameColor red="139" green="139" alpha="255" blue="139"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem id="" fontColor="#000000" blendMode="0" columnSpace="2" outlineWidthM="0.3,mm" uuid="{e5e363a7-db58-46d4-b7a1-7b81c03804fb}" frameJoinStyle="round" lineSpacing="1" visibility="1" wrapChar="" positionLock="true" symbolWidth="7" columnCount="1" rasterBorderColor="0,0,0,255" resizeToContents="1" wmsLegendWidth="50" opacity="1" rasterBorderWidth="0" excludeFromExports="0" zValue="6" title="" boxSpace="2" position="10.096,10.8563,mm" positionOnPage="10.096,10.8563,mm" titleAlignment="1" type="65642" background="true" templateUuid="{e5e363a7-db58-46d4-b7a1-7b81c03804fb}" rasterBorder="1" symbolHeight="4" legendFilterByAtlas="0" size="4,4,mm" groupUuid="" wmsLegendHeight="25" symbolAlignment="1" referencePoint="0" map_uuid="{71033437-b2de-4b77-9244-4e66d0df0499}" equalColumnWidth="0" splitLayer="0" itemRotation="0" frame="true">
+        <FrameColor red="139" green="139" blue="139" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
@@ -16119,223 +16100,223 @@ def my_form_open(dialog, layer, feature):
           <style name="title" alignment="1">
             <styleFont style="" description="Myriad Pro,16,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style name="group" marginTop="3" alignment="1">
+          <style marginTop="3" name="group" alignment="1">
             <styleFont style="" description="Myriad Pro,14,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style name="subgroup" marginTop="3" alignment="1">
+          <style marginTop="3" name="subgroup" alignment="1">
             <styleFont style="" description="Myriad Pro,12,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style name="symbol" marginTop="2.5" alignment="1">
+          <style marginTop="2.5" name="symbol" alignment="1">
             <styleFont style="" description="Myriad Pro,12,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style name="symbolLabel" marginLeft="2" marginTop="2" alignment="1">
+          <style marginTop="2" name="symbolLabel" alignment="1" marginLeft="2">
             <styleFont style="Regular" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties/>
-          <layer-tree-group name="Ask Me" checked="Qt::Checked" expanded="1">
+          <layer-tree-group checked="Qt::Checked" expanded="1" name="Ask Me">
             <customproperties>
-              <property value="hidden" key="legend/title-style"/>
+              <property key="legend/title-style" value="hidden"/>
             </customproperties>
-            <layer-tree-layer name="poi_labels" checked="Qt::Checked" id="poi_labels_59d3855d_466f_419c_8119_94b9ad7c140d" expanded="1">
+            <layer-tree-layer checked="Qt::Checked" expanded="1" name="poi_labels" id="poi_labels_59d3855d_466f_419c_8119_94b9ad7c140d">
               <customproperties>
-                <property value="Start/Finish" key="legend/label-0"/>
-                <property value="Toilets" key="legend/label-1"/>
-                <property value="Tog Bag Drop-off" key="legend/label-2"/>
-                <property value="Road Closed to Cars" key="legend/label-3"/>
-                <property value="MyCiti Drop-off" key="legend/label-4"/>
-                <property value="Parking" key="legend/label-5"/>
-                <property value="hidden" key="legend/title-style"/>
+                <property key="legend/label-0" value="Start/Finish"/>
+                <property key="legend/label-1" value="Toilets"/>
+                <property key="legend/label-2" value="Tog Bag Drop-off"/>
+                <property key="legend/label-3" value="Road Closed to Cars"/>
+                <property key="legend/label-4" value="MyCiti Drop-off"/>
+                <property key="legend/label-5" value="Parking"/>
+                <property key="legend/title-style" value="hidden"/>
               </customproperties>
             </layer-tree-layer>
-            <layer-tree-layer name="directions_to_start" checked="Qt::Checked" id="directions_to_start_cf338b4b_1403_45e8_b11f_47b48dd39657" expanded="1">
+            <layer-tree-layer checked="Qt::Checked" expanded="1" name="directions_to_start" id="directions_to_start_cf338b4b_1403_45e8_b11f_47b48dd39657">
               <customproperties>
-                <property value="To 21KM start (6:30AM)" key="legend/label-0"/>
-                <property value="To 10KM start (7:15AM)" key="legend/label-1"/>
-                <property value="To 5KM start   (8:30AM)" key="legend/label-2"/>
-                <property value="hidden" key="legend/title-style"/>
+                <property key="legend/label-0" value="To 21KM start (6:30AM)"/>
+                <property key="legend/label-1" value="To 10KM start (7:15AM)"/>
+                <property key="legend/label-2" value="To 5KM start   (8:30AM)"/>
+                <property key="legend/title-style" value="hidden"/>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="5" marginX="1" itemRotation="0" positionOnPage="256.805,269.289,mm" background="false" id="" type="65641" excludeFromExports="0" position="256.805,269.289,mm" blendMode="0" halign="2" referencePoint="0" frame="false" uuid="{7d12afc8-4e59-4401-96ae-4f5aea1830ce}" valign="64" visibility="1" templateUuid="{7d12afc8-4e59-4401-96ae-4f5aea1830ce}" positionLock="true" marginY="1" groupUuid="" labelText="REVISION 1.1" frameJoinStyle="miter" size="96.2813,10.7996,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" htmlState="0" groupUuid="" blendMode="0" itemRotation="0" type="65641" id="" halign="2" zValue="5" templateUuid="{7d12afc8-4e59-4401-96ae-4f5aea1830ce}" uuid="{7d12afc8-4e59-4401-96ae-4f5aea1830ce}" labelText="REVISION 1.1" valign="64" referencePoint="0" background="false" position="256.805,269.289,mm" marginX="1" positionOnPage="256.805,269.289,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="96.2813,10.7996,mm" positionLock="true" marginY="1" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor red="0" green="0" blue="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="4" marginX="1" itemRotation="0" positionOnPage="255.506,280.489,mm" background="false" id="" type="65641" excludeFromExports="0" position="255.506,280.489,mm" blendMode="0" halign="2" referencePoint="0" frame="false" uuid="{7ffa4201-50e6-4f13-be68-e078a01c43b3}" valign="32" visibility="1" templateUuid="{7ffa4201-50e6-4f13-be68-e078a01c43b3}" positionLock="true" marginY="1" groupUuid="" labelText="Sunday, 20 October 2019" frameJoinStyle="miter" size="97.581,9.4078,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" htmlState="0" groupUuid="" blendMode="0" itemRotation="0" type="65641" id="" halign="2" zValue="4" templateUuid="{7ffa4201-50e6-4f13-be68-e078a01c43b3}" uuid="{7ffa4201-50e6-4f13-be68-e078a01c43b3}" labelText="Sunday, 20 October 2019" valign="32" referencePoint="0" background="false" position="255.506,280.489,mm" marginX="1" positionOnPage="255.506,280.489,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="97.581,9.4078,mm" positionLock="true" marginY="1" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor red="0" green="0" blue="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem svgBorderColor="0,0,0,255" file="../Gun_Run_Logo_2018.png" svgBorderWidth="0.2" outlineWidthM="0.3,mm" anchorPoint="4" opacity="1" svgFillColor="255,255,255,255" zValue="3" itemRotation="0" northOffset="0" positionOnPage="353.087,250.116,mm" background="false" id="" type="65640" excludeFromExports="0" pictureRotation="0" position="353.087,250.116,mm" blendMode="0" resizeMode="0" referencePoint="0" frame="false" uuid="{9ef5a762-1225-474d-b116-683f60bd1766}" mapUuid="{71033437-b2de-4b77-9244-4e66d0df0499}" visibility="1" templateUuid="{9ef5a762-1225-474d-b116-683f60bd1766}" positionLock="true" groupUuid="" frameJoinStyle="miter" pictureWidth="39.538" northMode="0" size="61.2291,39.7806,mm" pictureHeight="39.7806">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" file="../Gun_Run_Logo_2018.png" groupUuid="" pictureWidth="39.538" pictureRotation="0" svgBorderWidth="0.2" blendMode="0" svgBorderColor="0,0,0,255" pictureHeight="39.7806" northOffset="0" itemRotation="0" svgFillColor="255,255,255,255" type="65640" id="" zValue="3" mapUuid="{71033437-b2de-4b77-9244-4e66d0df0499}" templateUuid="{9ef5a762-1225-474d-b116-683f60bd1766}" uuid="{9ef5a762-1225-474d-b116-683f60bd1766}" referencePoint="0" anchorPoint="4" northMode="0" background="false" position="353.087,250.116,mm" resizeMode="0" positionOnPage="353.087,250.116,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="61.2291,39.7806,mm" positionLock="true" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value=""/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" shapeType="1" zValue="2" itemRotation="0" positionOnPage="6.08888,280.239,mm" background="false" id="" type="65643" excludeFromExports="0" position="6.08888,280.239,mm" blendMode="0" referencePoint="0" frame="false" uuid="{ded294de-fab0-48aa-a4e5-192ef54c6706}" visibility="1" templateUuid="{ded294de-fab0-48aa-a4e5-192ef54c6706}" positionLock="true" groupUuid="" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" size="346.848,0.1,mm">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" groupUuid="" blendMode="0" itemRotation="0" type="65643" id="" zValue="2" templateUuid="{ded294de-fab0-48aa-a4e5-192ef54c6706}" uuid="{ded294de-fab0-48aa-a4e5-192ef54c6706}" referencePoint="0" background="false" position="6.08888,280.239,mm" cornerRadiusMeasure="0,mm" positionOnPage="6.08888,280.239,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" shapeType="1" size="346.848,0.1,mm" positionLock="true" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-          <layer enabled="1" pass="0" class="SimpleFill" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol type="fill" name="" force_rhr="0" clip_to_extent="1" alpha="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="color" v="0,0,0,255"/>
+            <prop k="joinstyle" v="miter"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="solid"/>
+            <prop k="outline_width" v="0.3"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem followPreset="true" outlineWidthM="0.3,mm" opacity="1" keepLayerSet="false" zValue="1" itemRotation="0" mapFlags="0" positionOnPage="7.93888,6.411,mm" background="true" id="" type="65639" excludeFromExports="0" position="7.93888,6.411,mm" blendMode="0" referencePoint="0" frame="false" uuid="{71033437-b2de-4b77-9244-4e66d0df0499}" visibility="1" templateUuid="{71033437-b2de-4b77-9244-4e66d0df0499}" positionLock="true" groupUuid="" frameJoinStyle="miter" mapRotation="0" labelMargin="0,mm" drawCanvasItems="false" size="405.296,262.879,mm" followPresetName="Ask Me">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" mapRotation="0" keepLayerSet="false" followPresetName="Ask Me" groupUuid="" blendMode="0" mapFlags="0" itemRotation="0" type="65639" id="" zValue="1" templateUuid="{71033437-b2de-4b77-9244-4e66d0df0499}" uuid="{71033437-b2de-4b77-9244-4e66d0df0499}" referencePoint="0" drawCanvasItems="false" followPreset="true" background="true" position="7.93888,6.411,mm" labelMargin="0,mm" positionOnPage="7.93888,6.411,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="405.296,262.879,mm" positionLock="true" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="type" value="1" type="int"/>
-                  <Option name="val" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="int" name="type" value="1"/>
+                  <Option type="QString" name="val" value=""/>
                 </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="type" value="1" type="int"/>
-                  <Option name="val" value="" type="QString"/>
+                <Option type="Map" name="dataDefinedMapXMin">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="int" name="type" value="1"/>
+                  <Option type="QString" name="val" value=""/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="type" value="1" type="int"/>
-                  <Option name="val" value="" type="QString"/>
+                <Option type="Map" name="dataDefinedMapYMin">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="int" name="type" value="1"/>
+                  <Option type="QString" name="val" value=""/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmax="2050314.75178649788722396" ymax="-4015143.42099291039630771" ymin="-4016719.54043723130598664" xmin="2047884.75178401917219162"/>
+        <Extent ymin="-4016719.54043723130598664" ymax="-4015143.42099291039630771" xmax="2050314.75178649788722396" xmin="2047884.75178401917219162"/>
         <LayerSet/>
-        <ComposerMapGrid leftAnnotationPosition="1" topAnnotationDirection="0" name="Grid 1" unit="0" gridFrameMargin="0" topFrameDivisions="0" offsetY="0" leftFrameDivisions="0" position="3" annotationPrecision="3" blendMode="0" bottomAnnotationDirection="0" rightAnnotationDisplay="0" frameAnnotationDistance="1" rightAnnotationPosition="1" frameFillColor2="0,0,0,255" showAnnotation="0" gridFramePenThickness="0.5" gridFrameStyle="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" show="0" gridStyle="0" annotationFontColor="0,0,0,255" crossLength="3" offsetX="0" rightAnnotationDirection="0" intervalY="0" frameFillColor1="255,255,255,255" leftAnnotationDisplay="0" leftAnnotationDirection="0" gridFramePenColor="0,0,0,255" intervalX="0" rightFrameDivisions="0" annotationExpression="" gridFrameWidth="2" bottomAnnotationPosition="1" gridFrameSideFlags="15" annotationFormat="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" bottomFrameDivisions="0" topAnnotationPosition="1">
+        <ComposerMapGrid annotationPrecision="3" annotationExpression="" annotationFormat="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" unit="0" topAnnotationDisplay="0" annotationFontColor="0,0,0,255" blendMode="0" leftAnnotationDisplay="0" topAnnotationPosition="1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" frameAnnotationDistance="1" intervalX="0" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" show="0" frameFillColor2="0,0,0,255" gridFrameSideFlags="15" position="3" bottomFrameDivisions="0" name="Grid 1" showAnnotation="0" leftAnnotationDirection="0" leftFrameDivisions="0" leftAnnotationPosition="1" intervalY="0" rightAnnotationDirection="0" rightAnnotationPosition="1" gridFrameMargin="0" crossLength="3" bottomAnnotationDirection="0" topFrameDivisions="0" bottomAnnotationDisplay="0" bottomAnnotationPosition="1" gridFrameStyle="0" rightFrameDivisions="0" offsetX="0" offsetY="0" frameFillColor1="255,255,255,255" gridFrameWidth="2" gridStyle="0">
           <lineStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-              <layer enabled="1" pass="0" class="SimpleLine" locked="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" 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"/>
+            <symbol type="line" name="" force_rhr="0" clip_to_extent="1" alpha="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-              <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol type="marker" name="" force_rhr="0" clip_to_extent="1" alpha="1">
+              <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -16347,253 +16328,253 @@ def my_form_open(dialog, layer, feature):
         <labelBlockingItems/>
       </LayoutItem>
       <customproperties>
-        <property value="png" key="atlasRasterFormat"/>
-        <property value="false" key="forceVector"/>
-        <property value="true" key="imageAntialias"/>
-        <property value="0" key="imageCropMarginBottom"/>
-        <property value="0" key="imageCropMarginLeft"/>
-        <property value="0" key="imageCropMarginRight"/>
-        <property value="0" key="imageCropMarginTop"/>
-        <property value="false" key="imageCropToContents"/>
-        <property value="false" key="rasterize"/>
-        <property value="true" key="singleFile"/>
+        <property key="atlasRasterFormat" value="png"/>
+        <property key="forceVector" value="false"/>
+        <property key="imageAntialias" value="true"/>
+        <property key="imageCropMarginBottom" value="0"/>
+        <property key="imageCropMarginLeft" value="0"/>
+        <property key="imageCropMarginRight" value="0"/>
+        <property key="imageCropMarginTop" value="0"/>
+        <property key="imageCropToContents" value="false"/>
+        <property key="rasterize" value="false"/>
+        <property key="singleFile" value="true"/>
       </customproperties>
-      <Atlas coverageLayer="" pageNameExpression="" enabled="0" filterFeatures="0" hideCoverage="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" sortFeatures="0"/>
+      <Atlas hideCoverage="0" sortFeatures="0" enabled="0" filterFeatures="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" coverageLayer="" pageNameExpression=""/>
     </Layout>
-    <Layout name="All Routes" worldFileMap="" units="mm" printResolution="144">
-      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
-      <Grid resolution="10" offsetY="0" resUnits="mm" offsetUnits="mm" offsetX="0"/>
+    <Layout name="All Routes" printResolution="144" units="mm" worldFileMap="">
+      <Snapper snapToItems="1" snapToGrid="0" tolerance="5" snapToGuides="1"/>
+      <Grid resUnits="mm" offsetY="0" offsetX="0" offsetUnits="mm" resolution="10"/>
       <PageCollection>
-        <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-          <layer enabled="1" pass="0" class="SimpleFill" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol type="fill" name="" force_rhr="0" clip_to_extent="1" alpha="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="color" v="255,255,255,255"/>
+            <prop k="joinstyle" v="miter"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="no"/>
+            <prop k="outline_width" v="0.26"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="0" itemRotation="0" positionOnPage="0,0,mm" background="true" id="" type="65638" excludeFromExports="0" position="0,0,mm" blendMode="0" referencePoint="0" frame="false" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" visibility="1" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" positionLock="false" groupUuid="" frameJoinStyle="miter" size="297,210,mm">
-          <FrameColor red="0" green="0" alpha="255" blue="0"/>
-          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+        <LayoutItem excludeFromExports="0" groupUuid="" blendMode="0" itemRotation="0" type="65638" id="" zValue="0" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" referencePoint="0" background="true" position="0,0,mm" positionOnPage="0,0,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="297,210,mm" positionLock="false" opacity="1">
+          <FrameColor red="0" green="0" blue="0" alpha="255"/>
+          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
           </LayoutObject>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide page="0" orientation="2" units="mm" position="0"/>
+          <Guide page="0" orientation="2" position="0" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="6" marginX="1" itemRotation="0" positionOnPage="204.225,191.81,mm" background="false" id="" type="65641" excludeFromExports="0" position="204.225,191.81,mm" blendMode="0" halign="2" referencePoint="0" frame="false" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" valign="64" visibility="1" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" positionLock="true" marginY="1" groupUuid="" labelText="REVISION 1.6" frameJoinStyle="miter" size="57.4836,6.8714,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" htmlState="0" groupUuid="" blendMode="0" itemRotation="0" type="65641" id="" halign="2" zValue="6" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" labelText="REVISION 1.6" valign="64" referencePoint="0" background="false" position="204.225,191.81,mm" marginX="1" positionOnPage="204.225,191.81,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="57.4836,6.8714,mm" positionLock="true" marginY="1" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor red="0" green="0" blue="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="5" marginX="1" itemRotation="0" positionOnPage="210.038,199.082,mm" background="false" id="" type="65641" excludeFromExports="0" position="210.038,199.082,mm" blendMode="0" halign="2" referencePoint="0" frame="false" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" valign="64" visibility="1" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" positionLock="true" marginY="1" groupUuid="" labelText="Sunday, 20 October 2019" frameJoinStyle="miter" size="51.6706,6.60801,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" htmlState="0" groupUuid="" blendMode="0" itemRotation="0" type="65641" id="" halign="2" zValue="5" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" labelText="Sunday, 20 October 2019" valign="64" referencePoint="0" background="false" position="210.038,199.082,mm" marginX="1" positionOnPage="210.038,199.082,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="51.6706,6.60801,mm" positionLock="true" marginY="1" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor red="0" green="0" blue="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" svgBorderWidth="0.2" outlineWidthM="0.3,mm" anchorPoint="4" opacity="1" svgFillColor="255,255,255,255" zValue="4" itemRotation="0" northOffset="0" positionOnPage="262.196,188.218,mm" background="false" id="" type="65640" excludeFromExports="0" pictureRotation="0" position="262.196,188.218,mm" blendMode="0" resizeMode="0" referencePoint="0" frame="false" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" visibility="1" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" positionLock="true" groupUuid="" frameJoinStyle="miter" pictureWidth="29.7523" northMode="0" size="29.7523,17.4718,mm" pictureHeight="17.4074">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" file="../Gun_Run_Logo.png" groupUuid="" pictureWidth="29.7523" pictureRotation="0" svgBorderWidth="0.2" blendMode="0" svgBorderColor="0,0,0,255" pictureHeight="17.4074" northOffset="0" itemRotation="0" svgFillColor="255,255,255,255" type="65640" id="" zValue="4" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" referencePoint="0" anchorPoint="4" northMode="0" background="false" position="262.196,188.218,mm" resizeMode="0" positionOnPage="262.196,188.218,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" size="29.7523,17.4718,mm" positionLock="true" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value=""/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" shapeType="1" zValue="3" itemRotation="0" positionOnPage="9.59946,198.832,mm" background="false" id="" type="65643" excludeFromExports="0" position="9.59946,198.832,mm" blendMode="0" referencePoint="0" frame="false" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" visibility="1" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" positionLock="true" groupUuid="" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" size="251.959,0.1,mm">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" groupUuid="" blendMode="0" itemRotation="0" type="65643" id="" zValue="3" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" referencePoint="0" background="false" position="9.59946,198.832,mm" cornerRadiusMeasure="0,mm" positionOnPage="9.59946,198.832,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="false" shapeType="1" size="251.959,0.1,mm" positionLock="true" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-          <layer enabled="1" pass="0" class="SimpleFill" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol type="fill" name="" force_rhr="0" clip_to_extent="1" alpha="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="color" v="0,0,0,255"/>
+            <prop k="joinstyle" v="miter"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="solid"/>
+            <prop k="outline_width" v="0.3"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem followPreset="false" outlineWidthM="0.3,mm" opacity="1" keepLayerSet="false" zValue="2" itemRotation="0" mapFlags="0" positionOnPage="5.86559,4.09761,mm" background="true" id="" type="65639" excludeFromExports="0" position="5.86559,4.09761,mm" blendMode="0" referencePoint="0" frame="true" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" visibility="1" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" positionLock="true" groupUuid="" frameJoinStyle="miter" mapRotation="0" labelMargin="0,mm" drawCanvasItems="false" size="67.7828,166.874,mm" followPresetName="Routes">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" mapRotation="0" keepLayerSet="false" followPresetName="Routes" groupUuid="" blendMode="0" mapFlags="0" itemRotation="0" type="65639" id="" zValue="2" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" referencePoint="0" drawCanvasItems="false" followPreset="false" background="true" position="5.86559,4.09761,mm" labelMargin="0,mm" positionOnPage="5.86559,4.09761,mm" frameJoinStyle="miter" outlineWidthM="0.3,mm" visibility="1" frame="true" size="67.7828,166.874,mm" positionLock="true" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapXMax" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMax">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" 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"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMin">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapYMax" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMax">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" 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"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMin">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedOpacity" type="Map">
-                  <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 type="Map" name="dataDefinedOpacity">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmax="18.38563681624126289" ymax="-33.91513741583252539" ymin="-33.94652930000000168" xmin="18.37288570000000121"/>
+        <Extent ymin="-33.94652930000000168" ymax="-33.91513741583252539" xmax="18.38563681624126289" xmin="18.37288570000000121"/>
         <LayerSet/>
-        <ComposerMapGrid leftAnnotationPosition="1" topAnnotationDirection="0" name="Grid 1" unit="0" gridFrameMargin="0" topFrameDivisions="0" offsetY="0" leftFrameDivisions="0" position="3" annotationPrecision="3" blendMode="0" bottomAnnotationDirection="0" rightAnnotationDisplay="0" frameAnnotationDistance="1" rightAnnotationPosition="1" frameFillColor2="0,0,0,255" showAnnotation="0" gridFramePenThickness="0.5" gridFrameStyle="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" show="0" gridStyle="0" annotationFontColor="0,0,0,255" crossLength="3" offsetX="0" rightAnnotationDirection="0" intervalY="0" frameFillColor1="255,255,255,255" leftAnnotationDisplay="0" leftAnnotationDirection="0" gridFramePenColor="0,0,0,255" intervalX="0" rightFrameDivisions="0" annotationExpression="" gridFrameWidth="2" bottomAnnotationPosition="1" gridFrameSideFlags="15" annotationFormat="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" bottomFrameDivisions="0" topAnnotationPosition="1">
+        <ComposerMapGrid annotationPrecision="3" annotationExpression="" annotationFormat="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" unit="0" topAnnotationDisplay="0" annotationFontColor="0,0,0,255" blendMode="0" leftAnnotationDisplay="0" topAnnotationPosition="1" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" frameAnnotationDistance="1" intervalX="0" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" show="0" frameFillColor2="0,0,0,255" gridFrameSideFlags="15" position="3" bottomFrameDivisions="0" name="Grid 1" showAnnotation="0" leftAnnotationDirection="0" leftFrameDivisions="0" leftAnnotationPosition="1" intervalY="0" rightAnnotationDirection="0" rightAnnotationPosition="1" gridFrameMargin="0" crossLength="3" bottomAnnotationDirection="0" topFrameDivisions="0" bottomAnnotationDisplay="0" bottomAnnotationPosition="1" gridFrameStyle="0" rightFrameDivisions="0" offsetX="0" offsetY="0" frameFillColor1="255,255,255,255" gridFrameWidth="2" gridStyle="0">
           <lineStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-              <layer enabled="1" pass="0" class="SimpleLine" locked="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" 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"/>
+            <symbol type="line" name="" force_rhr="0" clip_to_extent="1" alpha="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-              <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol type="marker" name="" force_rhr="0" clip_to_extent="1" alpha="1">
+              <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -16604,93 +16585,93 @@ def my_form_open(dialog, layer, feature):
         <AtlasMap atlasDriven="0" margin="0.05" scalingMode="2"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutItem followPreset="false" outlineWidthM="0.15,mm" opacity="1" keepLayerSet="false" zValue="1" itemRotation="0" mapFlags="0" positionOnPage="9.44946,9.08557,mm" background="true" id="" type="65639" excludeFromExports="0" position="9.44946,9.08557,mm" blendMode="0" referencePoint="0" frame="true" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" visibility="1" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" positionLock="true" groupUuid="" frameJoinStyle="round" mapRotation="0" labelMargin="0,mm" drawCanvasItems="false" size="282.012,182.649,mm" followPresetName="Routes">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem excludeFromExports="0" mapRotation="0" keepLayerSet="false" followPresetName="Routes" groupUuid="" blendMode="0" mapFlags="0" itemRotation="0" type="65639" id="" zValue="1" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" referencePoint="0" drawCanvasItems="false" followPreset="false" background="true" position="9.44946,9.08557,mm" labelMargin="0,mm" positionOnPage="9.44946,9.08557,mm" frameJoinStyle="round" outlineWidthM="0.15,mm" visibility="1" frame="true" size="282.012,182.649,mm" positionLock="true" opacity="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '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 type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" 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"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.368'&#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 type="Map" name="dataDefinedMapXMin">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.368'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.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 type="Map" name="dataDefinedMapYMin">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" 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"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmax="18.42103445111282056" ymax="-33.89565141814492932" ymin="-33.92999999999999972" xmin="18.36799999999999855"/>
+        <Extent ymin="-33.92999999999999972" ymax="-33.89565141814492932" xmax="18.42103445111282056" xmin="18.36799999999999855"/>
         <LayerSet/>
-        <ComposerMapGrid leftAnnotationPosition="1" topAnnotationDirection="0" name="Grid 1" unit="0" gridFrameMargin="0" topFrameDivisions="0" offsetY="0" leftFrameDivisions="0" position="3" annotationPrecision="3" blendMode="0" bottomAnnotationDirection="0" rightAnnotationDisplay="0" frameAnnotationDistance="1" rightAnnotationPosition="1" frameFillColor2="0,0,0,255" showAnnotation="0" gridFramePenThickness="0.5" gridFrameStyle="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" show="0" gridStyle="0" annotationFontColor="0,0,0,255" crossLength="3" offsetX="0" rightAnnotationDirection="0" intervalY="0" frameFillColor1="255,255,255,255" leftAnnotationDisplay="0" leftAnnotationDirection="0" gridFramePenColor="0,0,0,255" intervalX="0" rightFrameDivisions="0" annotationExpression="" gridFrameWidth="2" bottomAnnotationPosition="1" gridFrameSideFlags="15" annotationFormat="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" bottomFrameDivisions="0" topAnnotationPosition="1">
+        <ComposerMapGrid annotationPrecision="3" annotationExpression="" annotationFormat="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" unit="0" topAnnotationDisplay="0" annotationFontColor="0,0,0,255" blendMode="0" leftAnnotationDisplay="0" topAnnotationPosition="1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" frameAnnotationDistance="1" intervalX="0" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" show="0" frameFillColor2="0,0,0,255" gridFrameSideFlags="15" position="3" bottomFrameDivisions="0" name="Grid 1" showAnnotation="0" leftAnnotationDirection="0" leftFrameDivisions="0" leftAnnotationPosition="1" intervalY="0" rightAnnotationDirection="0" rightAnnotationPosition="1" gridFrameMargin="0" crossLength="3" bottomAnnotationDirection="0" topFrameDivisions="0" bottomAnnotationDisplay="0" bottomAnnotationPosition="1" gridFrameStyle="0" rightFrameDivisions="0" offsetX="0" offsetY="0" frameFillColor1="255,255,255,255" gridFrameWidth="2" gridStyle="0">
           <lineStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-              <layer enabled="1" pass="0" class="SimpleLine" locked="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" 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"/>
+            <symbol type="line" name="" force_rhr="0" clip_to_extent="1" alpha="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-              <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol type="marker" name="" force_rhr="0" clip_to_extent="1" alpha="1">
+              <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -16702,20 +16683,20 @@ def my_form_open(dialog, layer, feature):
         <labelBlockingItems/>
       </LayoutItem>
       <customproperties>
-        <property value="png" key="atlasRasterFormat"/>
-        <property value="0" key="forceVector"/>
-        <property value="true" key="imageAntialias"/>
-        <property value="0" key="imageCropMarginBottom"/>
-        <property value="0" key="imageCropMarginLeft"/>
-        <property value="0" key="imageCropMarginRight"/>
-        <property value="0" key="imageCropMarginTop"/>
-        <property value="false" key="imageCropToContents"/>
-        <property value="0" key="pdfDisableRasterTiles"/>
-        <property value="1" key="pdfIncludeMetadata"/>
-        <property value="0" key="pdfTextFormat"/>
-        <property value="true" key="singleFile"/>
+        <property key="atlasRasterFormat" value="png"/>
+        <property key="forceVector" value="0"/>
+        <property key="imageAntialias" value="true"/>
+        <property key="imageCropMarginBottom" value="0"/>
+        <property key="imageCropMarginLeft" value="0"/>
+        <property key="imageCropMarginRight" value="0"/>
+        <property key="imageCropMarginTop" value="0"/>
+        <property key="imageCropToContents" value="false"/>
+        <property key="pdfDisableRasterTiles" value="0"/>
+        <property key="pdfIncludeMetadata" value="1"/>
+        <property key="pdfTextFormat" value="0"/>
+        <property key="singleFile" value="true"/>
       </customproperties>
-      <Atlas coverageLayer="all_routes20170907054841602" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/all_routes.shp" pageNameExpression="&quot;Distance&quot;" enabled="1" sortAscending="0" coverageLayerProvider="ogr" coverageLayerName="all_routes" filterFeatures="1" hideCoverage="0" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortKey="length_m" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21)' )" sortFeatures="1"/>
+      <Atlas coverageLayerName="all_routes" hideCoverage="0" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/all_routes.shp" coverageLayerProvider="ogr" sortFeatures="1" enabled="1" sortAscending="0" filterFeatures="1" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" coverageLayer="all_routes20170907054841602" pageNameExpression="&quot;Distance&quot;" sortKey="length_m" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21)' )"/>
     </Layout>
   </Layouts>
 </qgis>
diff --git a/GIS Base Map/Gun Run.qgs.mldata b/GIS Base Map/Gun Run.qgs.mldata
index d2ecf1b..178f6a0 100644
Binary files a/GIS Base Map/Gun Run.qgs.mldata and b/GIS Base Map/Gun Run.qgs.mldata differ
diff --git a/GIS Base Map/Gun Run.qgs~ b/GIS Base Map/Gun Run.qgs~
index 6320edd..891d065 100644
--- a/GIS Base Map/Gun Run.qgs~	
+++ b/GIS Base Map/Gun Run.qgs~	
@@ -19,69 +19,69 @@
   </projectCrs>
   <layer-tree-group>
     <customproperties/>
-    <layer-tree-group name="Marshals" checked="Qt::Unchecked" expanded="0">
+    <layer-tree-group expanded="1" name="Marshals" checked="Qt::Unchecked">
       <customproperties/>
-      <layer-tree-layer name="marshal_positions" checked="Qt::Unchecked" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" providerKey="ogr" expanded="1" source="./marshal_positions.shp|layername=marshal_positions">
+      <layer-tree-layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" name="marshal_positions" providerKey="ogr" checked="Qt::Unchecked" source="./marshal_positions.shp|layername=marshal_positions">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-layer name="extra_security" checked="Qt::Unchecked" id="extra_security20170921130834191" providerKey="ogr" expanded="1" source="./extra_security.shp">
+      <layer-tree-layer expanded="1" id="extra_security20170921130834191" name="extra_security" providerKey="ogr" checked="Qt::Unchecked" source="./extra_security.shp">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="marshals_by_position" checked="Qt::Unchecked" id="marshals_by_position20161003112326575" providerKey="delimitedtext" expanded="1" source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes">
+      <layer-tree-layer expanded="1" id="marshals_by_position20161003112326575" name="marshals_by_position" providerKey="delimitedtext" checked="Qt::Unchecked" source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes">
         <customproperties/>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Fencing and Cones" checked="Qt::Unchecked" expanded="0">
+    <layer-tree-group expanded="0" name="Fencing and Cones" checked="Qt::Unchecked">
       <customproperties/>
-      <layer-tree-layer name="fencing" checked="Qt::Checked" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" expanded="1" source="./fencing.shp|layername=fencing">
+      <layer-tree-layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" name="fencing" providerKey="ogr" checked="Qt::Checked" source="./fencing.shp|layername=fencing">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-layer name="fence_groups" checked="Qt::Unchecked" id="fence_groups_f376bd8f_41c6_452b_8e99_04d721ae7517" providerKey="virtual" expanded="1" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20fencing%20GROUP%20BY%20%22group%22">
+      <layer-tree-layer expanded="1" id="fence_groups_f376bd8f_41c6_452b_8e99_04d721ae7517" name="fence_groups" providerKey="virtual" checked="Qt::Unchecked" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20fencing%20GROUP%20BY%20%22group%22">
         <customproperties/>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Routes" checked="Qt::Checked" expanded="1">
+    <layer-tree-group expanded="1" name="Routes" checked="Qt::Checked">
       <customproperties/>
-      <layer-tree-layer name="traffic timing labels" checked="Qt::Unchecked" id="m_5da75b14_824c_463d_b7f6_0ae6e9689403" providerKey="memory" expanded="1" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;index=yes&amp;field=Name:string(254,0)&amp;field=Distance:string(10,0)&amp;field=distance:(0,0):string(255,0)&amp;field=display:string(20,0)&amp;uid={84010829-7296-424e-b54e-63b78b9e01b0}">
+      <layer-tree-layer expanded="1" id="m_5da75b14_824c_463d_b7f6_0ae6e9689403" name="traffic timing labels" providerKey="memory" checked="Qt::Unchecked" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;index=yes&amp;field=Name:string(254,0)&amp;field=Distance:string(10,0)&amp;field=distance:(0,0):string(255,0)&amp;field=display:string(20,0)&amp;uid={e9bf3f84-cad9-4267-b582-97ad97e7218c}">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="timelapse" checked="Qt::Unchecked" id="timelapse_55fe61aa_52c4_42b5_a917_d0927767c9d7" providerKey="ogr" expanded="0" source="./timelapse.shp|layername=timelapse">
+      <layer-tree-layer expanded="0" id="timelapse_55fe61aa_52c4_42b5_a917_d0927767c9d7" name="timelapse" providerKey="ogr" checked="Qt::Unchecked" source="./timelapse.shp|layername=timelapse">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-layer name="old timelapse" checked="Qt::Unchecked" id="m_bf4ea117_e806_41bf_b957_69930ecdd71f" providerKey="memory" expanded="0" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:Integer64(10,0)&amp;field=length_m:Real(10,10)&amp;field=length_km:Real(10,10)&amp;field=Source:String(20,0)&amp;field=org_fid:(0,0)&amp;field=distance:(0,0)&amp;field=first_runner:string(10,0)&amp;field=last_runner:string(10,0)&amp;uid={56c8eae5-e03d-4c21-8dd5-4262f15e704f}">
+      <layer-tree-layer expanded="0" id="m_bf4ea117_e806_41bf_b957_69930ecdd71f" name="old timelapse" providerKey="memory" checked="Qt::Unchecked" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:Integer64(10,0)&amp;field=length_m:Real(10,10)&amp;field=length_km:Real(10,10)&amp;field=Source:String(20,0)&amp;field=org_fid:(0,0)&amp;field=distance:(0,0)&amp;field=first_runner:string(10,0)&amp;field=last_runner:string(10,0)&amp;uid={3cb85629-4fc4-4875-a4fe-659a1059bd6b}">
         <customproperties>
           <property value="1" key="showFeatureCount"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-group name="Markers" checked="Qt::Checked" expanded="1">
+      <layer-tree-group expanded="1" name="Markers" checked="Qt::Checked">
         <customproperties/>
-        <layer-tree-layer name="route_markers" checked="Qt::Unchecked" id="route_markers_400718de_4c66_4725_81c9_caa6b73d2d82" providerKey="memory" expanded="1" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:Integer64(10,0)&amp;field=length_m:Real(10,10)&amp;field=length_km:Real(10,10)&amp;field=Source:String(20,0)&amp;field=org_fid:(0,0)&amp;field=distance:(0,0)&amp;uid={ead2df6c-8810-4c38-b731-8309e1bffc68}">
+        <layer-tree-layer expanded="1" id="route_markers_400718de_4c66_4725_81c9_caa6b73d2d82" name="route_markers" providerKey="memory" checked="Qt::Unchecked" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:Integer64(10,0)&amp;field=length_m:Real(10,10)&amp;field=length_km:Real(10,10)&amp;field=Source:String(20,0)&amp;field=org_fid:(0,0)&amp;field=distance:(0,0)&amp;uid={c58b610a-9a8e-4db1-9805-61f2b15d0207}">
           <customproperties>
             <property value="1" key="showFeatureCount"/>
           </customproperties>
         </layer-tree-layer>
-        <layer-tree-layer name="proposed road markers" checked="Qt::Checked" id="proposed_road_markers_2b454f1d_6ad8_4b91_805f_f503490286b2" providerKey="memory" expanded="1" source="Point?crs=EPSG:4326&amp;uid={07e74641-6f37-4c3c-a793-6ee85d7572ae}">
+        <layer-tree-layer expanded="1" id="proposed_route_markers_b3dac0b0_ee05_431b_a89e_52cc9d9162b0" name="proposed route markers" providerKey="memory" checked="Qt::Checked" source="Point?crs=EPSG:4326&amp;uid={c44eec3c-76ee-4173-8a57-a9ae8b5e0ab3}">
           <customproperties>
             <property value="1" key="showFeatureCount"/>
           </customproperties>
         </layer-tree-layer>
-        <layer-tree-layer name="old route_markers" checked="Qt::Unchecked" id="route_markers_5e72fa72_33f5_4bcc_9250_d316da503346" providerKey="memory" expanded="1" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:Integer64(10,0)&amp;field=length_m:Real(10,10)&amp;field=length_km:Real(10,10)&amp;field=Source:String(20,0)&amp;field=org_fid:(0,0)&amp;field=distance:(0,0)&amp;uid={bad88c45-57cd-4fd7-a0c5-7af73fa31b84}">
+        <layer-tree-layer expanded="1" id="route_markers_5e72fa72_33f5_4bcc_9250_d316da503346" name="old route_markers" providerKey="memory" checked="Qt::Unchecked" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:Integer64(10,0)&amp;field=length_m:Real(10,10)&amp;field=length_km:Real(10,10)&amp;field=Source:String(20,0)&amp;field=org_fid:(0,0)&amp;field=distance:(0,0)&amp;uid={9ca2659b-a197-4dea-b912-64603d2c59cd}">
           <customproperties>
             <property value="1" key="showFeatureCount"/>
           </customproperties>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-layer name="proposed_routes" checked="Qt::Checked" id="proposed_routes_f10ccfbd_1547_42d0_8c19_862e4ffde38b" providerKey="ogr" expanded="1" source="./proposed_routes.shp|layername=proposed_routes">
+      <layer-tree-layer expanded="1" id="proposed_routes_f10ccfbd_1547_42d0_8c19_862e4ffde38b" name="proposed_routes" providerKey="ogr" checked="Qt::Checked" source="./proposed_routes.shp|layername=proposed_routes">
         <customproperties>
           <property value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" key="expandedLegendNodes"/>
           <property value="1" key="showFeatureCount"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="all_routes" checked="Qt::Unchecked" id="all_routes20170907054841602" providerKey="ogr" expanded="1" source="./all_routes.shp">
+      <layer-tree-layer expanded="1" id="all_routes20170907054841602" name="all_routes" providerKey="ogr" checked="Qt::Unchecked" source="./all_routes.shp">
         <customproperties>
           <property key="expandedLegendNodes">
             <value>{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}</value>
@@ -92,84 +92,84 @@
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Feeding Stations" checked="Qt::Checked" expanded="1">
+    <layer-tree-group expanded="1" name="Feeding Stations" checked="Qt::Checked">
       <customproperties/>
-      <layer-tree-layer name="water_tables" checked="Qt::Checked" id="water_tables20170921142016467" providerKey="ogr" expanded="1" source="./water_tables.shp">
+      <layer-tree-layer expanded="1" id="water_tables20170921142016467" name="water_tables" providerKey="ogr" checked="Qt::Checked" source="./water_tables.shp">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Ask Me" checked="Qt::Unchecked" expanded="0">
+    <layer-tree-group expanded="0" name="Ask Me" checked="Qt::Unchecked">
       <customproperties/>
-      <layer-tree-layer name="poi_labels" checked="Qt::Unchecked" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" providerKey="ogr" expanded="0" source="./poi_labels.shp|layername=poi_labels">
+      <layer-tree-layer expanded="0" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" name="poi_labels" providerKey="ogr" checked="Qt::Unchecked" source="./poi_labels.shp|layername=poi_labels">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-layer name="directions_to_start" checked="Qt::Unchecked" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" providerKey="ogr" expanded="1" source="./directions_to_start.shp|layername=directions_to_start">
+      <layer-tree-layer expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" name="directions_to_start" providerKey="ogr" checked="Qt::Unchecked" source="./directions_to_start.shp|layername=directions_to_start">
         <customproperties/>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Residents Access" checked="Qt::Unchecked" expanded="0">
+    <layer-tree-group expanded="0" name="Residents Access" checked="Qt::Unchecked">
       <customproperties/>
-      <layer-tree-layer name="residents_access_roads" checked="Qt::Unchecked" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" providerKey="ogr" expanded="1" source="./residents_access_roads.shp|layername=residents_access_roads">
+      <layer-tree-layer expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" name="residents_access_roads" providerKey="ogr" checked="Qt::Unchecked" source="./residents_access_roads.shp|layername=residents_access_roads">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="residents_access" checked="Qt::Unchecked" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" providerKey="ogr" expanded="1" source="./residents_access.shp|layername=residents_access">
+      <layer-tree-layer expanded="1" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" name="residents_access" providerKey="ogr" checked="Qt::Unchecked" source="./residents_access.shp|layername=residents_access">
         <customproperties/>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="OSM data" checked="Qt::Checked" expanded="1">
+    <layer-tree-group expanded="1" name="OSM data" checked="Qt::Checked">
       <customproperties/>
-      <layer-tree-layer name="osm_roads" checked="Qt::Checked" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" providerKey="ogr" expanded="0" source="./osm_roads.shp">
+      <layer-tree-layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" name="osm_roads" providerKey="ogr" checked="Qt::Checked" source="./osm_roads.shp">
         <customproperties>
           <property key="expandedLegendNodes"/>
           <property value="1" key="showFeatureCount"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="osm_places" checked="Qt::Checked" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" providerKey="ogr" expanded="1" source="./osm_places.shp|layername=osm_places">
+      <layer-tree-layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" name="osm_places" providerKey="ogr" checked="Qt::Checked" source="./osm_places.shp|layername=osm_places">
         <customproperties>
           <property key="expandedLegendNodes"/>
           <property value="1" key="showFeatureCount"/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Marshal pages" checked="Qt::Unchecked" expanded="0">
+    <layer-tree-group expanded="0" name="Marshal pages" checked="Qt::Unchecked">
       <customproperties/>
-      <layer-tree-layer name="marshal overviews" checked="Qt::Unchecked" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" providerKey="ogr" expanded="1" source="./marshal overviews.shp|layername=marshal overviews">
+      <layer-tree-layer expanded="1" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" name="marshal overviews" providerKey="ogr" checked="Qt::Unchecked" source="./marshal overviews.shp|layername=marshal overviews">
         <customproperties/>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Start and Finish pages" checked="Qt::Unchecked" expanded="0">
+    <layer-tree-group expanded="0" name="Start and Finish pages" checked="Qt::Unchecked">
       <customproperties/>
-      <layer-tree-layer name="data-comments" checked="Qt::Checked" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" providerKey="ogr" expanded="1" source="./data-comments.shp">
+      <layer-tree-layer expanded="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" name="data-comments" providerKey="ogr" checked="Qt::Checked" source="./data-comments.shp">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="start_finish_area" checked="Qt::Unchecked" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" providerKey="ogr" expanded="1" source="./start_finish_area.shp">
+      <layer-tree-layer expanded="1" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" name="start_finish_area" providerKey="ogr" checked="Qt::Unchecked" source="./start_finish_area.shp">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Elevation" checked="Qt::Unchecked" expanded="0">
+    <layer-tree-group expanded="0" name="Elevation" checked="Qt::Unchecked">
       <customproperties/>
-      <layer-tree-layer name="capetownelevation-1m" checked="Qt::Unchecked" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" providerKey="ogr" expanded="1" source="./capetownelevation-1m.shp">
+      <layer-tree-layer expanded="1" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" name="capetownelevation-1m" providerKey="ogr" checked="Qt::Unchecked" source="./capetownelevation-1m.shp">
         <customproperties>
           <property value="1" key="showFeatureCount"/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Map" checked="Qt::Checked" expanded="1">
+    <layer-tree-group expanded="1" name="Map" checked="Qt::Checked">
       <customproperties/>
-      <layer-tree-layer name="GDAL-City of Cape Town 2015 Aerial" checked="Qt::Unchecked" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" providerKey="gdal" expanded="1" source="./GDAL-City of Cape Town 2015 Aerial.xml">
+      <layer-tree-layer expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" name="GDAL-City of Cape Town 2015 Aerial" providerKey="gdal" checked="Qt::Unchecked" source="./GDAL-City of Cape Town 2015 Aerial.xml">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="Outlines" checked="Qt::Checked" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" providerKey="wms" 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">
+      <layer-tree-layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" name="Outlines" providerKey="wms" checked="Qt::Checked" source="contextualWMSLegend=0&amp;crs=EPSG:3857&amp;dpiMode=7&amp;featureCount=10&amp;format=image/png&amp;layers=ciry26ojy003tgynmznkc1a6q&amp;styles=default&amp;tileMatrixSet=GoogleMapsCompatible&amp;url=https://api.mapbox.com/styles/v1/ragtagtag/ciry26ojy003tgynmznkc1a6q/wmts?access_token%3Dpk.eyJ1IjoicmFndGFndGFnIiwiYSI6ImNpcnh3bnowbTAwMDUyemw1enBtbm50bTgifQ.WXKQzAfdJjsuQ6P6-BLZhg%2314.88/-33.91505/18.39137">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
@@ -200,44 +200,44 @@
       <item>timelapse_55fe61aa_52c4_42b5_a917_d0927767c9d7</item>
       <item>data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12</item>
       <item>proposed_routes_f10ccfbd_1547_42d0_8c19_862e4ffde38b</item>
-      <item>proposed_road_markers_2b454f1d_6ad8_4b91_805f_f503490286b2</item>
+      <item>proposed_route_markers_b3dac0b0_ee05_431b_a89e_52cc9d9162b0</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings mode="3" unit="1" enabled="1" tolerance="10" type="1" intersection-snapping="1">
+  <snapping-settings mode="3" enabled="0" type="1" tolerance="10" unit="1" intersection-snapping="1">
     <individual-layer-settings>
-      <layer-setting id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" enabled="1" units="1" tolerance="20" type="2"/>
-      <layer-setting id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" enabled="0" units="1" tolerance="12" type="2"/>
-      <layer-setting id="proposed_road_markers_2b454f1d_6ad8_4b91_805f_f503490286b2" enabled="0" units="1" tolerance="12" type="2"/>
-      <layer-setting id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" enabled="0" units="1" tolerance="12" type="2"/>
-      <layer-setting id="fence_groups_f376bd8f_41c6_452b_8e99_04d721ae7517" enabled="0" units="1" tolerance="12" type="2"/>
-      <layer-setting id="route_markers_400718de_4c66_4725_81c9_caa6b73d2d82" enabled="0" units="1" tolerance="12" type="2"/>
-      <layer-setting id="route_markers_5e72fa72_33f5_4bcc_9250_d316da503346" enabled="0" units="1" tolerance="12" type="2"/>
-      <layer-setting id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" enabled="0" units="1" tolerance="12" type="2"/>
-      <layer-setting id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" enabled="0" units="1" tolerance="12" type="2"/>
-      <layer-setting id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" enabled="0" units="1" tolerance="12" type="2"/>
-      <layer-setting id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" enabled="0" units="1" tolerance="12" type="2"/>
-      <layer-setting id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" enabled="0" units="1" tolerance="12" type="2"/>
-      <layer-setting id="m_5da75b14_824c_463d_b7f6_0ae6e9689403" enabled="0" units="1" tolerance="12" type="2"/>
-      <layer-setting id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" enabled="0" units="1" tolerance="12" type="2"/>
-      <layer-setting id="water_tables20170921142016467" enabled="0" units="2" tolerance="0" type="2"/>
-      <layer-setting id="all_routes20170907054841602" enabled="0" units="2" tolerance="0" type="2"/>
-      <layer-setting id="proposed_routes_f10ccfbd_1547_42d0_8c19_862e4ffde38b" enabled="0" units="1" tolerance="12" type="2"/>
-      <layer-setting id="extra_security20170921130834191" enabled="0" units="2" tolerance="0" type="2"/>
-      <layer-setting id="timelapse_55fe61aa_52c4_42b5_a917_d0927767c9d7" enabled="0" units="1" tolerance="12" type="2"/>
-      <layer-setting id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" enabled="0" units="1" tolerance="12" type="2"/>
-      <layer-setting id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" enabled="0" units="1" tolerance="12" type="2"/>
-      <layer-setting id="m_bf4ea117_e806_41bf_b957_69930ecdd71f" enabled="0" units="1" tolerance="12" type="2"/>
-      <layer-setting id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" enabled="0" units="1" tolerance="12" type="2"/>
+      <layer-setting id="extra_security20170921130834191" enabled="0" type="2" tolerance="0" units="2"/>
+      <layer-setting id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" enabled="0" type="2" tolerance="12" units="1"/>
+      <layer-setting id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" enabled="0" type="2" tolerance="12" units="1"/>
+      <layer-setting id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" enabled="0" type="2" tolerance="12" units="1"/>
+      <layer-setting id="route_markers_400718de_4c66_4725_81c9_caa6b73d2d82" enabled="0" type="2" tolerance="12" units="1"/>
+      <layer-setting id="timelapse_55fe61aa_52c4_42b5_a917_d0927767c9d7" enabled="0" type="2" tolerance="12" units="1"/>
+      <layer-setting id="proposed_route_markers_b3dac0b0_ee05_431b_a89e_52cc9d9162b0" enabled="0" type="2" tolerance="12" units="1"/>
+      <layer-setting id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" enabled="0" type="2" tolerance="12" units="1"/>
+      <layer-setting id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" enabled="0" type="2" tolerance="12" units="1"/>
+      <layer-setting id="route_markers_5e72fa72_33f5_4bcc_9250_d316da503346" enabled="0" type="2" tolerance="12" units="1"/>
+      <layer-setting id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" enabled="0" type="2" tolerance="12" units="1"/>
+      <layer-setting id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" enabled="0" type="2" tolerance="12" units="1"/>
+      <layer-setting id="all_routes20170907054841602" enabled="0" type="2" tolerance="0" units="2"/>
+      <layer-setting id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" enabled="0" type="2" tolerance="12" units="1"/>
+      <layer-setting id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" enabled="0" type="2" tolerance="12" units="1"/>
+      <layer-setting id="fence_groups_f376bd8f_41c6_452b_8e99_04d721ae7517" enabled="0" type="2" tolerance="12" units="1"/>
+      <layer-setting id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" enabled="0" type="2" tolerance="12" units="1"/>
+      <layer-setting id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" enabled="1" type="2" tolerance="20" units="1"/>
+      <layer-setting id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" enabled="0" type="2" tolerance="12" units="1"/>
+      <layer-setting id="water_tables20170921142016467" enabled="0" type="2" tolerance="0" units="2"/>
+      <layer-setting id="proposed_routes_f10ccfbd_1547_42d0_8c19_862e4ffde38b" enabled="0" type="2" tolerance="12" units="1"/>
+      <layer-setting id="m_bf4ea117_e806_41bf_b957_69930ecdd71f" enabled="0" type="2" tolerance="12" units="1"/>
+      <layer-setting id="m_5da75b14_824c_463d_b7f6_0ae6e9689403" enabled="0" type="2" tolerance="12" units="1"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
   <mapcanvas name="theMapCanvas" annotationsVisible="1">
     <units>degrees</units>
     <extent>
-      <xmin>18.3745383070555377</xmin>
-      <ymin>-33.94453463403964832</ymin>
-      <xmax>18.42160847632861476</xmax>
-      <ymax>-33.89580312445267651</ymax>
+      <xmin>18.41546373356990074</xmin>
+      <ymin>-33.91060697802408441</ymin>
+      <xmax>18.42723127588813981</xmax>
+      <ymax>-33.8984241006273308</ymax>
     </extent>
     <rotation>0</rotation>
     <destinationsrs>
@@ -257,155 +257,155 @@
   </mapcanvas>
   <projectModels/>
   <legend updateDrawingOrder="true">
-    <legendgroup name="Marshals" checked="Qt::Unchecked" open="false">
-      <legendlayer showFeatureCount="0" name="marshal_positions" checked="Qt::Unchecked" drawingOrder="-1" open="true">
+    <legendgroup name="Marshals" checked="Qt::Unchecked" open="true">
+      <legendlayer name="marshal_positions" checked="Qt::Unchecked" showFeatureCount="0" open="true" drawingOrder="-1">
         <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="0" name="extra_security" checked="Qt::Unchecked" drawingOrder="-1" open="true">
+      <legendlayer name="extra_security" checked="Qt::Unchecked" showFeatureCount="0" open="true" drawingOrder="-1">
         <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" layerid="extra_security20170921130834191" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="0" name="marshals_by_position" checked="Qt::Unchecked" drawingOrder="-1" open="true">
+      <legendlayer name="marshals_by_position" checked="Qt::Unchecked" showFeatureCount="0" open="true" drawingOrder="-1">
         <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" layerid="marshals_by_position20161003112326575" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
     <legendgroup name="Fencing and Cones" checked="Qt::Unchecked" open="false">
-      <legendlayer showFeatureCount="0" name="fencing" checked="Qt::Checked" drawingOrder="-1" open="true">
+      <legendlayer name="fencing" checked="Qt::Checked" showFeatureCount="0" open="true" drawingOrder="-1">
         <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="0" name="fence_groups" checked="Qt::Unchecked" drawingOrder="-1" open="true">
+      <legendlayer name="fence_groups" checked="Qt::Unchecked" showFeatureCount="0" open="true" drawingOrder="-1">
         <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" layerid="fence_groups_f376bd8f_41c6_452b_8e99_04d721ae7517" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
     <legendgroup name="Routes" checked="Qt::Checked" open="true">
-      <legendlayer showFeatureCount="0" name="traffic timing labels" checked="Qt::Unchecked" drawingOrder="-1" open="true">
+      <legendlayer name="traffic timing labels" checked="Qt::Unchecked" showFeatureCount="0" open="true" drawingOrder="-1">
         <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" layerid="m_5da75b14_824c_463d_b7f6_0ae6e9689403" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="0" name="timelapse" checked="Qt::Unchecked" drawingOrder="-1" open="false">
+      <legendlayer name="timelapse" checked="Qt::Unchecked" showFeatureCount="0" open="false" drawingOrder="-1">
         <filegroup hidden="false" open="false">
           <legendlayerfile isInOverview="0" layerid="timelapse_55fe61aa_52c4_42b5_a917_d0927767c9d7" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="1" name="old timelapse" checked="Qt::Unchecked" drawingOrder="-1" open="false">
+      <legendlayer name="old timelapse" checked="Qt::Unchecked" showFeatureCount="1" open="false" drawingOrder="-1">
         <filegroup hidden="false" open="false">
           <legendlayerfile isInOverview="0" layerid="m_bf4ea117_e806_41bf_b957_69930ecdd71f" visible="0"/>
         </filegroup>
       </legendlayer>
       <legendgroup name="Markers" checked="Qt::Checked" open="true">
-        <legendlayer showFeatureCount="1" name="route_markers" checked="Qt::Unchecked" drawingOrder="-1" open="true">
+        <legendlayer name="route_markers" checked="Qt::Unchecked" showFeatureCount="1" open="true" drawingOrder="-1">
           <filegroup hidden="false" open="true">
             <legendlayerfile isInOverview="0" layerid="route_markers_400718de_4c66_4725_81c9_caa6b73d2d82" visible="0"/>
           </filegroup>
         </legendlayer>
-        <legendlayer showFeatureCount="1" name="proposed road markers" checked="Qt::Checked" drawingOrder="-1" open="true">
+        <legendlayer name="proposed route markers" checked="Qt::Checked" showFeatureCount="1" open="true" drawingOrder="-1">
           <filegroup hidden="false" open="true">
-            <legendlayerfile isInOverview="0" layerid="proposed_road_markers_2b454f1d_6ad8_4b91_805f_f503490286b2" visible="1"/>
+            <legendlayerfile isInOverview="0" layerid="proposed_route_markers_b3dac0b0_ee05_431b_a89e_52cc9d9162b0" visible="1"/>
           </filegroup>
         </legendlayer>
-        <legendlayer showFeatureCount="1" name="old route_markers" checked="Qt::Unchecked" drawingOrder="-1" open="true">
+        <legendlayer name="old route_markers" checked="Qt::Unchecked" showFeatureCount="1" open="true" drawingOrder="-1">
           <filegroup hidden="false" open="true">
             <legendlayerfile isInOverview="0" layerid="route_markers_5e72fa72_33f5_4bcc_9250_d316da503346" visible="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendlayer showFeatureCount="1" name="proposed_routes" checked="Qt::Checked" drawingOrder="-1" open="true">
+      <legendlayer name="proposed_routes" checked="Qt::Checked" showFeatureCount="1" open="true" drawingOrder="-1">
         <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" layerid="proposed_routes_f10ccfbd_1547_42d0_8c19_862e4ffde38b" visible="1"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="0" name="all_routes" checked="Qt::Unchecked" drawingOrder="-1" open="true">
+      <legendlayer name="all_routes" checked="Qt::Unchecked" showFeatureCount="0" open="true" drawingOrder="-1">
         <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="1" layerid="all_routes20170907054841602" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
     <legendgroup name="Feeding Stations" checked="Qt::Checked" open="true">
-      <legendlayer showFeatureCount="0" name="water_tables" checked="Qt::Checked" drawingOrder="-1" open="true">
+      <legendlayer name="water_tables" checked="Qt::Checked" showFeatureCount="0" open="true" drawingOrder="-1">
         <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" layerid="water_tables20170921142016467" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
     <legendgroup name="Ask Me" checked="Qt::Unchecked" open="false">
-      <legendlayer showFeatureCount="0" name="poi_labels" checked="Qt::Unchecked" drawingOrder="-1" open="false">
+      <legendlayer name="poi_labels" checked="Qt::Unchecked" showFeatureCount="0" open="false" drawingOrder="-1">
         <filegroup hidden="false" open="false">
           <legendlayerfile isInOverview="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="0" name="directions_to_start" checked="Qt::Unchecked" drawingOrder="-1" open="true">
+      <legendlayer name="directions_to_start" checked="Qt::Unchecked" showFeatureCount="0" open="true" drawingOrder="-1">
         <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
     <legendgroup name="Residents Access" checked="Qt::Unchecked" open="false">
-      <legendlayer showFeatureCount="0" name="residents_access_roads" checked="Qt::Unchecked" drawingOrder="-1" open="true">
+      <legendlayer name="residents_access_roads" checked="Qt::Unchecked" showFeatureCount="0" open="true" drawingOrder="-1">
         <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="0" name="residents_access" checked="Qt::Unchecked" drawingOrder="-1" open="true">
+      <legendlayer name="residents_access" checked="Qt::Unchecked" showFeatureCount="0" open="true" drawingOrder="-1">
         <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
     <legendgroup name="OSM data" checked="Qt::Checked" open="true">
-      <legendlayer showFeatureCount="1" name="osm_roads" checked="Qt::Checked" drawingOrder="-1" open="false">
+      <legendlayer name="osm_roads" checked="Qt::Checked" showFeatureCount="1" open="false" drawingOrder="-1">
         <filegroup hidden="false" open="false">
           <legendlayerfile isInOverview="0" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="1" name="osm_places" checked="Qt::Checked" drawingOrder="-1" open="true">
+      <legendlayer name="osm_places" checked="Qt::Checked" showFeatureCount="1" open="true" drawingOrder="-1">
         <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
     <legendgroup name="Marshal pages" checked="Qt::Unchecked" open="false">
-      <legendlayer showFeatureCount="0" name="marshal overviews" checked="Qt::Unchecked" drawingOrder="-1" open="true">
+      <legendlayer name="marshal overviews" checked="Qt::Unchecked" showFeatureCount="0" open="true" drawingOrder="-1">
         <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
     <legendgroup name="Start and Finish pages" checked="Qt::Unchecked" open="false">
-      <legendlayer showFeatureCount="0" name="data-comments" checked="Qt::Checked" drawingOrder="-1" open="true">
+      <legendlayer name="data-comments" checked="Qt::Checked" showFeatureCount="0" open="true" drawingOrder="-1">
         <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="0" name="start_finish_area" checked="Qt::Unchecked" drawingOrder="-1" open="true">
+      <legendlayer name="start_finish_area" checked="Qt::Unchecked" showFeatureCount="0" open="true" drawingOrder="-1">
         <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
     <legendgroup name="Elevation" checked="Qt::Unchecked" open="false">
-      <legendlayer showFeatureCount="1" name="capetownelevation-1m" checked="Qt::Unchecked" drawingOrder="-1" open="true">
+      <legendlayer name="capetownelevation-1m" checked="Qt::Unchecked" showFeatureCount="1" open="true" drawingOrder="-1">
         <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
     <legendgroup name="Map" checked="Qt::Checked" open="true">
-      <legendlayer showFeatureCount="0" name="GDAL-City of Cape Town 2015 Aerial" checked="Qt::Unchecked" drawingOrder="-1" open="true">
+      <legendlayer name="GDAL-City of Cape Town 2015 Aerial" checked="Qt::Unchecked" showFeatureCount="0" open="true" drawingOrder="-1">
         <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="0" name="Outlines" checked="Qt::Checked" drawingOrder="-1" open="true">
+      <legendlayer name="Outlines" checked="Qt::Checked" showFeatureCount="0" open="true" drawingOrder="-1">
         <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1"/>
         </filegroup>
@@ -415,7 +415,7 @@
   <mapViewDocks/>
   <mapViewDocks3D/>
   <projectlayers>
-    <maplayer styleCategories="AllStyleCategories" minScale="1e+08" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" type="raster" autoRefreshTime="0">
+    <maplayer autoRefreshTime="0" maxScale="100000" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" minScale="1e+08" autoRefreshEnabled="0" type="raster" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>-20037508.33999999985098839</xmin>
         <ymin>-20037508.33999999985098839</ymin>
@@ -468,11 +468,11 @@
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" maxx="0" minz="0" miny="0" crs="" dimensions="2" maxz="0" minx="0"/>
+          <spatial crs="" dimensions="2" maxz="0" minx="0" maxy="0" minz="0" maxx="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -502,7 +502,7 @@
         <property value="Value" key="identify/format"/>
       </customproperties>
       <pipe>
-        <rasterrenderer alphaBand="-1" opacity="0.75" redBand="1" blueBand="3" greenBand="2" type="multibandcolor">
+        <rasterrenderer type="multibandcolor" blueBand="3" greenBand="2" opacity="0.75" alphaBand="-1" redBand="1">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -514,12 +514,12 @@
           </minMaxOrigin>
         </rasterrenderer>
         <brightnesscontrast contrast="0" brightness="0"/>
-        <huesaturation saturation="0" colorizeOn="0" colorizeBlue="128" colorizeGreen="128" colorizeStrength="100" grayscaleMode="0" colorizeRed="255"/>
+        <huesaturation grayscaleMode="0" colorizeRed="255" colorizeGreen="128" colorizeBlue="128" colorizeStrength="100" colorizeOn="0" saturation="0"/>
         <rasterresampler maxOversampling="2"/>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer styleCategories="AllStyleCategories" minScale="1e+08" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" type="raster" autoRefreshTime="0">
+    <maplayer autoRefreshTime="0" maxScale="0" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" minScale="1e+08" autoRefreshEnabled="0" type="raster" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>-20037508.34278924390673637</xmin>
         <ymin>-20037508.62692910060286522</ymin>
@@ -572,11 +572,11 @@
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" maxx="0" minz="0" miny="0" crs="" dimensions="2" maxz="0" minx="0"/>
+          <spatial crs="" dimensions="2" maxz="0" minx="0" maxy="0" minz="0" maxx="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -604,7 +604,7 @@
         <property value="Undefined" key="identify/format"/>
       </customproperties>
       <pipe>
-        <rasterrenderer alphaBand="-1" opacity="0.75" type="singlebandcolordata" band="1">
+        <rasterrenderer band="1" type="singlebandcolordata" opacity="0.75" alphaBand="-1">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -616,12 +616,12 @@
           </minMaxOrigin>
         </rasterrenderer>
         <brightnesscontrast contrast="0" brightness="0"/>
-        <huesaturation saturation="0" colorizeOn="0" colorizeBlue="128" colorizeGreen="128" colorizeStrength="100" grayscaleMode="0" colorizeRed="255"/>
+        <huesaturation grayscaleMode="0" colorizeRed="255" colorizeGreen="128" colorizeBlue="128" colorizeStrength="100" colorizeOn="0" saturation="0"/>
         <rasterresampler maxOversampling="2"/>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer autoRefreshTime="0" readOnly="0" maxScale="100000" type="vector" minScale="1e+08" simplifyLocal="1" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" geometry="Line" simplifyDrawingHints="0" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" labelsEnabled="0">
+    <maplayer wkbType="MultiLineString" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" simplifyLocal="1" simplifyMaxScale="1" simplifyDrawingHints="0" simplifyDrawingTol="1" maxScale="100000" minScale="1e+08" readOnly="0" autoRefreshTime="0" labelsEnabled="0" simplifyAlgorithm="0" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" type="vector" geometry="Line">
       <extent>
         <xmin>18.37527226735897301</xmin>
         <ymin>-33.94586066151139647</ymin>
@@ -674,11 +674,11 @@
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" maxx="0" minz="0" miny="0" crs="" dimensions="2" maxz="0" minx="0"/>
+          <spatial crs="" dimensions="2" maxz="0" minx="0" maxy="0" minz="0" maxx="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -702,22 +702,22 @@
         <Removable>0</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" forceraster="0" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 type="RuleRenderer" enableorderby="0" symbollevels="0" forceraster="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule symbol="0" label="Active" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone|spac|constr)' )" key="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" description="Only show when active in Atlas" checkstate="0">
-            <rule symbol="1" label="21KM" filter="&quot;Distance&quot; = '21KM'" key="{13a555f1-0140-4584-9ca0-a5c3268249fa}" description="Only show when active in Atlas"/>
-            <rule symbol="2" label="10KM" filter="&quot;Distance&quot; = '10KM'" key="{3047fdca-b9ef-4659-af1a-dbbd7cd48473}" description="Only show when active in Atlas"/>
-            <rule symbol="3" label="5KM" filter="&quot;Distance&quot; = '5KM'" key="{915c5fda-fe09-44ca-bed3-6346c6df4966}" description="Only show when active in Atlas"/>
+          <rule checkstate="0" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone|spac|constr)' )" label="Active" description="Only show when active in Atlas" symbol="0" key="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}">
+            <rule filter="&quot;Distance&quot; = '21KM'" label="21KM" description="Only show when active in Atlas" symbol="1" key="{13a555f1-0140-4584-9ca0-a5c3268249fa}"/>
+            <rule filter="&quot;Distance&quot; = '10KM'" label="10KM" description="Only show when active in Atlas" symbol="2" key="{3047fdca-b9ef-4659-af1a-dbbd7cd48473}"/>
+            <rule filter="&quot;Distance&quot; = '5KM'" label="5KM" description="Only show when active in Atlas" symbol="3" key="{915c5fda-fe09-44ca-bed3-6346c6df4966}"/>
           </rule>
-          <rule label="All Routes" key="{5a375156-c44c-4982-93d6-82ae53deda3e}" description="Only show when active in Atlas" checkstate="0">
-            <rule symbol="4" label="21KM" filter="&quot;Distance&quot; = '21KM'" key="{bdaba96f-7e1b-4d42-b7dd-7e0ac1c340de}" description="Only show when active in Atlas" checkstate="0"/>
-            <rule symbol="5" label="10KM" filter="&quot;Distance&quot; = '10KM'" key="{189f7600-691f-4bc6-a9c0-bc9a9a18e5fa}" description="Only show when active in Atlas" checkstate="0"/>
-            <rule symbol="6" label="5KM" filter="&quot;Distance&quot; = '5KM'" key="{b026320a-2fe6-4a3f-85ba-a22f63a10db1}" description="Only show when active in Atlas" checkstate="0"/>
+          <rule checkstate="0" label="All Routes" description="Only show when active in Atlas" key="{5a375156-c44c-4982-93d6-82ae53deda3e}">
+            <rule checkstate="0" filter="&quot;Distance&quot; = '21KM'" label="21KM" description="Only show when active in Atlas" symbol="4" key="{bdaba96f-7e1b-4d42-b7dd-7e0ac1c340de}"/>
+            <rule checkstate="0" filter="&quot;Distance&quot; = '10KM'" label="10KM" description="Only show when active in Atlas" symbol="5" key="{189f7600-691f-4bc6-a9c0-bc9a9a18e5fa}"/>
+            <rule checkstate="0" filter="&quot;Distance&quot; = '5KM'" label="5KM" description="Only show when active in Atlas" symbol="6" key="{b026320a-2fe6-4a3f-85ba-a22f63a10db1}"/>
           </rule>
         </rules>
         <symbols>
-          <symbol name="0" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+          <symbol name="0" clip_to_extent="1" type="line" alpha="1" force_rhr="0">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -736,21 +736,21 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
+          <symbol name="1" clip_to_extent="1" type="line" alpha="1" force_rhr="0">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine">
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
               <prop v="MM" k="average_angle_unit"/>
@@ -768,24 +768,24 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <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 name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <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 name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@1@0" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="FilledMarker" locked="0">
+              <symbol name="@1@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+                <layer locked="0" pass="0" enabled="1" class="FilledMarker">
                   <prop v="0" k="angle"/>
                   <prop v="210,32,39,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -800,13 +800,13 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@1@0@0" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-                    <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+                  <symbol name="@@1@0@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill">
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="210,32,39,255" k="color"/>
                       <prop v="bevel" k="joinstyle"/>
@@ -820,9 +820,9 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -830,7 +830,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -849,13 +849,13 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine">
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
               <prop v="MM" k="average_angle_unit"/>
@@ -873,13 +873,13 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@1@2" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
+              <symbol name="@1@2" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker">
                   <prop v="0" k="angle"/>
                   <prop v="210,32,39,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -900,15 +900,15 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine">
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
               <prop v="MM" k="average_angle_unit"/>
@@ -926,13 +926,13 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@1@3" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
+              <symbol name="@1@3" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker">
                   <prop v="0" k="angle"/>
                   <prop v="210,32,39,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -953,17 +953,17 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
+          <symbol name="2" clip_to_extent="1" type="line" alpha="1" force_rhr="0">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine">
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
               <prop v="MM" k="average_angle_unit"/>
@@ -981,24 +981,24 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <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 name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <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 name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@0" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="FilledMarker" locked="0">
+              <symbol name="@2@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+                <layer locked="0" pass="0" enabled="1" class="FilledMarker">
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -1013,13 +1013,13 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@2@0@0" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-                    <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+                  <symbol name="@@2@0@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill">
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="103,34,144,255" k="color"/>
                       <prop v="bevel" k="joinstyle"/>
@@ -1033,9 +1033,9 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1043,7 +1043,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -1062,13 +1062,13 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine">
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
               <prop v="MM" k="average_angle_unit"/>
@@ -1086,13 +1086,13 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@2" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
+              <symbol name="@2@2" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker">
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -1113,15 +1113,15 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine">
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
               <prop v="MM" k="average_angle_unit"/>
@@ -1139,13 +1139,13 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@3" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
+              <symbol name="@2@3" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker">
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -1166,17 +1166,17 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
+          <symbol name="3" clip_to_extent="1" type="line" alpha="1" force_rhr="0">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine">
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
               <prop v="MM" k="average_angle_unit"/>
@@ -1194,24 +1194,24 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <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 name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <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 name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@3@0" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="FilledMarker" locked="0">
+              <symbol name="@3@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+                <layer locked="0" pass="0" enabled="1" class="FilledMarker">
                   <prop v="0" k="angle"/>
                   <prop v="145,211,55,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -1226,13 +1226,13 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@3@0@0" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-                    <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+                  <symbol name="@@3@0@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill">
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="145,211,55,255" k="color"/>
                       <prop v="bevel" k="joinstyle"/>
@@ -1246,9 +1246,9 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1256,7 +1256,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine">
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
               <prop v="MM" k="average_angle_unit"/>
@@ -1274,13 +1274,13 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@3@1" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
+              <symbol name="@3@1" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker">
                   <prop v="0" k="angle"/>
                   <prop v="145,211,55,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -1301,15 +1301,15 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine">
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
               <prop v="MM" k="average_angle_unit"/>
@@ -1327,13 +1327,13 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@3@2" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
+              <symbol name="@3@2" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker">
                   <prop v="0" k="angle"/>
                   <prop v="145,211,55,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -1354,15 +1354,15 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -1381,15 +1381,15 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="4" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
+          <symbol name="4" clip_to_extent="1" type="line" alpha="1" force_rhr="0">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine">
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
               <prop v="MM" k="average_angle_unit"/>
@@ -1407,24 +1407,24 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <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 name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <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 name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@4@0" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="FilledMarker" locked="0">
+              <symbol name="@4@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+                <layer locked="0" pass="0" enabled="1" class="FilledMarker">
                   <prop v="0" k="angle"/>
                   <prop v="210,32,39,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -1439,13 +1439,13 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@4@0@0" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-                    <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+                  <symbol name="@@4@0@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill">
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="210,32,39,255" k="color"/>
                       <prop v="bevel" k="joinstyle"/>
@@ -1459,9 +1459,9 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1469,7 +1469,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -1488,13 +1488,13 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine">
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
               <prop v="MM" k="average_angle_unit"/>
@@ -1512,13 +1512,13 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@4@2" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
+              <symbol name="@4@2" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker">
                   <prop v="0" k="angle"/>
                   <prop v="210,32,39,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -1539,15 +1539,15 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine">
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
               <prop v="MM" k="average_angle_unit"/>
@@ -1565,13 +1565,13 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@4@3" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
+              <symbol name="@4@3" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker">
                   <prop v="0" k="angle"/>
                   <prop v="210,32,39,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -1592,17 +1592,17 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol name="5" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
+          <symbol name="5" clip_to_extent="1" type="line" alpha="1" force_rhr="0">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine">
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
               <prop v="MM" k="average_angle_unit"/>
@@ -1620,24 +1620,24 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <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 name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <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 name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@5@0" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="FilledMarker" locked="0">
+              <symbol name="@5@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+                <layer locked="0" pass="0" enabled="1" class="FilledMarker">
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -1652,13 +1652,13 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@5@0@0" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-                    <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+                  <symbol name="@@5@0@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill">
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="103,34,144,255" k="color"/>
                       <prop v="bevel" k="joinstyle"/>
@@ -1672,9 +1672,9 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1682,7 +1682,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -1701,13 +1701,13 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine">
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
               <prop v="MM" k="average_angle_unit"/>
@@ -1725,13 +1725,13 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@5@2" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
+              <symbol name="@5@2" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker">
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -1752,15 +1752,15 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine">
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
               <prop v="MM" k="average_angle_unit"/>
@@ -1778,13 +1778,13 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@5@3" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
+              <symbol name="@5@3" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker">
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -1805,17 +1805,17 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol name="6" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
+          <symbol name="6" clip_to_extent="1" type="line" alpha="1" force_rhr="0">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine">
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
               <prop v="MM" k="average_angle_unit"/>
@@ -1833,24 +1833,24 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <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 name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <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 name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@6@0" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="FilledMarker" locked="0">
+              <symbol name="@6@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+                <layer locked="0" pass="0" enabled="1" class="FilledMarker">
                   <prop v="0" k="angle"/>
                   <prop v="145,211,55,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -1865,13 +1865,13 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@6@0@0" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-                    <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+                  <symbol name="@@6@0@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill">
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="145,211,55,255" k="color"/>
                       <prop v="bevel" k="joinstyle"/>
@@ -1885,9 +1885,9 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1895,7 +1895,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine">
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
               <prop v="MM" k="average_angle_unit"/>
@@ -1913,13 +1913,13 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@6@1" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
+              <symbol name="@6@1" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker">
                   <prop v="0" k="angle"/>
                   <prop v="145,211,55,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -1940,15 +1940,15 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine">
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
               <prop v="MM" k="average_angle_unit"/>
@@ -1966,13 +1966,13 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@6@2" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
+              <symbol name="@6@2" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker">
                   <prop v="0" k="angle"/>
                   <prop v="145,211,55,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -1993,15 +1993,15 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -2020,16 +2020,16 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <orderby>
-          <orderByClause asc="0" nullsFirst="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
+          <orderByClause nullsFirst="0" asc="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
         </orderby>
       </renderer-v2>
       <customproperties>
@@ -2042,21 +2042,21 @@
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minimumSize="0" opacity="1" penAlpha="255" penColor="#000000" enabled="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeType="MM" diagramOrientation="Up" labelPlacementMethod="XHeight" scaleBasedVisibility="0" width="15" minScaleDenominator="100000" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" barWidth="5" backgroundAlpha="255" lineSizeType="MM" penWidth="0">
+        <DiagramCategory lineSizeType="MM" minimumSize="0" rotationOffset="270" height="15" backgroundColor="#ffffff" barWidth="5" penColor="#000000" scaleDependency="Area" scaleBasedVisibility="0" diagramOrientation="Up" enabled="0" sizeType="MM" penWidth="0" opacity="1" labelPlacementMethod="XHeight" minScaleDenominator="100000" penAlpha="255" backgroundAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" width="15" maxScaleDenominator="1e+08">
           <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+          <attribute color="#000000" field="" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" priority="0" linePlacementFlags="2" placement="2" showAll="1" dist="0">
+      <DiagramLayerSettings showAll="1" placement="2" linePlacementFlags="2" priority="0" zIndex="0" dist="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -2065,8 +2065,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -2075,8 +2075,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -2085,8 +2085,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -2095,8 +2095,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -2105,8 +2105,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -2115,8 +2115,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -2125,8 +2125,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -2135,8 +2135,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -2145,8 +2145,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -2155,8 +2155,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -2189,46 +2189,46 @@
         <default expression="" applyOnUpdate="0" field="Source"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Name"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="descriptio"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="timestamp"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="begin"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="end"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Distance"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="RouteLen"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="length_m"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="length_km"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Source"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="Name" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="descriptio" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="timestamp" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="begin" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="end" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="Distance" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="RouteLen" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="length_m" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="length_km" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="Source" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="Name"/>
-        <constraint desc="" exp="" field="descriptio"/>
-        <constraint desc="" exp="" field="timestamp"/>
-        <constraint desc="" exp="" field="begin"/>
-        <constraint desc="" exp="" field="end"/>
-        <constraint desc="" exp="" field="Distance"/>
-        <constraint desc="" exp="" field="RouteLen"/>
-        <constraint desc="" exp="" field="length_m"/>
-        <constraint desc="" exp="" field="length_km"/>
-        <constraint desc="" exp="" field="Source"/>
+        <constraint field="Name" exp="" desc=""/>
+        <constraint field="descriptio" exp="" desc=""/>
+        <constraint field="timestamp" exp="" desc=""/>
+        <constraint field="begin" exp="" desc=""/>
+        <constraint field="end" exp="" desc=""/>
+        <constraint field="Distance" exp="" desc=""/>
+        <constraint field="RouteLen" exp="" desc=""/>
+        <constraint field="length_m" exp="" desc=""/>
+        <constraint field="length_km" exp="" desc=""/>
+        <constraint field="Source" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;Name&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;Name&quot;" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="Name" width="-1" hidden="0" type="field"/>
-          <column name="descriptio" width="-1" hidden="0" type="field"/>
-          <column name="timestamp" width="-1" hidden="0" type="field"/>
-          <column name="begin" width="163" hidden="0" type="field"/>
-          <column name="end" width="-1" hidden="0" type="field"/>
-          <column name="Distance" width="-1" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column name="RouteLen" width="-1" hidden="0" type="field"/>
-          <column name="length_m" width="-1" hidden="0" type="field"/>
-          <column name="length_km" width="-1" hidden="0" type="field"/>
-          <column name="Source" width="-1" hidden="0" type="field"/>
+          <column name="Name" hidden="0" type="field" width="-1"/>
+          <column name="descriptio" hidden="0" type="field" width="-1"/>
+          <column name="timestamp" hidden="0" type="field" width="-1"/>
+          <column name="begin" hidden="0" type="field" width="163"/>
+          <column name="end" hidden="0" type="field" width="-1"/>
+          <column name="Distance" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="RouteLen" hidden="0" type="field" width="-1"/>
+          <column name="length_m" hidden="0" type="field" width="-1"/>
+          <column name="length_km" hidden="0" type="field" width="-1"/>
+          <column name="Source" hidden="0" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -2286,7 +2286,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" readOnly="0" maxScale="0" type="vector" minScale="1e+08" simplifyLocal="1" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" geometry="Line" simplifyDrawingHints="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" labelsEnabled="0">
+    <maplayer wkbType="MultiLineString" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" simplifyLocal="1" simplifyMaxScale="1" simplifyDrawingHints="1" simplifyDrawingTol="1" maxScale="0" minScale="1e+08" readOnly="0" autoRefreshTime="0" labelsEnabled="0" simplifyAlgorithm="0" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" type="vector" geometry="Line">
       <extent>
         <xmin>17.99958333333333371</xmin>
         <ymin>-34.00041666666666629</ymin>
@@ -2330,7 +2330,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -2350,10 +2350,10 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" forceraster="0" enableorderby="0" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" enableorderby="0" symbollevels="0" forceraster="0">
         <symbols>
-          <symbol name="0" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+          <symbol name="0" clip_to_extent="1" type="line" alpha="1" force_rhr="0">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -2372,9 +2372,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -2387,7 +2387,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -2427,20 +2427,20 @@ def my_form_open(dialog, layer, feature):
         <default expression="" applyOnUpdate="0" field="elevation"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="ID"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="height"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="elevation"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="ID" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="height" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="elevation" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="ID"/>
-        <constraint desc="" exp="" field="height"/>
-        <constraint desc="" exp="" field="elevation"/>
+        <constraint field="ID" exp="" desc=""/>
+        <constraint field="height" exp="" desc=""/>
+        <constraint field="elevation" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -2460,7 +2460,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" readOnly="0" maxScale="0" type="vector" minScale="1e+08" simplifyLocal="1" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" geometry="Line" simplifyDrawingHints="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" labelsEnabled="1">
+    <maplayer wkbType="MultiLineString" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" simplifyLocal="1" simplifyMaxScale="1" simplifyDrawingHints="1" simplifyDrawingTol="1" maxScale="0" minScale="1e+08" readOnly="0" autoRefreshTime="0" labelsEnabled="1" simplifyAlgorithm="0" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" type="vector" geometry="Line">
       <extent>
         <xmin>18.41275838185438474</xmin>
         <ymin>-33.90124710387746632</ymin>
@@ -2513,11 +2513,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" maxx="0" minz="0" miny="0" crs="" dimensions="2" maxz="0" minx="0"/>
+          <spatial crs="" dimensions="2" maxz="0" minx="0" maxy="0" minz="0" maxx="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -2541,10 +2541,10 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" forceraster="0" enableorderby="0" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" enableorderby="0" symbollevels="0" forceraster="0">
         <symbols>
-          <symbol name="0" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+          <symbol name="0" clip_to_extent="1" type="line" alpha="1" force_rhr="0">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -2563,9 +2563,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -2576,20 +2576,20 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" fontSize="10" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="1" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="0" fontStrikeout="0" fieldName="Name" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-            <text-buffer bufferSizeUnits="MM" bufferDraw="1" bufferNoFill="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-            <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeJoinStyle="64" shapeRadiiY="0" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+          <text-style fontCapitals="0" blendMode="0" fontUnderline="0" isExpression="0" fontLetterSpacing="0" textOpacity="1" fontFamily="Myriad Pro" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" useSubstitutions="0" fieldName="Name" fontSizeUnit="Point" textColor="0,0,0,255" fontWeight="63" multilineHeight="1" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSize="10" fontStrikeout="0" fontItalic="0">
+            <text-buffer bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255"/>
+            <background shapeSizeX="0" shapeRadiiUnit="MM" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBlendMode="0" shapeSizeUnit="MM" shapeSizeY="0" shapeSizeType="0" shapeBorderWidth="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeRotation="0" shapeOffsetX="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeRadiiY="0" shapeRadiiX="0" shapeOffsetY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOpacity="0.7" shadowScale="100" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowRadius="1.5" shadowRadiusUnit="MM" shadowUnder="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
             <substitutions/>
           </text-style>
-          <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-          <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="2" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="LineGeometry" geometryGenerator="" priority="5" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MM" dist="2" maxCurvedCharAngleIn="25" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-          <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="0" displayAll="0" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="0" scaleVisibility="0" obstacleFactor="1" fontMaxPixelSize="10000" obstacleType="0"/>
+          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" decimals="3" plussign="0" wrapChar="" reverseDirectionSymbol="0" multilineAlign="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" addDirectionSymbol="0" autoWrapLength="0"/>
+          <placement centroidInside="0" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" preserveRotation="1" quadOffset="4" offsetUnits="MM" geometryGeneratorType="LineGeometry" placementFlags="10" maxCurvedCharAngleIn="25" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-25" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="2" xOffset="0" priority="5" yOffset="0" geometryGenerator="" distUnits="MM" placement="2" offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering mergeLines="0" displayAll="0" obstacleType="0" scaleVisibility="0" obstacle="1" fontMaxPixelSize="10000" fontLimitPixelSize="0" obstacleFactor="1" drawLabels="1" labelPerPart="0" limitNumLabels="0" minFeatureSize="0" upsidedownLabels="0" zIndex="0" maxNumLabels="2000" scaleMax="0" scaleMin="0" fontMinPixelSize="3"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </settings>
@@ -2604,21 +2604,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minimumSize="0" opacity="1" penAlpha="255" penColor="#000000" enabled="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeType="MM" diagramOrientation="Up" labelPlacementMethod="XHeight" scaleBasedVisibility="0" width="15" minScaleDenominator="0" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" barWidth="5" backgroundAlpha="255" lineSizeType="MM" penWidth="0">
+        <DiagramCategory lineSizeType="MM" minimumSize="0" rotationOffset="270" height="15" backgroundColor="#ffffff" barWidth="5" penColor="#000000" scaleDependency="Area" scaleBasedVisibility="0" diagramOrientation="Up" enabled="0" sizeType="MM" penWidth="0" opacity="1" labelPlacementMethod="XHeight" minScaleDenominator="0" penAlpha="255" backgroundAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" width="15" maxScaleDenominator="1e+08">
           <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+          <attribute color="#000000" field="" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" priority="0" linePlacementFlags="18" placement="2" showAll="1" dist="0">
+      <DiagramLayerSettings showAll="1" placement="2" linePlacementFlags="18" priority="0" zIndex="0" dist="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -2649,22 +2649,22 @@ def my_form_open(dialog, layer, feature):
         <default expression="" applyOnUpdate="0" field="Name"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="id"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Name"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="id" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="Name" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="Name"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="Name" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="id" width="-1" hidden="0" type="field"/>
-          <column name="Name" width="-1" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
+          <column name="id" hidden="0" type="field" width="-1"/>
+          <column name="Name" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -2706,7 +2706,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>Name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" readOnly="0" maxScale="100000" type="vector" minScale="1e+08" simplifyLocal="1" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" geometry="Line" simplifyDrawingHints="0" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" labelsEnabled="0">
+    <maplayer wkbType="MultiLineString" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" simplifyLocal="1" simplifyMaxScale="1" simplifyDrawingHints="0" simplifyDrawingTol="1" maxScale="100000" minScale="1e+08" readOnly="0" autoRefreshTime="0" labelsEnabled="0" simplifyAlgorithm="0" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" type="vector" geometry="Line">
       <extent>
         <xmin>18.40809079999998588</xmin>
         <ymin>-33.90827185075657724</ymin>
@@ -2750,7 +2750,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -2770,15 +2770,15 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" forceraster="0" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 type="RuleRenderer" enableorderby="0" symbollevels="0" forceraster="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule symbol="0" label="21KM" filter="&quot;distance&quot; = '21KM'" key="{85adf11b-f941-44b6-8847-c828ab845cdc}" description="Only show when active in Atlas"/>
-          <rule symbol="1" label="10KM" filter="&quot;distance&quot; = '10KM'" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" description="Only show when active in Atlas"/>
-          <rule symbol="2" label="5KM" filter="&quot;distance&quot; = '5KM'" key="{cf733f0f-ab72-441e-b213-841aa39c1671}" description="Only show when active in Atlas"/>
+          <rule filter="&quot;distance&quot; = '21KM'" label="21KM" description="Only show when active in Atlas" symbol="0" key="{85adf11b-f941-44b6-8847-c828ab845cdc}"/>
+          <rule filter="&quot;distance&quot; = '10KM'" label="10KM" description="Only show when active in Atlas" symbol="1" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}"/>
+          <rule filter="&quot;distance&quot; = '5KM'" label="5KM" description="Only show when active in Atlas" symbol="2" key="{cf733f0f-ab72-441e-b213-841aa39c1671}"/>
         </rules>
         <symbols>
-          <symbol name="0" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
+          <symbol name="0" clip_to_extent="1" type="line" alpha="1" force_rhr="0">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine">
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
               <prop v="MM" k="average_angle_unit"/>
@@ -2796,13 +2796,13 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@0@0" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
+              <symbol name="@0@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker">
                   <prop v="0" k="angle"/>
                   <prop v="210,32,39,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -2823,15 +2823,15 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine">
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
               <prop v="MM" k="average_angle_unit"/>
@@ -2849,24 +2849,24 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@0@1" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="FilledMarker" locked="0">
+              <symbol name="@0@1" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+                <layer locked="0" pass="0" enabled="1" class="FilledMarker">
                   <prop v="0" k="angle"/>
                   <prop v="210,32,39,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -2881,13 +2881,13 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@0@1@0" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-                    <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+                  <symbol name="@@0@1@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill">
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="210,32,39,255" k="color"/>
                       <prop v="bevel" k="joinstyle"/>
@@ -2901,9 +2901,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2911,7 +2911,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine">
               <prop v="flat" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -2930,15 +2930,15 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
+          <symbol name="1" clip_to_extent="1" type="line" alpha="1" force_rhr="0">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine">
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
               <prop v="MM" k="average_angle_unit"/>
@@ -2956,24 +2956,24 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@1@0" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="FilledMarker" locked="0">
+              <symbol name="@1@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+                <layer locked="0" pass="0" enabled="1" class="FilledMarker">
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -2988,13 +2988,13 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@1@0@0" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-                    <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+                  <symbol name="@@1@0@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill">
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="103,34,144,255" k="color"/>
                       <prop v="miter" k="joinstyle"/>
@@ -3008,9 +3008,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3018,7 +3018,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine">
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
               <prop v="MM" k="average_angle_unit"/>
@@ -3036,24 +3036,24 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@1@1" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="FilledMarker" locked="0">
+              <symbol name="@1@1" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+                <layer locked="0" pass="0" enabled="1" class="FilledMarker">
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -3068,13 +3068,13 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@1@1@0" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-                    <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+                  <symbol name="@@1@1@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill">
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="103,34,144,255" k="color"/>
                       <prop v="bevel" k="joinstyle"/>
@@ -3088,9 +3088,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3098,7 +3098,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine">
               <prop v="flat" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -3117,15 +3117,15 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
+          <symbol name="2" clip_to_extent="1" type="line" alpha="1" force_rhr="0">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine">
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
               <prop v="MM" k="average_angle_unit"/>
@@ -3143,24 +3143,24 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@0" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="FilledMarker" locked="0">
+              <symbol name="@2@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+                <layer locked="0" pass="0" enabled="1" class="FilledMarker">
                   <prop v="0" k="angle"/>
                   <prop v="69,100,25,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -3175,13 +3175,13 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@2@0@0" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-                    <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+                  <symbol name="@@2@0@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill">
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="69,100,25,255" k="color"/>
                       <prop v="miter" k="joinstyle"/>
@@ -3195,9 +3195,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3205,7 +3205,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine">
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
               <prop v="MM" k="average_angle_unit"/>
@@ -3223,24 +3223,24 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@1" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="FilledMarker" locked="0">
+              <symbol name="@2@1" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+                <layer locked="0" pass="0" enabled="1" class="FilledMarker">
                   <prop v="0" k="angle"/>
                   <prop v="69,100,25,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -3255,13 +3255,13 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@2@1@0" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-                    <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+                  <symbol name="@@2@1@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill">
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="69,100,25,255" k="color"/>
                       <prop v="bevel" k="joinstyle"/>
@@ -3275,9 +3275,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3285,7 +3285,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine">
               <prop v="flat" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -3304,16 +3304,16 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <orderby>
-          <orderByClause asc="0" nullsFirst="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
+          <orderByClause nullsFirst="0" asc="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
         </orderby>
       </renderer-v2>
       <customproperties>
@@ -3326,21 +3326,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minimumSize="0" opacity="1" penAlpha="255" penColor="#000000" enabled="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeType="MM" diagramOrientation="Up" labelPlacementMethod="XHeight" scaleBasedVisibility="0" width="15" minScaleDenominator="100000" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" barWidth="5" backgroundAlpha="255" lineSizeType="MM" penWidth="0">
+        <DiagramCategory lineSizeType="MM" minimumSize="0" rotationOffset="270" height="15" backgroundColor="#ffffff" barWidth="5" penColor="#000000" scaleDependency="Area" scaleBasedVisibility="0" diagramOrientation="Up" enabled="0" sizeType="MM" penWidth="0" opacity="1" labelPlacementMethod="XHeight" minScaleDenominator="100000" penAlpha="255" backgroundAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" width="15" maxScaleDenominator="1e+08">
           <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+          <attribute color="#000000" field="" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" priority="0" linePlacementFlags="2" placement="2" showAll="1" dist="0">
+      <DiagramLayerSettings showAll="1" placement="2" linePlacementFlags="2" priority="0" zIndex="0" dist="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -3356,8 +3356,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -3374,22 +3374,22 @@ def my_form_open(dialog, layer, feature):
         <default expression="" applyOnUpdate="0" field="Distance"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="id"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Distance"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="id" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="Distance" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="Distance"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="Distance" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;Distance&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;Distance&quot;" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="Distance" width="-1" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column name="id" width="-1" hidden="0" type="field"/>
+          <column name="Distance" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="id" hidden="0" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3449,7 +3449,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" readOnly="0" maxScale="100000" type="vector" minScale="1e+08" simplifyLocal="1" wkbType="Point" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" geometry="Point" simplifyDrawingHints="0" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" labelsEnabled="1">
+    <maplayer wkbType="Point" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" simplifyLocal="1" simplifyMaxScale="1" simplifyDrawingHints="0" simplifyDrawingTol="1" maxScale="100000" minScale="1e+08" readOnly="0" autoRefreshTime="0" labelsEnabled="1" simplifyAlgorithm="0" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" type="vector" geometry="Point">
       <extent>
         <xmin>18.38517016505928936</xmin>
         <ymin>-33.91987011678683217</ymin>
@@ -3493,7 +3493,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -3513,10 +3513,10 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" forceraster="0" enableorderby="0" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" enableorderby="0" symbollevels="0" forceraster="0">
         <symbols>
-          <symbol name="0" alpha="0.796078" force_rhr="0" clip_to_extent="1" type="marker">
-            <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
+          <symbol name="0" clip_to_extent="1" type="marker" alpha="0.796078" force_rhr="0">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker">
               <prop v="0" k="angle"/>
               <prop v="227,0,185,255" k="color"/>
               <prop v="1" k="horizontal_anchor_point"/>
@@ -3537,15 +3537,15 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="size" type="Map">
-                      <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 name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -3556,89 +3556,89 @@ 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 filter="'marshal' = attribute( $atlasfeature , 'type' )" description="Show in marshal maps" key="{9ea624c1-7179-4746-8777-84b8008475a1}">
             <settings>
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" fontSize="8" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="1" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="0" fontStrikeout="0" fieldName="position" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-                <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="0,0,0,255" shapeType="3" shapeJoinStyle="64" shapeRadiiY="0" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="0" shapeBorderWidth="0.4" shapeSizeY="0.2" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="0.2" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+              <text-style fontCapitals="0" blendMode="0" fontUnderline="0" isExpression="0" fontLetterSpacing="0" textOpacity="1" fontFamily="Myriad Pro" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" useSubstitutions="0" fieldName="position" fontSizeUnit="Point" textColor="0,0,0,255" fontWeight="63" multilineHeight="1" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSize="8" fontStrikeout="0" fontItalic="0">
+                <text-buffer bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255"/>
+                <background shapeSizeX="0.2" shapeRadiiUnit="MM" shapeBorderColor="0,0,0,255" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBlendMode="0" shapeSizeUnit="MM" shapeSizeY="0.2" shapeSizeType="0" shapeBorderWidth="0.4" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeRotation="0" shapeOffsetX="0" shapeFillColor="255,255,255,255" shapeType="3" shapeOffsetUnit="MM" shapeRotationType="0" shapeRadiiY="0" shapeRadiiX="0" shapeOffsetY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOpacity="0.7" shadowScale="100" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowRadius="1.5" shadowRadiusUnit="MM" shadowUnder="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-              <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="1" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="8" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="0" maxCurvedCharAngleIn="20" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-              <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="1" scaleVisibility="0" obstacleFactor="1" fontMaxPixelSize="10000" obstacleType="0"/>
+              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" decimals="3" plussign="0" wrapChar="" reverseDirectionSymbol="0" multilineAlign="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" addDirectionSymbol="0" autoWrapLength="0"/>
+              <placement centroidInside="0" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" preserveRotation="1" quadOffset="4" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" placementFlags="10" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="0" xOffset="0" priority="8" yOffset="0" geometryGenerator="" distUnits="MM" placement="1" offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering mergeLines="0" displayAll="1" obstacleType="0" scaleVisibility="0" obstacle="1" fontMaxPixelSize="10000" fontLimitPixelSize="0" obstacleFactor="1" drawLabels="1" labelPerPart="0" limitNumLabels="0" minFeatureSize="0" upsidedownLabels="0" zIndex="0" maxNumLabels="2000" scaleMax="10000000" scaleMin="1" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="FontStyle" type="Map">
-                      <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 name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="ObstacleFactor" type="Map">
-                      <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 name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="Priority" type="Map">
-                      <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 name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <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 name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="Size" type="Map">
-                      <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 name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="ZIndex" type="Map">
-                      <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 name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </settings>
           </rule>
-          <rule filter="'marshal plan' = attribute( $atlasfeature , 'type' )" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}" description="Show in marshal overview">
+          <rule filter="'marshal plan' = attribute( $atlasfeature , 'type' )" description="Show in marshal overview" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}">
             <settings>
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="227,0,185,255" fontSize="4" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="0.9" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="0" fontStrikeout="0" fieldName="position" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-                <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="0,0,0,255" shapeType="3" shapeJoinStyle="64" shapeRadiiY="0" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="0" shapeBorderWidth="0.1" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="0.5" shapeSVGFile="" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+              <text-style fontCapitals="0" blendMode="0" fontUnderline="0" isExpression="0" fontLetterSpacing="0" textOpacity="0.9" fontFamily="Myriad Pro" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" useSubstitutions="0" fieldName="position" fontSizeUnit="Point" textColor="227,0,185,255" fontWeight="63" multilineHeight="1" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSize="4" fontStrikeout="0" fontItalic="0">
+                <text-buffer bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255"/>
+                <background shapeSizeX="0" shapeRadiiUnit="MM" shapeBorderColor="0,0,0,255" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBlendMode="0" shapeSizeUnit="MM" shapeSizeY="0" shapeSizeType="0" shapeBorderWidth="0.1" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.5" shapeRotation="0" shapeOffsetX="0" shapeFillColor="255,255,255,255" shapeType="3" shapeOffsetUnit="MM" shapeRotationType="0" shapeRadiiY="0" shapeRadiiX="0" shapeOffsetY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOpacity="0.7" shadowScale="100" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowRadius="1.5" shadowRadiusUnit="MM" shadowUnder="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-              <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="6" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="10" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="1" maxCurvedCharAngleIn="20" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-              <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="2" fontMinPixelSize="3" limitNumLabels="0" obstacle="0" scaleMin="1" scaleVisibility="0" obstacleFactor="1" fontMaxPixelSize="10000" obstacleType="0"/>
+              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" decimals="3" plussign="0" wrapChar="" reverseDirectionSymbol="0" multilineAlign="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" addDirectionSymbol="0" autoWrapLength="0"/>
+              <placement centroidInside="0" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" preserveRotation="1" quadOffset="4" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" placementFlags="10" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="1" xOffset="0" priority="10" yOffset="0" geometryGenerator="" distUnits="MM" placement="6" offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering mergeLines="0" displayAll="1" obstacleType="0" scaleVisibility="0" obstacle="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" obstacleFactor="1" drawLabels="1" labelPerPart="0" limitNumLabels="0" minFeatureSize="0" upsidedownLabels="0" zIndex="2" maxNumLabels="2000" scaleMax="10000000" scaleMin="1" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="FontStyle" type="Map">
-                      <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 name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <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 name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="Size" type="Map">
-                      <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 name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </settings>
@@ -3789,21 +3789,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minimumSize="0" opacity="1" penAlpha="255" penColor="#000000" enabled="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeType="MM" diagramOrientation="Up" labelPlacementMethod="XHeight" scaleBasedVisibility="0" width="15" minScaleDenominator="100000" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" barWidth="5" backgroundAlpha="255" lineSizeType="MM" penWidth="0">
+        <DiagramCategory lineSizeType="MM" minimumSize="0" rotationOffset="270" height="15" backgroundColor="#ffffff" barWidth="5" penColor="#000000" scaleDependency="Area" scaleBasedVisibility="0" diagramOrientation="Up" enabled="0" sizeType="MM" penWidth="0" opacity="1" labelPlacementMethod="XHeight" minScaleDenominator="100000" penAlpha="255" backgroundAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" width="15" maxScaleDenominator="1e+08">
           <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+          <attribute color="#000000" field="" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" priority="0" linePlacementFlags="10" placement="0" showAll="1" dist="0">
+      <DiagramLayerSettings showAll="1" placement="0" linePlacementFlags="10" priority="0" zIndex="0" dist="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -3812,8 +3812,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -3822,8 +3822,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -3832,8 +3832,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -3852,25 +3852,25 @@ def my_form_open(dialog, layer, feature):
         <default expression="" applyOnUpdate="0" field="type"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="id"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="position"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="type"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="id" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="position" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="type" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="position"/>
-        <constraint desc="" exp="" field="type"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="position" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;position&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;position&quot;" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="id" width="-1" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column name="position" width="-1" hidden="0" type="field"/>
-          <column name="type" width="-1" hidden="0" type="field"/>
+          <column name="id" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="position" hidden="0" type="field" width="-1"/>
+          <column name="type" hidden="0" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3943,7 +3943,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" readOnly="0" maxScale="0" type="vector" minScale="1e+08" simplifyLocal="1" wkbType="Polygon" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" geometry="Polygon" simplifyDrawingHints="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" labelsEnabled="0">
+    <maplayer wkbType="Polygon" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" simplifyLocal="1" simplifyMaxScale="1" simplifyDrawingHints="1" simplifyDrawingTol="1" maxScale="0" minScale="1e+08" readOnly="0" autoRefreshTime="0" labelsEnabled="0" simplifyAlgorithm="0" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" type="vector" geometry="Polygon">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94583431338720203</ymin>
@@ -3987,7 +3987,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -4009,10 +4009,10 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" forceraster="0" enableorderby="0" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" enableorderby="0" symbollevels="0" forceraster="0">
         <symbols>
-          <symbol name="0" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-            <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+          <symbol name="0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill">
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="56,128,54,255" k="color"/>
               <prop v="bevel" k="joinstyle"/>
@@ -4026,9 +4026,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="f_diagonal" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -4047,21 +4047,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minimumSize="0" opacity="1" penAlpha="255" penColor="#000000" enabled="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeType="MM" diagramOrientation="Up" labelPlacementMethod="XHeight" scaleBasedVisibility="0" width="15" minScaleDenominator="0" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" barWidth="5" backgroundAlpha="255" lineSizeType="MM" penWidth="0">
+        <DiagramCategory lineSizeType="MM" minimumSize="0" rotationOffset="270" height="15" backgroundColor="#ffffff" barWidth="5" penColor="#000000" scaleDependency="Area" scaleBasedVisibility="0" diagramOrientation="Up" enabled="0" sizeType="MM" penWidth="0" opacity="1" labelPlacementMethod="XHeight" minScaleDenominator="0" penAlpha="255" backgroundAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" width="15" maxScaleDenominator="1e+08">
           <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+          <attribute color="#000000" field="" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" priority="0" linePlacementFlags="18" placement="1" showAll="1" dist="0">
+      <DiagramLayerSettings showAll="1" placement="1" linePlacementFlags="18" priority="0" zIndex="0" dist="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -4137,37 +4137,37 @@ def my_form_open(dialog, layer, feature):
         <default expression="" applyOnUpdate="0" field="hidden"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="id"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="group"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="comment"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="moveable"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="type"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="name"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="hidden"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="id" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="group" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="comment" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="moveable" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="type" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="name" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="hidden" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="group"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="moveable"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="hidden"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="group" exp="" desc=""/>
+        <constraint field="comment" exp="" desc=""/>
+        <constraint field="moveable" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
+        <constraint field="name" exp="" desc=""/>
+        <constraint field="hidden" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;group&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;group&quot;" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column width="-1" hidden="1" type="actions"/>
-          <column name="group" width="-1" hidden="0" type="field"/>
-          <column name="name" width="-1" hidden="0" type="field"/>
-          <column name="id" width="-1" hidden="0" type="field"/>
-          <column name="comment" width="-1" hidden="0" type="field"/>
-          <column name="moveable" width="-1" hidden="0" type="field"/>
-          <column name="type" width="-1" hidden="0" type="field"/>
-          <column name="hidden" width="-1" hidden="0" type="field"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="group" hidden="0" type="field" width="-1"/>
+          <column name="name" hidden="0" type="field" width="-1"/>
+          <column name="id" hidden="0" type="field" width="-1"/>
+          <column name="comment" hidden="0" type="field" width="-1"/>
+          <column name="moveable" hidden="0" type="field" width="-1"/>
+          <column name="type" hidden="0" type="field" width="-1"/>
+          <column name="hidden" hidden="0" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -4219,7 +4219,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" readOnly="0" maxScale="0" type="vector" minScale="1e+08" simplifyLocal="1" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" geometry="Line" simplifyDrawingHints="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" labelsEnabled="1">
+    <maplayer wkbType="MultiLineString" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" simplifyLocal="1" simplifyMaxScale="1" simplifyDrawingHints="1" simplifyDrawingTol="1" maxScale="0" minScale="1e+08" readOnly="0" autoRefreshTime="0" labelsEnabled="1" simplifyAlgorithm="0" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" type="vector" geometry="Line">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94583431338720203</ymin>
@@ -4272,11 +4272,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" maxx="0" minz="0" miny="0" crs="" dimensions="2" maxz="0" minx="0"/>
+          <spatial crs="" dimensions="2" maxz="0" minx="0" maxy="0" minz="0" maxx="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -4300,17 +4300,17 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="1" forceraster="0" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 type="RuleRenderer" enableorderby="0" symbollevels="1" forceraster="0">
         <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-          <rule symbol="0" label="Cones" filter="regexp_match(&quot;type&quot;, '^cone')" key="{b3b38ee9-c245-4839-b078-3b966a2a5c4e}"/>
-          <rule symbol="1" label="Moveable fences" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1'" key="{9da1c54c-0ca9-4db9-a722-ce3f53ccd358}"/>
-          <rule symbol="2" label="Fixed fences" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1'" key="{bb4463e8-e33a-4475-878c-fd2d7b636418}"/>
-          <rule symbol="3" label="Construction" filter="regexp_match(&quot;type&quot;, '^constr')" key="{bb4463e8-e33a-4475-878c-fd2d7b636418}"/>
-          <rule symbol="4" label="Visible" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}"/>
+          <rule filter="regexp_match(&quot;type&quot;, '^cone')" label="Cones" symbol="0" key="{b3b38ee9-c245-4839-b078-3b966a2a5c4e}"/>
+          <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1'" label="Moveable fences" symbol="1" key="{9da1c54c-0ca9-4db9-a722-ce3f53ccd358}"/>
+          <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1'" label="Fixed fences" symbol="2" key="{bb4463e8-e33a-4475-878c-fd2d7b636418}"/>
+          <rule filter="regexp_match(&quot;type&quot;, '^constr')" label="Construction" symbol="3" key="{bb4463e8-e33a-4475-878c-fd2d7b636418}"/>
+          <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" label="Visible" symbol="4" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}"/>
         </rules>
         <symbols>
-          <symbol name="0" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+          <symbol name="0" clip_to_extent="1" type="line" alpha="1" force_rhr="0">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine">
               <prop v="round" k="capstyle"/>
               <prop v="1;4" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -4329,21 +4329,21 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#64ffff00', '#ffffff00' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#64ffff00', '#ffffff00' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+          <symbol name="1" clip_to_extent="1" type="line" alpha="1" force_rhr="0">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine">
               <prop v="round" k="capstyle"/>
               <prop v="4;3" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -4362,21 +4362,21 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#64ffff00', '#ffffff00' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#64ffff00', '#ffffff00' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+          <symbol name="2" clip_to_extent="1" type="line" alpha="1" force_rhr="0">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -4395,21 +4395,21 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#64ffff00', '#ffffff00' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#64ffff00', '#ffffff00' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+          <symbol name="3" clip_to_extent="1" type="line" alpha="1" force_rhr="0">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -4428,21 +4428,21 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <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 name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="4" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+          <symbol name="4" clip_to_extent="1" type="line" alpha="1" force_rhr="0">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -4461,9 +4461,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -4474,40 +4474,40 @@ def my_form_open(dialog, layer, feature):
         <rules key="{64e74156-92e1-4467-bc99-bfb62ea5d763}">
           <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{6b07fb50-64b4-4036-9b56-608851603e72}">
             <settings>
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" fontSize="11" namedStyle="Regular" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="0.8" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="0" fontStrikeout="0" fieldName="comment" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="50" useSubstitutions="0">
-                <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="255,0,0,255" shapeType="0" shapeJoinStyle="128" shapeRadiiY="1" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="1" shapeBorderWidth="0.6" shapeSizeY="1" shapeOffsetUnit="MM" shapeOpacity="0.6" shapeSVGFile="" shapeSizeX="1" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+              <text-style fontCapitals="0" blendMode="0" fontUnderline="0" isExpression="0" fontLetterSpacing="0" textOpacity="0.8" fontFamily="Myriad Pro" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Regular" useSubstitutions="0" fieldName="comment" fontSizeUnit="Point" textColor="0,0,0,255" fontWeight="50" multilineHeight="1" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSize="11" fontStrikeout="0" fontItalic="0">
+                <text-buffer bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255"/>
+                <background shapeSizeX="1" shapeRadiiUnit="MM" shapeBorderColor="255,0,0,255" shapeJoinStyle="128" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBlendMode="0" shapeSizeUnit="MM" shapeSizeY="1" shapeSizeType="0" shapeBorderWidth="0.6" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.6" shapeRotation="0" shapeOffsetX="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeRadiiY="1" shapeRadiiX="1" shapeOffsetY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOpacity="0.7" shadowScale="100" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowRadius="1.5" shadowRadiusUnit="MM" shadowUnder="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="4294967295" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-              <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="2" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="2" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="5" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MM" dist="5" maxCurvedCharAngleIn="25" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-              <rendering drawLabels="1" maxNumLabels="2000" mergeLines="1" labelPerPart="0" scaleMax="0" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="0" scaleVisibility="0" obstacleFactor="1" fontMaxPixelSize="10000" obstacleType="0"/>
+              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" decimals="3" plussign="0" wrapChar="" reverseDirectionSymbol="0" multilineAlign="4294967295" formatNumbers="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" addDirectionSymbol="0" autoWrapLength="0"/>
+              <placement centroidInside="0" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" preserveRotation="1" quadOffset="4" offsetUnits="MM" geometryGeneratorType="PointGeometry" placementFlags="2" maxCurvedCharAngleIn="25" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-25" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="5" xOffset="0" priority="5" yOffset="0" geometryGenerator="" distUnits="MM" placement="2" offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering mergeLines="1" displayAll="1" obstacleType="0" scaleVisibility="0" obstacle="1" fontMaxPixelSize="10000" fontLimitPixelSize="0" obstacleFactor="1" drawLabels="1" labelPerPart="0" limitNumLabels="0" minFeatureSize="0" upsidedownLabels="0" zIndex="0" maxNumLabels="2000" scaleMax="0" scaleMin="0" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </settings>
           </rule>
           <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{41e7a99c-d385-4b8e-9484-4c3d8f4a12cf}">
             <settings>
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" fontSize="12" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="1" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="1" fontStrikeout="0" fieldName="round( $length, 0) || 'm'" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-                <text-buffer bufferSizeUnits="MM" bufferDraw="1" bufferNoFill="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeJoinStyle="64" shapeRadiiY="0" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+              <text-style fontCapitals="0" blendMode="0" fontUnderline="0" isExpression="1" fontLetterSpacing="0" textOpacity="1" fontFamily="Myriad Pro" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" useSubstitutions="0" fieldName="round( $length, 0) || 'm'" fontSizeUnit="Point" textColor="0,0,0,255" fontWeight="63" multilineHeight="1" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSize="12" fontStrikeout="0" fontItalic="0">
+                <text-buffer bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255"/>
+                <background shapeSizeX="0" shapeRadiiUnit="MM" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBlendMode="0" shapeSizeUnit="MM" shapeSizeY="0" shapeSizeType="0" shapeBorderWidth="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeRotation="0" shapeOffsetX="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeRadiiY="0" shapeRadiiX="0" shapeOffsetY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOpacity="0.7" shadowScale="100" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowRadius="1.5" shadowRadiusUnit="MM" shadowUnder="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="4294967295" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-              <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="2" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="15" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="5" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MM" dist="1" maxCurvedCharAngleIn="25" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-              <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="0" displayAll="0" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="0" scaleVisibility="0" obstacleFactor="1" fontMaxPixelSize="10000" obstacleType="0"/>
+              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" decimals="3" plussign="0" wrapChar="" reverseDirectionSymbol="0" multilineAlign="4294967295" formatNumbers="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" addDirectionSymbol="0" autoWrapLength="0"/>
+              <placement centroidInside="0" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" preserveRotation="1" quadOffset="4" offsetUnits="MM" geometryGeneratorType="PointGeometry" placementFlags="15" maxCurvedCharAngleIn="25" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-25" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="1" xOffset="0" priority="5" yOffset="0" geometryGenerator="" distUnits="MM" placement="2" offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering mergeLines="0" displayAll="0" obstacleType="0" scaleVisibility="0" obstacle="1" fontMaxPixelSize="10000" fontLimitPixelSize="0" obstacleFactor="1" drawLabels="1" labelPerPart="0" limitNumLabels="0" minFeatureSize="0" upsidedownLabels="0" zIndex="0" maxNumLabels="2000" scaleMax="0" scaleMin="0" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </settings>
@@ -4524,21 +4524,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minimumSize="0" opacity="1" penAlpha="255" penColor="#000000" enabled="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeType="MM" diagramOrientation="Up" labelPlacementMethod="XHeight" scaleBasedVisibility="0" width="15" minScaleDenominator="0" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" barWidth="5" backgroundAlpha="255" lineSizeType="MM" penWidth="0">
+        <DiagramCategory lineSizeType="MM" minimumSize="0" rotationOffset="270" height="15" backgroundColor="#ffffff" barWidth="5" penColor="#000000" scaleDependency="Area" scaleBasedVisibility="0" diagramOrientation="Up" enabled="0" sizeType="MM" penWidth="0" opacity="1" labelPlacementMethod="XHeight" minScaleDenominator="0" penAlpha="255" backgroundAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" width="15" maxScaleDenominator="1e+08">
           <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+          <attribute color="#000000" field="" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" priority="0" linePlacementFlags="18" placement="2" showAll="1" dist="0">
+      <DiagramLayerSettings showAll="1" placement="2" linePlacementFlags="18" priority="0" zIndex="0" dist="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -4614,37 +4614,37 @@ def my_form_open(dialog, layer, feature):
         <default expression="" applyOnUpdate="0" field="hidden"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="id"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="group"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="comment"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="moveable"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="type"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="name"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="hidden"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="id" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="group" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="comment" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="moveable" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="type" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="name" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="hidden" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="group"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="moveable"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="hidden"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="group" exp="" desc=""/>
+        <constraint field="comment" exp="" desc=""/>
+        <constraint field="moveable" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
+        <constraint field="name" exp="" desc=""/>
+        <constraint field="hidden" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;group&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;group&quot;" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="id" width="-1" hidden="0" type="field"/>
-          <column name="group" width="-1" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column name="comment" width="223" hidden="0" type="field"/>
-          <column name="moveable" width="-1" hidden="0" type="field"/>
-          <column name="type" width="-1" hidden="0" type="field"/>
-          <column name="name" width="414" hidden="0" type="field"/>
-          <column name="hidden" width="-1" hidden="0" type="field"/>
+          <column name="id" hidden="0" type="field" width="-1"/>
+          <column name="group" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="comment" hidden="0" type="field" width="223"/>
+          <column name="moveable" hidden="0" type="field" width="-1"/>
+          <column name="type" hidden="0" type="field" width="-1"/>
+          <column name="name" hidden="0" type="field" width="414"/>
+          <column name="hidden" hidden="0" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -4696,7 +4696,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" readOnly="0" maxScale="0" type="vector" minScale="1e+08" simplifyLocal="1" wkbType="Point" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" geometry="Point" simplifyDrawingHints="0" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" labelsEnabled="1">
+    <maplayer wkbType="Point" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" simplifyLocal="1" simplifyMaxScale="1" simplifyDrawingHints="0" simplifyDrawingTol="1" maxScale="0" minScale="1e+08" readOnly="0" autoRefreshTime="0" labelsEnabled="1" simplifyAlgorithm="0" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" type="vector" geometry="Point">
       <extent>
         <xmin>18.39857058409652169</xmin>
         <ymin>-33.90687934774654622</ymin>
@@ -4749,11 +4749,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" maxx="0" minz="0" miny="0" crs="" dimensions="2" maxz="0" minx="0"/>
+          <spatial crs="" dimensions="2" maxz="0" minx="0" maxy="0" minz="0" maxx="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -4777,27 +4777,27 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" forceraster="0" enableorderby="0" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" enableorderby="0" symbollevels="0" forceraster="0">
         <symbols>
-          <symbol name="0" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-            <layer enabled="1" pass="0" class="GeometryGenerator" locked="0">
+          <symbol name="0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+            <layer locked="0" pass="0" enabled="1" class="GeometryGenerator">
               <prop v="Line" k="SymbolType"/>
               <prop v="make_line(&#xa;  make_point($x, $y),&#xa;  make_point( &quot;auxiliary_storage_labeling_positionx&quot; , &quot;auxiliary_storage_labeling_positiony&quot; )&#xa;)" k="geometryModifier"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="enabled" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="&quot;Distance&quot; IS attribute( @atlas_feature, 'Distance' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="&quot;Distance&quot; IS attribute( @atlas_feature, 'Distance' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@0@0" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-                <layer enabled="1" pass="0" class="ArrowLine" locked="0">
+              <symbol name="@0@0" clip_to_extent="1" type="line" alpha="1" force_rhr="0">
+                <layer locked="0" pass="0" enabled="1" class="ArrowLine">
                   <prop v="1" k="arrow_start_width"/>
                   <prop v="MM" k="arrow_start_width_unit"/>
                   <prop v="3x:0,0,0,0,0,0" k="arrow_start_width_unit_scale"/>
@@ -4901,13 +4901,13 @@ def my_form_open(dialog, layer, feature):
                   </effect>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@0@0@0" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-                    <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+                  <symbol name="@@0@0@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill">
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="0,0,255,255" k="color"/>
                       <prop v="round" k="joinstyle"/>
@@ -4921,9 +4921,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -4940,46 +4940,46 @@ def my_form_open(dialog, layer, feature):
         <rules key="{ec06de39-9a7b-40bf-968d-6abbbec23d8a}">
           <rule filter="&quot;Distance&quot; IS attribute( @atlas_feature, 'Distance')" key="{966f1ab1-4d4c-4ff0-997b-e53f6ca5855d}">
             <settings>
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,255,255" fontSize="9" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="0.8" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="0" fontStrikeout="0" fieldName="display" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-                <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="0,0,255,255" shapeType="0" shapeJoinStyle="128" shapeRadiiY="0.5" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="0.5" shapeBorderWidth="0.2" shapeSizeY="1" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="1" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+              <text-style fontCapitals="0" blendMode="0" fontUnderline="0" isExpression="0" fontLetterSpacing="0" textOpacity="0.8" fontFamily="Myriad Pro" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" useSubstitutions="0" fieldName="display" fontSizeUnit="Point" textColor="0,0,255,255" fontWeight="63" multilineHeight="1" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSize="9" fontStrikeout="0" fontItalic="0">
+                <text-buffer bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255"/>
+                <background shapeSizeX="1" shapeRadiiUnit="MM" shapeBorderColor="0,0,255,255" shapeJoinStyle="128" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBlendMode="0" shapeSizeUnit="MM" shapeSizeY="1" shapeSizeType="0" shapeBorderWidth="0.2" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeRotation="0" shapeOffsetX="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeRadiiY="0.5" shapeRadiiX="0.5" shapeOffsetY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOpacity="0.7" shadowScale="100" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowRadius="1.5" shadowRadiusUnit="MM" shadowUnder="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="17" useMaxLineLengthForAutoWrap="1" multilineAlign="2" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-              <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="0" repeatDistanceUnits="MM" preserveRotation="0" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="LineGeometry" geometryGenerator="" priority="10" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MM" dist="0" maxCurvedCharAngleIn="25" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-              <rendering drawLabels="1" maxNumLabels="2" mergeLines="0" labelPerPart="0" scaleMax="0" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="0" scaleVisibility="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacleType="0"/>
+              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" decimals="3" plussign="0" wrapChar="" reverseDirectionSymbol="0" multilineAlign="2" formatNumbers="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" addDirectionSymbol="0" autoWrapLength="17"/>
+              <placement centroidInside="0" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" preserveRotation="0" quadOffset="4" offsetUnits="MM" geometryGeneratorType="LineGeometry" placementFlags="10" maxCurvedCharAngleIn="25" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-25" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="0" xOffset="0" priority="10" yOffset="0" geometryGenerator="" distUnits="MM" placement="0" offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering mergeLines="0" displayAll="1" obstacleType="0" scaleVisibility="0" obstacle="1" fontMaxPixelSize="10000" fontLimitPixelSize="0" obstacleFactor="2" drawLabels="1" labelPerPart="0" limitNumLabels="0" minFeatureSize="0" upsidedownLabels="0" zIndex="0" maxNumLabels="2" scaleMax="0" scaleMin="0" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="AlwaysShow" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="Hali" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="'Center'" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="'Center'"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="PositionX" type="Map">
-                      <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 name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                     <Option name="PositionY" type="Map">
-                      <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 name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                     <Option name="Vali" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="'Half'" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="'Half'"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </settings>
@@ -5005,21 +5005,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>0.6</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minimumSize="0" opacity="1" penAlpha="255" penColor="#000000" enabled="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeType="MM" diagramOrientation="Up" labelPlacementMethod="XHeight" scaleBasedVisibility="0" width="15" minScaleDenominator="0" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" barWidth="5" backgroundAlpha="255" lineSizeType="MM" penWidth="0">
+        <DiagramCategory lineSizeType="MM" minimumSize="0" rotationOffset="270" height="15" backgroundColor="#ffffff" barWidth="5" penColor="#000000" scaleDependency="Area" scaleBasedVisibility="0" diagramOrientation="Up" enabled="0" sizeType="MM" penWidth="0" opacity="1" labelPlacementMethod="XHeight" minScaleDenominator="0" penAlpha="255" backgroundAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" width="15" maxScaleDenominator="1e+08">
           <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+          <attribute color="#000000" field="" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" priority="0" linePlacementFlags="18" placement="0" showAll="1" dist="0">
+      <DiagramLayerSettings showAll="1" placement="0" linePlacementFlags="18" priority="0" zIndex="0" dist="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -5028,8 +5028,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -5038,8 +5038,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -5092,34 +5092,34 @@ def my_form_open(dialog, layer, feature):
         <default expression="" applyOnUpdate="0" field="auxiliary_storage_labeling_positiony"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Name"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Distance"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="distance:(0,0)"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="display"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="auxiliary_storage_labeling_positionx"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="auxiliary_storage_labeling_positiony"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="Name" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="Distance" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="distance:(0,0)" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="display" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="auxiliary_storage_labeling_positionx" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="auxiliary_storage_labeling_positiony" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="Name"/>
-        <constraint desc="" exp="" field="Distance"/>
-        <constraint desc="" exp="" field="distance:(0,0)"/>
-        <constraint desc="" exp="" field="display"/>
-        <constraint desc="" exp="" field="auxiliary_storage_labeling_positionx"/>
-        <constraint desc="" exp="" field="auxiliary_storage_labeling_positiony"/>
+        <constraint field="Name" exp="" desc=""/>
+        <constraint field="Distance" exp="" desc=""/>
+        <constraint field="distance:(0,0)" exp="" desc=""/>
+        <constraint field="display" exp="" desc=""/>
+        <constraint field="auxiliary_storage_labeling_positionx" exp="" desc=""/>
+        <constraint field="auxiliary_storage_labeling_positiony" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;display&quot;" sortOrder="1" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;display&quot;" actionWidgetStyle="dropDown" sortOrder="1">
         <columns>
-          <column name="Name" width="-1" hidden="0" type="field"/>
-          <column name="Distance" width="-1" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column name="display" width="203" hidden="0" type="field"/>
-          <column name="distance:(0,0)" width="-1" hidden="0" type="field"/>
-          <column name="auxiliary_storage_labeling_positionx" width="-1" hidden="1" type="field"/>
-          <column name="auxiliary_storage_labeling_positiony" width="-1" hidden="1" type="field"/>
+          <column name="Name" hidden="0" type="field" width="-1"/>
+          <column name="Distance" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="display" hidden="0" type="field" width="203"/>
+          <column name="distance:(0,0)" hidden="0" type="field" width="-1"/>
+          <column name="auxiliary_storage_labeling_positionx" hidden="1" type="field" width="-1"/>
+          <column name="auxiliary_storage_labeling_positiony" hidden="1" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5197,7 +5197,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" readOnly="0" maxScale="0" type="vector" minScale="1e+08" simplifyLocal="1" wkbType="Point" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" geometry="Point" simplifyDrawingHints="0" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" labelsEnabled="0">
+    <maplayer wkbType="Point" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" simplifyLocal="1" simplifyMaxScale="1" simplifyDrawingHints="0" simplifyDrawingTol="1" maxScale="0" minScale="1e+08" readOnly="0" autoRefreshTime="0" labelsEnabled="0" simplifyAlgorithm="0" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" type="vector" geometry="Point">
       <extent>
         <xmin>18.375272840127721</xmin>
         <ymin>-33.94586040837086927</ymin>
@@ -5241,7 +5241,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -5261,15 +5261,15 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" forceraster="0" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 type="RuleRenderer" enableorderby="0" symbollevels="0" forceraster="0">
         <rules key="{01115dc1-cc6e-4980-a968-7ef94a3b9df6}">
-          <rule symbol="0" filter="&quot;Distance&quot; = '21KM'" key="{71dc0866-b893-48a0-be36-e2b65a581610}"/>
-          <rule symbol="1" filter="&quot;Distance&quot; = '10KM'" key="{405230e7-6e6f-4e87-b9bc-b89e44296582}"/>
-          <rule symbol="2" filter="&quot;Distance&quot; = '5KM'" key="{c5d85d4d-6b78-403d-ab66-ecd04556e7d7}"/>
+          <rule filter="&quot;Distance&quot; = '21KM'" symbol="0" key="{71dc0866-b893-48a0-be36-e2b65a581610}"/>
+          <rule filter="&quot;Distance&quot; = '10KM'" symbol="1" key="{405230e7-6e6f-4e87-b9bc-b89e44296582}"/>
+          <rule filter="&quot;Distance&quot; = '5KM'" symbol="2" key="{c5d85d4d-6b78-403d-ab66-ecd04556e7d7}"/>
         </rules>
         <symbols>
-          <symbol name="0" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-            <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
+          <symbol name="0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker">
               <prop v="0" k="angle"/>
               <prop v="210,32,39,255" k="color"/>
               <prop v="1" k="horizontal_anchor_point"/>
@@ -5290,21 +5290,21 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="size" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="0.8" force_rhr="0" clip_to_extent="1" type="marker">
-            <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
+          <symbol name="1" clip_to_extent="1" type="marker" alpha="0.8" force_rhr="0">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker">
               <prop v="0" k="angle"/>
               <prop v="103,34,144,255" k="color"/>
               <prop v="1" k="horizontal_anchor_point"/>
@@ -5325,21 +5325,21 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="size" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="0.8" force_rhr="0" clip_to_extent="1" type="marker">
-            <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
+          <symbol name="2" clip_to_extent="1" type="marker" alpha="0.8" force_rhr="0">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker">
               <prop v="0" k="angle"/>
               <prop v="145,211,55,255" k="color"/>
               <prop v="1" k="horizontal_anchor_point"/>
@@ -5360,15 +5360,15 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="size" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -5377,46 +5377,46 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,255,255" fontSize="9" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="0.8" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="1" fontStrikeout="0" fieldName="IF(&quot;Distance&quot; IS attribute( @atlas_feature, 'Distance' ), display, '')" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-            <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-            <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="0,0,255,255" shapeType="0" shapeJoinStyle="128" shapeRadiiY="0.5" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="0.5" shapeBorderWidth="0.2" shapeSizeY="1" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="1" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+          <text-style fontCapitals="0" blendMode="0" fontUnderline="0" isExpression="1" fontLetterSpacing="0" textOpacity="0.8" fontFamily="Myriad Pro" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" useSubstitutions="0" fieldName="IF(&quot;Distance&quot; IS attribute( @atlas_feature, 'Distance' ), display, '')" fontSizeUnit="Point" textColor="0,0,255,255" fontWeight="63" multilineHeight="1" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSize="9" fontStrikeout="0" fontItalic="0">
+            <text-buffer bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255"/>
+            <background shapeSizeX="1" shapeRadiiUnit="MM" shapeBorderColor="0,0,255,255" shapeJoinStyle="128" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBlendMode="0" shapeSizeUnit="MM" shapeSizeY="1" shapeSizeType="0" shapeBorderWidth="0.2" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeRotation="0" shapeOffsetX="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeRadiiY="0.5" shapeRadiiX="0.5" shapeOffsetY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOpacity="0.7" shadowScale="100" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowRadius="1.5" shadowRadiusUnit="MM" shadowUnder="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
             <substitutions/>
           </text-style>
-          <text-format formatNumbers="0" autoWrapLength="17" useMaxLineLengthForAutoWrap="1" multilineAlign="2" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-          <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="0" repeatDistanceUnits="MM" preserveRotation="0" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="LineGeometry" geometryGenerator="" priority="10" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MM" dist="0" maxCurvedCharAngleIn="25" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-          <rendering drawLabels="1" maxNumLabels="2" mergeLines="0" labelPerPart="0" scaleMax="0" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="0" scaleVisibility="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacleType="0"/>
+          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" decimals="3" plussign="0" wrapChar="" reverseDirectionSymbol="0" multilineAlign="2" formatNumbers="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" addDirectionSymbol="0" autoWrapLength="17"/>
+          <placement centroidInside="0" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" preserveRotation="0" quadOffset="4" offsetUnits="MM" geometryGeneratorType="LineGeometry" placementFlags="10" maxCurvedCharAngleIn="25" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-25" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="0" xOffset="0" priority="10" yOffset="0" geometryGenerator="" distUnits="MM" placement="0" offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering mergeLines="0" displayAll="1" obstacleType="0" scaleVisibility="0" obstacle="1" fontMaxPixelSize="10000" fontLimitPixelSize="0" obstacleFactor="2" drawLabels="1" labelPerPart="0" limitNumLabels="0" minFeatureSize="0" upsidedownLabels="0" zIndex="0" maxNumLabels="2" scaleMax="0" scaleMin="0" fontMinPixelSize="3"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="AlwaysShow" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="type" value="1" type="int"/>
-                  <Option name="val" value="" type="QString"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="type" type="int" value="1"/>
+                  <Option name="val" type="QString" value=""/>
                 </Option>
                 <Option name="Hali" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="'Center'" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="'Center'"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="PositionX" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="field" value="" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value=""/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
                 <Option name="PositionY" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="field" value="" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value=""/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
                 <Option name="Vali" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="'Half'" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="'Half'"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </settings>
@@ -5436,21 +5436,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minimumSize="0" opacity="1" penAlpha="255" penColor="#000000" enabled="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeType="MM" diagramOrientation="Up" labelPlacementMethod="XHeight" scaleBasedVisibility="0" width="15" minScaleDenominator="0" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" barWidth="5" backgroundAlpha="255" lineSizeType="MM" penWidth="0">
+        <DiagramCategory lineSizeType="MM" minimumSize="0" rotationOffset="270" height="15" backgroundColor="#ffffff" barWidth="5" penColor="#000000" scaleDependency="Area" scaleBasedVisibility="0" diagramOrientation="Up" enabled="0" sizeType="MM" penWidth="0" opacity="1" labelPlacementMethod="XHeight" minScaleDenominator="0" penAlpha="255" backgroundAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" width="15" maxScaleDenominator="1e+08">
           <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+          <attribute color="#000000" field="" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" priority="0" linePlacementFlags="18" placement="0" showAll="1" dist="0">
+      <DiagramLayerSettings showAll="1" placement="0" linePlacementFlags="18" priority="0" zIndex="0" dist="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -5459,8 +5459,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -5469,8 +5469,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -5479,8 +5479,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -5489,8 +5489,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -5499,8 +5499,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -5509,8 +5509,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -5519,8 +5519,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -5529,8 +5529,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -5539,8 +5539,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -5549,8 +5549,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -5619,56 +5619,56 @@ def my_form_open(dialog, layer, feature):
         <default expression="" applyOnUpdate="0" field="last_runner"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Name"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="descriptio"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="timestamp"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="begin"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="end"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Distance"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="RouteLen"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="length_m"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="length_km"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Source"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="org_fid"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="distance"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="first_runner"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="last_runner"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="Name" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="descriptio" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="timestamp" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="begin" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="end" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="Distance" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="RouteLen" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="length_m" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="length_km" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="Source" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="org_fid" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="distance" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="first_runner" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="last_runner" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="Name"/>
-        <constraint desc="" exp="" field="descriptio"/>
-        <constraint desc="" exp="" field="timestamp"/>
-        <constraint desc="" exp="" field="begin"/>
-        <constraint desc="" exp="" field="end"/>
-        <constraint desc="" exp="" field="Distance"/>
-        <constraint desc="" exp="" field="RouteLen"/>
-        <constraint desc="" exp="" field="length_m"/>
-        <constraint desc="" exp="" field="length_km"/>
-        <constraint desc="" exp="" field="Source"/>
-        <constraint desc="" exp="" field="org_fid"/>
-        <constraint desc="" exp="" field="distance"/>
-        <constraint desc="" exp="" field="first_runner"/>
-        <constraint desc="" exp="" field="last_runner"/>
+        <constraint field="Name" exp="" desc=""/>
+        <constraint field="descriptio" exp="" desc=""/>
+        <constraint field="timestamp" exp="" desc=""/>
+        <constraint field="begin" exp="" desc=""/>
+        <constraint field="end" exp="" desc=""/>
+        <constraint field="Distance" exp="" desc=""/>
+        <constraint field="RouteLen" exp="" desc=""/>
+        <constraint field="length_m" exp="" desc=""/>
+        <constraint field="length_km" exp="" desc=""/>
+        <constraint field="Source" exp="" desc=""/>
+        <constraint field="org_fid" exp="" desc=""/>
+        <constraint field="distance" exp="" desc=""/>
+        <constraint field="first_runner" exp="" desc=""/>
+        <constraint field="last_runner" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;display&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;display&quot;" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="Name" width="-1" hidden="0" type="field"/>
-          <column name="descriptio" width="-1" hidden="0" type="field"/>
-          <column name="timestamp" width="-1" hidden="0" type="field"/>
-          <column name="begin" width="179" hidden="0" type="field"/>
-          <column name="end" width="-1" hidden="0" type="field"/>
-          <column name="Distance" width="-1" hidden="0" type="field"/>
-          <column name="RouteLen" width="-1" hidden="0" type="field"/>
-          <column name="length_m" width="-1" hidden="0" type="field"/>
-          <column name="length_km" width="-1" hidden="0" type="field"/>
-          <column name="Source" width="-1" hidden="0" type="field"/>
-          <column name="org_fid" width="-1" hidden="0" type="field"/>
-          <column name="distance" width="177" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
+          <column name="Name" hidden="0" type="field" width="-1"/>
+          <column name="descriptio" hidden="0" type="field" width="-1"/>
+          <column name="timestamp" hidden="0" type="field" width="-1"/>
+          <column name="begin" hidden="0" type="field" width="179"/>
+          <column name="end" hidden="0" type="field" width="-1"/>
+          <column name="Distance" hidden="0" type="field" width="-1"/>
+          <column name="RouteLen" hidden="0" type="field" width="-1"/>
+          <column name="length_m" hidden="0" type="field" width="-1"/>
+          <column name="length_km" hidden="0" type="field" width="-1"/>
+          <column name="Source" hidden="0" type="field" width="-1"/>
+          <column name="org_fid" hidden="0" type="field" width="-1"/>
+          <column name="distance" hidden="0" type="field" width="177"/>
+          <column hidden="1" type="actions" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5744,7 +5744,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" readOnly="0" maxScale="100000" type="vector" minScale="1e+08" simplifyLocal="1" wkbType="MultiPolygon" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" geometry="Polygon" simplifyDrawingHints="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" labelsEnabled="0">
+    <maplayer wkbType="MultiPolygon" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" simplifyLocal="1" simplifyMaxScale="1" simplifyDrawingHints="1" simplifyDrawingTol="1" maxScale="100000" minScale="1e+08" readOnly="0" autoRefreshTime="0" labelsEnabled="0" simplifyAlgorithm="0" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" type="vector" geometry="Polygon">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.94678832168284544</ymin>
@@ -5788,7 +5788,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -5808,10 +5808,10 @@ def my_form_open(dialog, layer, feature):
         <Removable>0</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" forceraster="0" enableorderby="0" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" enableorderby="0" symbollevels="0" forceraster="0">
         <symbols>
-          <symbol name="0" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-            <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+          <symbol name="0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill">
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="26,0,201,255" k="color"/>
               <prop v="bevel" k="joinstyle"/>
@@ -5825,9 +5825,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="b_diagonal" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -5846,27 +5846,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minimumSize="0" opacity="1" penAlpha="255" penColor="#000000" enabled="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeType="MM" diagramOrientation="Up" labelPlacementMethod="XHeight" scaleBasedVisibility="0" width="15" minScaleDenominator="100000" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" barWidth="5" backgroundAlpha="255" lineSizeType="MM" penWidth="0">
+        <DiagramCategory lineSizeType="MM" minimumSize="0" rotationOffset="270" height="15" backgroundColor="#ffffff" barWidth="5" penColor="#000000" scaleDependency="Area" scaleBasedVisibility="0" diagramOrientation="Up" enabled="0" sizeType="MM" penWidth="0" opacity="1" labelPlacementMethod="XHeight" minScaleDenominator="100000" penAlpha="255" backgroundAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" width="15" maxScaleDenominator="1e+08">
           <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+          <attribute color="#000000" field="" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" priority="0" linePlacementFlags="2" placement="0" showAll="1" dist="0">
+      <DiagramLayerSettings showAll="1" placement="0" linePlacementFlags="2" priority="0" zIndex="0" dist="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties" type="Map">
               <Option name="show" type="Map">
-                <Option name="active" value="true" type="bool"/>
-                <Option name="field" value="id" type="QString"/>
-                <Option name="type" value="2" type="int"/>
+                <Option name="active" type="bool" value="true"/>
+                <Option name="field" type="QString" value="id"/>
+                <Option name="type" type="int" value="2"/>
               </Option>
             </Option>
-            <Option name="type" value="collection" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -5875,8 +5875,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -5885,8 +5885,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -5895,8 +5895,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -5915,25 +5915,25 @@ def my_form_open(dialog, layer, feature):
         <default expression="" applyOnUpdate="0" field="page"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="id"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="type"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="page"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="id" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="type" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="page" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="page"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
+        <constraint field="page" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column width="-1" hidden="1" type="actions"/>
-          <column name="id" width="-1" hidden="0" type="field"/>
-          <column name="type" width="-1" hidden="0" type="field"/>
-          <column name="page" width="-1" hidden="0" type="field"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="id" hidden="0" type="field" width="-1"/>
+          <column name="type" hidden="0" type="field" width="-1"/>
+          <column name="page" hidden="0" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5977,7 +5977,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" readOnly="0" maxScale="100000" type="vector" minScale="1e+08" simplifyLocal="1" wkbType="Point" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" geometry="Point" simplifyDrawingHints="0" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" labelsEnabled="1">
+    <maplayer wkbType="Point" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" simplifyLocal="1" simplifyMaxScale="1" simplifyDrawingHints="0" simplifyDrawingTol="1" maxScale="100000" minScale="1e+08" readOnly="0" autoRefreshTime="0" labelsEnabled="1" simplifyAlgorithm="0" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" type="vector" geometry="Point">
       <extent>
         <xmin>18.37523075794307204</xmin>
         <ymin>-33.94592961896692884</ymin>
@@ -6021,7 +6021,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -6041,14 +6041,14 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" forceraster="0" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 type="RuleRenderer" enableorderby="0" symbollevels="0" forceraster="0">
         <rules key="{436a5e05-3485-477a-80b7-cf4d12d6dcec}">
-          <rule symbol="0" label="Show in marshal overview" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" key="{308d81eb-cefa-4627-8afb-3baa8363f863}" description="Show in marshal overview"/>
-          <rule symbol="1" label="Show in marshal maps" filter="'marshal' = attribute( @atlas_feature , 'type' )" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" description="Show in marshal overview"/>
+          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' )" label="Show in marshal overview" description="Show in marshal overview" symbol="0" key="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' )" label="Show in marshal maps" description="Show in marshal overview" symbol="1" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
         </rules>
         <symbols>
-          <symbol name="0" alpha="0.792157" force_rhr="0" clip_to_extent="1" type="marker">
-            <layer enabled="1" pass="1" class="SimpleMarker" locked="0">
+          <symbol name="0" clip_to_extent="1" type="marker" alpha="0.792157" force_rhr="0">
+            <layer locked="0" pass="1" enabled="1" class="SimpleMarker">
               <prop v="0" k="angle"/>
               <prop v="0,0,0,255" k="color"/>
               <prop v="1" k="horizontal_anchor_point"/>
@@ -6069,15 +6069,15 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="0.01" force_rhr="0" clip_to_extent="1" type="marker">
-            <layer enabled="1" pass="1" class="SimpleMarker" locked="0">
+          <symbol name="1" clip_to_extent="1" type="marker" alpha="0.01" force_rhr="0">
+            <layer locked="0" pass="1" enabled="1" class="SimpleMarker">
               <prop v="0" k="angle"/>
               <prop v="0,0,0,255" k="color"/>
               <prop v="1" k="horizontal_anchor_point"/>
@@ -6098,9 +6098,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -6109,236 +6109,236 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{2ae987df-5ca1-46ae-98ed-9200336255e4}">
-          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' )" key="{e54a508a-81a6-4cf6-8730-e26900c5eed4}" description="Show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)">
+          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' )" description="Show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" key="{e54a508a-81a6-4cf6-8730-e26900c5eed4}">
             <settings>
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" fontSize="6" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="0.9" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="0" fontStrikeout="0" fieldName="position" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-                <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="0,0,0,255" shapeType="3" shapeJoinStyle="64" shapeRadiiY="0" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="0" shapeBorderWidth="0.1" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="0.5" shapeSVGFile="" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+              <text-style fontCapitals="0" blendMode="0" fontUnderline="0" isExpression="0" fontLetterSpacing="0" textOpacity="0.9" fontFamily="Myriad Pro" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" useSubstitutions="0" fieldName="position" fontSizeUnit="Point" textColor="0,0,0,255" fontWeight="63" multilineHeight="1" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSize="6" fontStrikeout="0" fontItalic="0">
+                <text-buffer bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255"/>
+                <background shapeSizeX="0" shapeRadiiUnit="MM" shapeBorderColor="0,0,0,255" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBlendMode="0" shapeSizeUnit="MM" shapeSizeY="0" shapeSizeType="0" shapeBorderWidth="0.1" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.5" shapeRotation="0" shapeOffsetX="0" shapeFillColor="255,255,255,255" shapeType="3" shapeOffsetUnit="MM" shapeRotationType="0" shapeRadiiY="0" shapeRadiiX="0" shapeOffsetY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOpacity="0.7" shadowScale="100" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowRadius="1.5" shadowRadiusUnit="MM" shadowUnder="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-              <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="6" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="10" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="1" maxCurvedCharAngleIn="20" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-              <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="2" fontMinPixelSize="3" limitNumLabels="0" obstacle="0" scaleMin="1" scaleVisibility="0" obstacleFactor="1" fontMaxPixelSize="10000" obstacleType="0"/>
+              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" decimals="3" plussign="0" wrapChar="" reverseDirectionSymbol="0" multilineAlign="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" addDirectionSymbol="0" autoWrapLength="0"/>
+              <placement centroidInside="0" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" preserveRotation="1" quadOffset="4" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" placementFlags="10" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="1" xOffset="0" priority="10" yOffset="0" geometryGenerator="" distUnits="MM" placement="6" offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering mergeLines="0" displayAll="1" obstacleType="0" scaleVisibility="0" obstacle="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" obstacleFactor="1" drawLabels="1" labelPerPart="0" limitNumLabels="0" minFeatureSize="0" upsidedownLabels="0" zIndex="2" maxNumLabels="2000" scaleMax="10000000" scaleMin="1" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="FontStyle" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="Size" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </settings>
           </rule>
-          <rule filter="'marshal' = attribute( @atlas_feature , 'type' )" key="{15f6f6e7-28e2-4602-9324-aa281e0f75d2}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" active="0">
+          <rule active="0" filter="'marshal' = attribute( @atlas_feature , 'type' )" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" key="{15f6f6e7-28e2-4602-9324-aa281e0f75d2}">
             <settings>
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" fontSize="6" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="0.5" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="0" fontStrikeout="0" fieldName="position" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-                <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="0,0,0,255" shapeType="3" shapeJoinStyle="64" shapeRadiiY="0" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="0" shapeBorderWidth="0.4" shapeSizeY="0.2" shapeOffsetUnit="MM" shapeOpacity="0.5" shapeSVGFile="" shapeSizeX="0.2" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+              <text-style fontCapitals="0" blendMode="0" fontUnderline="0" isExpression="0" fontLetterSpacing="0" textOpacity="0.5" fontFamily="Myriad Pro" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" useSubstitutions="0" fieldName="position" fontSizeUnit="Point" textColor="0,0,0,255" fontWeight="63" multilineHeight="1" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSize="6" fontStrikeout="0" fontItalic="0">
+                <text-buffer bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255"/>
+                <background shapeSizeX="0.2" shapeRadiiUnit="MM" shapeBorderColor="0,0,0,255" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBlendMode="0" shapeSizeUnit="MM" shapeSizeY="0.2" shapeSizeType="0" shapeBorderWidth="0.4" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.5" shapeRotation="0" shapeOffsetX="0" shapeFillColor="255,255,255,255" shapeType="3" shapeOffsetUnit="MM" shapeRotationType="0" shapeRadiiY="0" shapeRadiiX="0" shapeOffsetY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOpacity="0.7" shadowScale="100" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowRadius="1.5" shadowRadiusUnit="MM" shadowUnder="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="1" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-              <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="6" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="8" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="0" maxCurvedCharAngleIn="20" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-              <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="5" fontMinPixelSize="3" limitNumLabels="0" obstacle="0" scaleMin="1" scaleVisibility="0" obstacleFactor="1.8" fontMaxPixelSize="10000" obstacleType="0"/>
+              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" decimals="3" plussign="0" wrapChar="" reverseDirectionSymbol="0" multilineAlign="1" formatNumbers="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" addDirectionSymbol="0" autoWrapLength="0"/>
+              <placement centroidInside="0" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" preserveRotation="1" quadOffset="4" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" placementFlags="10" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="0" xOffset="0" priority="8" yOffset="0" geometryGenerator="" distUnits="MM" placement="6" offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering mergeLines="0" displayAll="1" obstacleType="0" scaleVisibility="0" obstacle="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" obstacleFactor="1.8" drawLabels="1" labelPerPart="0" limitNumLabels="0" minFeatureSize="0" upsidedownLabels="0" zIndex="5" maxNumLabels="2000" scaleMax="10000000" scaleMin="1" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="AlwaysShow" type="Map">
-                      <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 name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( @atlasfeature_id = $id, 1, 0)"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="FontOpacity" type="Map">
-                      <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 name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="FontStyle" type="Map">
-                      <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 name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="ObstacleFactor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="Priority" type="Map">
-                      <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 name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 10.0, 8.0 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <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 name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="ShapeOpacity" type="Map">
-                      <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 name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="Size" type="Map">
-                      <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 name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 8, 6 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="ZIndex" type="Map">
-                      <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 name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( @atlasfeature_id = $id, 15, 5 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </settings>
           </rule>
-          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id" key="{cdcebdea-db24-4c71-ba1d-d8b1969c795e}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label" key="{cdcebdea-db24-4c71-ba1d-d8b1969c795e}">
             <settings>
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" fontSize="6" namedStyle="Regular" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="0.6" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="0" fontStrikeout="0" fieldName="position" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="50" useSubstitutions="0">
-                <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="0,0,0,255" shapeType="3" shapeJoinStyle="64" shapeRadiiY="0" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="0" shapeBorderWidth="0.4" shapeSizeY="0.2" shapeOffsetUnit="MM" shapeOpacity="0.6" shapeSVGFile="" shapeSizeX="0.2" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+              <text-style fontCapitals="0" blendMode="0" fontUnderline="0" isExpression="0" fontLetterSpacing="0" textOpacity="0.6" fontFamily="Myriad Pro" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Regular" useSubstitutions="0" fieldName="position" fontSizeUnit="Point" textColor="0,0,0,255" fontWeight="50" multilineHeight="1" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSize="6" fontStrikeout="0" fontItalic="0">
+                <text-buffer bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255"/>
+                <background shapeSizeX="0.2" shapeRadiiUnit="MM" shapeBorderColor="0,0,0,255" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBlendMode="0" shapeSizeUnit="MM" shapeSizeY="0.2" shapeSizeType="0" shapeBorderWidth="0.4" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.6" shapeRotation="0" shapeOffsetX="0" shapeFillColor="255,255,255,255" shapeType="3" shapeOffsetUnit="MM" shapeRotationType="0" shapeRadiiY="0" shapeRadiiX="0" shapeOffsetY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOpacity="0.7" shadowScale="100" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowRadius="1.5" shadowRadiusUnit="MM" shadowUnder="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="1" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-              <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="6" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="8" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="0" maxCurvedCharAngleIn="20" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-              <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="5" fontMinPixelSize="3" limitNumLabels="0" obstacle="0" scaleMin="1" scaleVisibility="0" obstacleFactor="1.8" fontMaxPixelSize="10000" obstacleType="0"/>
+              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" decimals="3" plussign="0" wrapChar="" reverseDirectionSymbol="0" multilineAlign="1" formatNumbers="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" addDirectionSymbol="0" autoWrapLength="0"/>
+              <placement centroidInside="0" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" preserveRotation="1" quadOffset="4" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" placementFlags="10" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="0" xOffset="0" priority="8" yOffset="0" geometryGenerator="" distUnits="MM" placement="6" offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering mergeLines="0" displayAll="1" obstacleType="0" scaleVisibility="0" obstacle="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" obstacleFactor="1.8" drawLabels="1" labelPerPart="0" limitNumLabels="0" minFeatureSize="0" upsidedownLabels="0" zIndex="5" maxNumLabels="2000" scaleMax="10000000" scaleMin="1" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="AlwaysShow" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="FontOpacity" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="FontStyle" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="ObstacleFactor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="Priority" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="ShapeOpacity" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="Size" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="ZIndex" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </settings>
           </rule>
-          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" key="{6c4b06ee-4bb1-473c-9f00-dd1edfdcfcc8}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top" key="{6c4b06ee-4bb1-473c-9f00-dd1edfdcfcc8}">
             <settings>
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" fontSize="8" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="0.9" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="0" fontStrikeout="0" fieldName="position" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-                <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="0,0,0,255" shapeType="3" shapeJoinStyle="64" shapeRadiiY="0" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,0,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="0" shapeBorderWidth="0.4" shapeSizeY="0.2" shapeOffsetUnit="MM" shapeOpacity="0.9" shapeSVGFile="" shapeSizeX="0.2" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+              <text-style fontCapitals="0" blendMode="0" fontUnderline="0" isExpression="0" fontLetterSpacing="0" textOpacity="0.9" fontFamily="Myriad Pro" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" useSubstitutions="0" fieldName="position" fontSizeUnit="Point" textColor="0,0,0,255" fontWeight="63" multilineHeight="1" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSize="8" fontStrikeout="0" fontItalic="0">
+                <text-buffer bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255"/>
+                <background shapeSizeX="0.2" shapeRadiiUnit="MM" shapeBorderColor="0,0,0,255" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBlendMode="0" shapeSizeUnit="MM" shapeSizeY="0.2" shapeSizeType="0" shapeBorderWidth="0.4" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.9" shapeRotation="0" shapeOffsetX="0" shapeFillColor="255,255,0,255" shapeType="3" shapeOffsetUnit="MM" shapeRotationType="0" shapeRadiiY="0" shapeRadiiX="0" shapeOffsetY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOpacity="0.7" shadowScale="100" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowRadius="1.5" shadowRadiusUnit="MM" shadowUnder="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="1" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-              <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="0" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="10" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="0" maxCurvedCharAngleIn="20" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-              <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="10" fontMinPixelSize="3" limitNumLabels="0" obstacle="0" scaleMin="1" scaleVisibility="0" obstacleFactor="1.8" fontMaxPixelSize="10000" obstacleType="0"/>
+              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" decimals="3" plussign="0" wrapChar="" reverseDirectionSymbol="0" multilineAlign="1" formatNumbers="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" addDirectionSymbol="0" autoWrapLength="0"/>
+              <placement centroidInside="0" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" preserveRotation="1" quadOffset="4" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" placementFlags="10" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="0" xOffset="0" priority="10" yOffset="0" geometryGenerator="" distUnits="MM" placement="0" offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering mergeLines="0" displayAll="1" obstacleType="0" scaleVisibility="0" obstacle="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" obstacleFactor="1.8" drawLabels="1" labelPerPart="0" limitNumLabels="0" minFeatureSize="0" upsidedownLabels="0" zIndex="10" maxNumLabels="2000" scaleMax="10000000" scaleMin="1" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="AlwaysShow" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="FontOpacity" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="FontStyle" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="ObstacleFactor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="Priority" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="ShapeOpacity" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="Size" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="ZIndex" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </settings>
@@ -6490,21 +6490,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minimumSize="0" opacity="1" penAlpha="255" penColor="#000000" enabled="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeType="MM" diagramOrientation="Up" labelPlacementMethod="XHeight" scaleBasedVisibility="0" width="15" minScaleDenominator="100000" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" barWidth="5" backgroundAlpha="255" lineSizeType="MM" penWidth="0">
+        <DiagramCategory lineSizeType="MM" minimumSize="0" rotationOffset="270" height="15" backgroundColor="#ffffff" barWidth="5" penColor="#000000" scaleDependency="Area" scaleBasedVisibility="0" diagramOrientation="Up" enabled="0" sizeType="MM" penWidth="0" opacity="1" labelPlacementMethod="XHeight" minScaleDenominator="100000" penAlpha="255" backgroundAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" width="15" maxScaleDenominator="1e+08">
           <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+          <attribute color="#000000" field="" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" priority="0" linePlacementFlags="2" placement="0" showAll="1" dist="0">
+      <DiagramLayerSettings showAll="1" placement="0" linePlacementFlags="2" priority="0" zIndex="0" dist="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -6513,8 +6513,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -6523,8 +6523,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="false" type="bool"/>
-                <Option name="UseHtml" value="false" type="bool"/>
+                <Option name="IsMultiline" type="bool" value="false"/>
+                <Option name="UseHtml" type="bool" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6533,8 +6533,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="false" type="bool"/>
-                <Option name="UseHtml" value="false" type="bool"/>
+                <Option name="IsMultiline" type="bool" value="false"/>
+                <Option name="UseHtml" type="bool" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6543,8 +6543,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -6553,8 +6553,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -6563,8 +6563,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -6580,8 +6580,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -6590,8 +6590,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -6667,58 +6667,58 @@ def my_form_open(dialog, layer, feature):
         <default expression="" applyOnUpdate="0" field="csv_instru"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="id"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="position"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="type"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="notes"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="oldpositio"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="xyposition"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="csv_positi"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="csv_name"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="csv_club"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="csv_captai"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="csv_capt_1"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="csv_first_"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="csv_last_r"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="csv_instru"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="id" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="position" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="type" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="notes" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="oldpositio" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="xyposition" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="csv_positi" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="csv_name" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="csv_club" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="csv_captai" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="csv_capt_1" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="csv_first_" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="csv_last_r" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="csv_instru" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="position"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="notes"/>
-        <constraint desc="" exp="" field="oldpositio"/>
-        <constraint desc="" exp="" field="xyposition"/>
-        <constraint desc="" exp="" field="csv_positi"/>
-        <constraint desc="" exp="" field="csv_name"/>
-        <constraint desc="" exp="" field="csv_club"/>
-        <constraint desc="" exp="" field="csv_captai"/>
-        <constraint desc="" exp="" field="csv_capt_1"/>
-        <constraint desc="" exp="" field="csv_first_"/>
-        <constraint desc="" exp="" field="csv_last_r"/>
-        <constraint desc="" exp="" field="csv_instru"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="position" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
+        <constraint field="notes" exp="" desc=""/>
+        <constraint field="oldpositio" exp="" desc=""/>
+        <constraint field="xyposition" exp="" desc=""/>
+        <constraint field="csv_positi" exp="" desc=""/>
+        <constraint field="csv_name" exp="" desc=""/>
+        <constraint field="csv_club" exp="" desc=""/>
+        <constraint field="csv_captai" exp="" desc=""/>
+        <constraint field="csv_capt_1" exp="" desc=""/>
+        <constraint field="csv_first_" exp="" desc=""/>
+        <constraint field="csv_last_r" exp="" desc=""/>
+        <constraint field="csv_instru" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;position&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;position&quot;" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="id" width="-1" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column name="position" width="-1" hidden="0" type="field"/>
-          <column name="type" width="-1" hidden="0" type="field"/>
-          <column name="notes" width="-1" hidden="0" type="field"/>
-          <column name="oldpositio" width="-1" hidden="0" type="field"/>
-          <column name="xyposition" width="-1" hidden="0" type="field"/>
-          <column name="csv_name" width="-1" hidden="0" type="field"/>
-          <column name="csv_club" width="-1" hidden="0" type="field"/>
-          <column name="csv_positi" width="-1" hidden="0" type="field"/>
-          <column name="csv_captai" width="-1" hidden="0" type="field"/>
-          <column name="csv_capt_1" width="-1" hidden="0" type="field"/>
-          <column name="csv_first_" width="-1" hidden="0" type="field"/>
-          <column name="csv_last_r" width="-1" hidden="0" type="field"/>
-          <column name="csv_instru" width="-1" hidden="0" type="field"/>
+          <column name="id" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="position" hidden="0" type="field" width="-1"/>
+          <column name="type" hidden="0" type="field" width="-1"/>
+          <column name="notes" hidden="0" type="field" width="-1"/>
+          <column name="oldpositio" hidden="0" type="field" width="-1"/>
+          <column name="xyposition" hidden="0" type="field" width="-1"/>
+          <column name="csv_name" hidden="0" type="field" width="-1"/>
+          <column name="csv_club" hidden="0" type="field" width="-1"/>
+          <column name="csv_positi" hidden="0" type="field" width="-1"/>
+          <column name="csv_captai" hidden="0" type="field" width="-1"/>
+          <column name="csv_capt_1" hidden="0" type="field" width="-1"/>
+          <column name="csv_first_" hidden="0" type="field" width="-1"/>
+          <column name="csv_last_r" hidden="0" type="field" width="-1"/>
+          <column name="csv_instru" hidden="0" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6845,7 +6845,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer styleCategories="AllStyleCategories" minScale="1e+08" wkbType="NoGeometry" refreshOnNotifyMessage="" geometry="No geometry" hasScaleBasedVisibilityFlag="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" type="vector" autoRefreshTime="0">
+    <maplayer autoRefreshTime="0" maxScale="100000" readOnly="0" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" minScale="1e+08" autoRefreshEnabled="0" type="vector" wkbType="NoGeometry" refreshOnNotifyEnabled="0" geometry="No geometry">
       <id>marshals_by_position20161003112326575</id>
       <datasource>file:./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes</datasource>
       <keywordList>
@@ -6892,11 +6892,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" maxx="0" minz="0" miny="0" crs="" dimensions="2" maxz="0" minx="0"/>
+          <spatial crs="" dimensions="2" maxz="0" minx="0" maxy="0" minz="0" maxx="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -6909,8 +6909,8 @@ def my_form_open(dialog, layer, feature):
       <vectorjoins/>
       <layerDependencies/>
       <dataDependencies>
-        <layer id="all_routes20170907054841602"/>
         <layer id="marshal_positions20160930121322287"/>
+        <layer id="all_routes20170907054841602"/>
       </dataDependencies>
       <legend type="default-vector"/>
       <expressionfields/>
@@ -6929,7 +6929,7 @@ def my_form_open(dialog, layer, feature):
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -6938,8 +6938,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -6962,8 +6962,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -6972,8 +6972,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -6982,8 +6982,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -6992,8 +6992,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -7002,8 +7002,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -7019,8 +7019,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -7080,55 +7080,55 @@ def my_form_open(dialog, layer, feature):
         <default expression="" applyOnUpdate="0" field="instructions"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="position"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="firstname"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="surname"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="name"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="club"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="phone"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="email"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="captain"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="captain_phone"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="races"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="first_runner"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="last_runner"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="instructions"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="position" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="firstname" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="surname" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="name" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="club" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="phone" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="email" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="captain" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="captain_phone" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="races" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="first_runner" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="last_runner" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="instructions" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="position"/>
-        <constraint desc="" exp="" field="firstname"/>
-        <constraint desc="" exp="" field="surname"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="club"/>
-        <constraint desc="" exp="" field="phone"/>
-        <constraint desc="" exp="" field="email"/>
-        <constraint desc="" exp="" field="captain"/>
-        <constraint desc="" exp="" field="captain_phone"/>
-        <constraint desc="" exp="" field="races"/>
-        <constraint desc="" exp="" field="first_runner"/>
-        <constraint desc="" exp="" field="last_runner"/>
-        <constraint desc="" exp="" field="instructions"/>
+        <constraint field="position" exp="" desc=""/>
+        <constraint field="firstname" exp="" desc=""/>
+        <constraint field="surname" exp="" desc=""/>
+        <constraint field="name" exp="" desc=""/>
+        <constraint field="club" exp="" desc=""/>
+        <constraint field="phone" exp="" desc=""/>
+        <constraint field="email" exp="" desc=""/>
+        <constraint field="captain" exp="" desc=""/>
+        <constraint field="captain_phone" exp="" desc=""/>
+        <constraint field="races" exp="" desc=""/>
+        <constraint field="first_runner" exp="" desc=""/>
+        <constraint field="last_runner" exp="" desc=""/>
+        <constraint field="instructions" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="position" width="-1" hidden="0" type="field"/>
-          <column name="name" width="-1" hidden="0" type="field"/>
-          <column name="club" width="-1" hidden="0" type="field"/>
-          <column name="phone" width="-1" hidden="0" type="field"/>
-          <column name="email" width="-1" hidden="0" type="field"/>
-          <column name="captain" width="-1" hidden="0" type="field"/>
-          <column name="races" width="-1" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column name="first_runner" width="-1" hidden="0" type="field"/>
-          <column name="last_runner" width="-1" hidden="0" type="field"/>
-          <column name="instructions" width="-1" hidden="0" type="field"/>
-          <column name="firstname" width="-1" hidden="0" type="field"/>
-          <column name="surname" width="-1" hidden="0" type="field"/>
-          <column name="captain_phone" width="-1" hidden="0" type="field"/>
+          <column name="position" hidden="0" type="field" width="-1"/>
+          <column name="name" hidden="0" type="field" width="-1"/>
+          <column name="club" hidden="0" type="field" width="-1"/>
+          <column name="phone" hidden="0" type="field" width="-1"/>
+          <column name="email" hidden="0" type="field" width="-1"/>
+          <column name="captain" hidden="0" type="field" width="-1"/>
+          <column name="races" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="first_runner" hidden="0" type="field" width="-1"/>
+          <column name="last_runner" hidden="0" type="field" width="-1"/>
+          <column name="instructions" hidden="0" type="field" width="-1"/>
+          <column name="firstname" hidden="0" type="field" width="-1"/>
+          <column name="surname" hidden="0" type="field" width="-1"/>
+          <column name="captain_phone" hidden="0" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7200,7 +7200,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>first_name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" readOnly="0" maxScale="100000" type="vector" minScale="1e+08" simplifyLocal="1" wkbType="Point" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" geometry="Point" simplifyDrawingHints="0" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" labelsEnabled="1">
+    <maplayer wkbType="Point" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" simplifyLocal="1" simplifyMaxScale="1" simplifyDrawingHints="0" simplifyDrawingTol="1" maxScale="100000" minScale="1e+08" readOnly="0" autoRefreshTime="0" labelsEnabled="1" simplifyAlgorithm="0" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" type="vector" geometry="Point">
       <extent>
         <xmin>18.37896929129519208</xmin>
         <ymin>-33.93500027904928373</ymin>
@@ -7253,11 +7253,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" maxx="0" minz="0" miny="0" crs="" dimensions="2" maxz="0" minx="0"/>
+          <spatial crs="" dimensions="2" maxz="0" minx="0" maxy="0" minz="0" maxx="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -7284,41 +7284,41 @@ def my_form_open(dialog, layer, feature):
       <renderer-v2 type="nullSymbol"/>
       <labeling type="simple">
         <settings>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" fontSize="8.5" namedStyle="Regular" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="0.75" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="0" fontStrikeout="0" fieldName="name" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="50" useSubstitutions="0">
-            <text-buffer bufferSizeUnits="MM" bufferDraw="1" bufferNoFill="0" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="0.6" bufferColor="255,255,255,255" bufferSize="1.5"/>
-            <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeJoinStyle="64" shapeRadiiY="0" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+          <text-style fontCapitals="0" blendMode="0" fontUnderline="0" isExpression="0" fontLetterSpacing="0" textOpacity="0.75" fontFamily="Myriad Pro" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Regular" useSubstitutions="0" fieldName="name" fontSizeUnit="Point" textColor="0,0,0,255" fontWeight="50" multilineHeight="1" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSize="8.5" fontStrikeout="0" fontItalic="0">
+            <text-buffer bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="0.6" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1.5" bufferColor="255,255,255,255"/>
+            <background shapeSizeX="0" shapeRadiiUnit="MM" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBlendMode="0" shapeSizeUnit="MM" shapeSizeY="0" shapeSizeType="0" shapeBorderWidth="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeRotation="0" shapeOffsetX="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeRadiiY="0" shapeRadiiX="0" shapeOffsetY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOpacity="0.7" shadowScale="100" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowRadius="1.5" shadowRadiusUnit="MM" shadowUnder="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
             <substitutions/>
           </text-style>
-          <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-          <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="6" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="2" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="0" maxCurvedCharAngleIn="20" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-          <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="0" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="1" scaleVisibility="0" obstacleFactor="0.2" fontMaxPixelSize="10000" obstacleType="0"/>
+          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" decimals="3" plussign="0" wrapChar="" reverseDirectionSymbol="0" multilineAlign="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" addDirectionSymbol="0" autoWrapLength="0"/>
+          <placement centroidInside="0" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" preserveRotation="1" quadOffset="4" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" placementFlags="2" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="0" xOffset="0" priority="1" yOffset="0" geometryGenerator="" distUnits="MM" placement="6" offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering mergeLines="0" displayAll="0" obstacleType="0" scaleVisibility="0" obstacle="1" fontMaxPixelSize="10000" fontLimitPixelSize="0" obstacleFactor="0.2" drawLabels="1" labelPerPart="0" limitNumLabels="0" minFeatureSize="0" upsidedownLabels="0" zIndex="0" maxNumLabels="2000" scaleMax="10000000" scaleMin="1" fontMinPixelSize="3"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="LabelRotation" type="Map">
-                  <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 name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="360 - (&quot;label_rota&quot;)"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="PositionX" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="field" value="label_x" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="label_x"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
                 <Option name="PositionY" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="field" value="label_y" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="label_y"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
                 <Option name="Size" type="Map">
-                  <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 name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </settings>
@@ -7333,21 +7333,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minimumSize="0" opacity="1" penAlpha="255" penColor="#000000" enabled="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeType="MM" diagramOrientation="Up" labelPlacementMethod="XHeight" scaleBasedVisibility="0" width="15" minScaleDenominator="100000" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" barWidth="5" backgroundAlpha="255" lineSizeType="MM" penWidth="0">
+        <DiagramCategory lineSizeType="MM" minimumSize="0" rotationOffset="270" height="15" backgroundColor="#ffffff" barWidth="5" penColor="#000000" scaleDependency="Area" scaleBasedVisibility="0" diagramOrientation="Up" enabled="0" sizeType="MM" penWidth="0" opacity="1" labelPlacementMethod="XHeight" minScaleDenominator="100000" penAlpha="255" backgroundAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" width="15" maxScaleDenominator="1e+08">
           <fontProperties style="" description="Arial,10,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+          <attribute color="#000000" field="" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" priority="0" linePlacementFlags="2" placement="0" showAll="1" dist="0">
+      <DiagramLayerSettings showAll="1" placement="0" linePlacementFlags="2" priority="0" zIndex="0" dist="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -7356,8 +7356,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -7366,8 +7366,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -7376,8 +7376,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -7386,8 +7386,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -7396,8 +7396,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -7406,8 +7406,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -7416,8 +7416,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -7426,8 +7426,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -7436,8 +7436,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -7468,43 +7468,43 @@ def my_form_open(dialog, layer, feature):
         <default expression="" applyOnUpdate="0" field="label_rota"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="id"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="osm_id"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="name"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="type"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="z_order"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="population"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="label_x"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="label_y"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="label_rota"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="id" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="osm_id" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="name" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="type" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="z_order" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="population" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="label_x" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="label_y" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="label_rota" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="osm_id"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="z_order"/>
-        <constraint desc="" exp="" field="population"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rota"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="osm_id" exp="" desc=""/>
+        <constraint field="name" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
+        <constraint field="z_order" exp="" desc=""/>
+        <constraint field="population" exp="" desc=""/>
+        <constraint field="label_x" exp="" desc=""/>
+        <constraint field="label_y" exp="" desc=""/>
+        <constraint field="label_rota" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="id" width="-1" hidden="0" type="field"/>
-          <column name="osm_id" width="-1" hidden="0" type="field"/>
-          <column name="name" width="-1" hidden="0" type="field"/>
-          <column name="type" width="-1" hidden="0" type="field"/>
-          <column name="z_order" width="-1" hidden="0" type="field"/>
-          <column name="population" width="-1" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column name="label_x" width="-1" hidden="0" type="field"/>
-          <column name="label_y" width="-1" hidden="0" type="field"/>
-          <column name="label_rota" width="-1" hidden="0" type="field"/>
+          <column name="id" hidden="0" type="field" width="-1"/>
+          <column name="osm_id" hidden="0" type="field" width="-1"/>
+          <column name="name" hidden="0" type="field" width="-1"/>
+          <column name="type" hidden="0" type="field" width="-1"/>
+          <column name="z_order" hidden="0" type="field" width="-1"/>
+          <column name="population" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="label_x" hidden="0" type="field" width="-1"/>
+          <column name="label_y" hidden="0" type="field" width="-1"/>
+          <column name="label_rota" hidden="0" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7560,7 +7560,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" readOnly="0" maxScale="100000" type="vector" minScale="1e+08" simplifyLocal="1" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" geometry="Line" simplifyDrawingHints="0" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" labelsEnabled="1">
+    <maplayer wkbType="MultiLineString" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" simplifyLocal="1" simplifyMaxScale="1" simplifyDrawingHints="0" simplifyDrawingTol="1" maxScale="100000" minScale="1e+08" readOnly="0" autoRefreshTime="0" labelsEnabled="1" simplifyAlgorithm="0" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" type="vector" geometry="Line">
       <extent>
         <xmin>18.3437671999999985</xmin>
         <ymin>-34.02801110000000051</ymin>
@@ -7613,11 +7613,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" maxx="0" minz="0" miny="0" crs="" dimensions="2" maxz="0" minx="0"/>
+          <spatial crs="" dimensions="2" maxz="0" minx="0" maxy="0" minz="0" maxx="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -7644,61 +7644,61 @@ def my_form_open(dialog, layer, feature):
       <renderer-v2 type="nullSymbol"/>
       <labeling type="simple">
         <settings>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" fontSize="7" namedStyle="Regular" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="0.8" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="1" fontStrikeout="0" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="50" useSubstitutions="0">
-            <text-buffer bufferSizeUnits="MM" bufferDraw="1" bufferNoFill="0" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="0.6" bufferColor="255,255,255,255" bufferSize="1"/>
-            <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeJoinStyle="64" shapeRadiiY="0" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+          <text-style fontCapitals="0" blendMode="0" fontUnderline="0" isExpression="1" fontLetterSpacing="0" textOpacity="0.8" fontFamily="Myriad Pro" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Regular" useSubstitutions="0" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" fontSizeUnit="Point" textColor="0,0,0,255" fontWeight="50" multilineHeight="1" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSize="7" fontStrikeout="0" fontItalic="0">
+            <text-buffer bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="0.6" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255"/>
+            <background shapeSizeX="0" shapeRadiiUnit="MM" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBlendMode="0" shapeSizeUnit="MM" shapeSizeY="0" shapeSizeType="0" shapeBorderWidth="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeRotation="0" shapeOffsetX="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeRadiiY="0" shapeRadiiX="0" shapeOffsetY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOpacity="0.7" shadowScale="100" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowRadius="1.5" shadowRadiusUnit="MM" shadowUnder="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
             <substitutions/>
           </text-style>
-          <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-          <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="3" repeatDistanceUnits="MapUnit" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="4" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="3" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="0" maxCurvedCharAngleIn="20" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-          <rendering drawLabels="1" maxNumLabels="2000" mergeLines="1" labelPerPart="0" scaleMax="10000000" displayAll="0" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="5" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="1" scaleVisibility="0" obstacleFactor="0.42" fontMaxPixelSize="10000" obstacleType="0"/>
+          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" decimals="3" plussign="0" wrapChar="" reverseDirectionSymbol="0" multilineAlign="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" addDirectionSymbol="0" autoWrapLength="0"/>
+          <placement centroidInside="0" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" preserveRotation="1" quadOffset="4" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" placementFlags="4" maxCurvedCharAngleIn="20" repeatDistanceUnits="MapUnit" maxCurvedCharAngleOut="-20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="0" xOffset="0" priority="3" yOffset="0" geometryGenerator="" distUnits="MM" placement="3" offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering mergeLines="1" displayAll="0" obstacleType="0" scaleVisibility="0" obstacle="1" fontMaxPixelSize="10000" fontLimitPixelSize="0" obstacleFactor="0.42" drawLabels="1" labelPerPart="0" limitNumLabels="0" minFeatureSize="5" upsidedownLabels="0" zIndex="0" maxNumLabels="2000" scaleMax="10000000" scaleMin="1" fontMinPixelSize="3"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="AlwaysShow" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="field" value="always_sho" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="always_sho"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
                 <Option name="IsObstacle" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="&quot;&quot;" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value="&quot;&quot;"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="LabelRotation" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="360 - (&quot;label_rota&quot;)" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="360 - (&quot;label_rota&quot;)"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="PositionX" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="field" value="label_x" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="label_x"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
                 <Option name="PositionY" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="field" value="label_y" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="label_y"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
                 <Option name="Priority" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="type" value="1" type="int"/>
-                  <Option name="val" value="" type="QString"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="type" type="int" value="1"/>
+                  <Option name="val" type="QString" value=""/>
                 </Option>
                 <Option name="Show" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="type" value="1" type="int"/>
-                  <Option name="val" value="" type="QString"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="type" type="int" value="1"/>
+                  <Option name="val" type="QString" value=""/>
                 </Option>
                 <Option name="Size" type="Map">
-                  <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 name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </settings>
@@ -7716,21 +7716,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minimumSize="0" opacity="1" penAlpha="255" penColor="#000000" enabled="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeType="MM" diagramOrientation="Up" labelPlacementMethod="XHeight" scaleBasedVisibility="0" width="15" minScaleDenominator="100000" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" barWidth="5" backgroundAlpha="255" lineSizeType="MM" penWidth="0">
+        <DiagramCategory lineSizeType="MM" minimumSize="0" rotationOffset="270" height="15" backgroundColor="#ffffff" barWidth="5" penColor="#000000" scaleDependency="Area" scaleBasedVisibility="0" diagramOrientation="Up" enabled="0" sizeType="MM" penWidth="0" opacity="1" labelPlacementMethod="XHeight" minScaleDenominator="100000" penAlpha="255" backgroundAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" width="15" maxScaleDenominator="1e+08">
           <fontProperties style="" description="Arial,10,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+          <attribute color="#000000" field="" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" priority="0" linePlacementFlags="2" placement="2" showAll="1" dist="0">
+      <DiagramLayerSettings showAll="1" placement="2" linePlacementFlags="2" priority="0" zIndex="0" dist="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -7739,8 +7739,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -7749,8 +7749,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -7794,8 +7794,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -7887,61 +7887,61 @@ def my_form_open(dialog, layer, feature):
         <default expression="" applyOnUpdate="0" field="resident_a"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="osm_id"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="name"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="highway"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="waterway"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="aerialway"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="barrier"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="man_made"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="z_order"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="other_tags"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="never_show"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="label_x"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="label_y"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="label_rota"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="always_sho"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="resident_a"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="osm_id" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="name" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="highway" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="waterway" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="aerialway" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="barrier" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="man_made" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="z_order" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="other_tags" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="never_show" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="label_x" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="label_y" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="label_rota" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="always_sho" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="resident_a" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="osm_id"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="highway"/>
-        <constraint desc="" exp="" field="waterway"/>
-        <constraint desc="" exp="" field="aerialway"/>
-        <constraint desc="" exp="" field="barrier"/>
-        <constraint desc="" exp="" field="man_made"/>
-        <constraint desc="" exp="" field="z_order"/>
-        <constraint desc="" exp="" field="other_tags"/>
-        <constraint desc="" exp="" field="never_show"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rota"/>
-        <constraint desc="" exp="" field="always_sho"/>
-        <constraint desc="" exp="" field="resident_a"/>
+        <constraint field="osm_id" exp="" desc=""/>
+        <constraint field="name" exp="" desc=""/>
+        <constraint field="highway" exp="" desc=""/>
+        <constraint field="waterway" exp="" desc=""/>
+        <constraint field="aerialway" exp="" desc=""/>
+        <constraint field="barrier" exp="" desc=""/>
+        <constraint field="man_made" exp="" desc=""/>
+        <constraint field="z_order" exp="" desc=""/>
+        <constraint field="other_tags" exp="" desc=""/>
+        <constraint field="never_show" exp="" desc=""/>
+        <constraint field="label_x" exp="" desc=""/>
+        <constraint field="label_y" exp="" desc=""/>
+        <constraint field="label_rota" exp="" desc=""/>
+        <constraint field="always_sho" exp="" desc=""/>
+        <constraint field="resident_a" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;osm_id&quot;" sortOrder="1" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;osm_id&quot;" actionWidgetStyle="dropDown" sortOrder="1">
         <columns>
-          <column name="osm_id" width="-1" hidden="0" type="field"/>
-          <column name="name" width="-1" hidden="0" type="field"/>
-          <column name="z_order" width="-1" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column name="highway" width="-1" hidden="0" type="field"/>
-          <column name="waterway" width="-1" hidden="0" type="field"/>
-          <column name="aerialway" width="-1" hidden="0" type="field"/>
-          <column name="barrier" width="-1" hidden="0" type="field"/>
-          <column name="man_made" width="-1" hidden="0" type="field"/>
-          <column name="other_tags" width="-1" hidden="0" type="field"/>
-          <column name="never_show" width="-1" hidden="0" type="field"/>
-          <column name="label_x" width="-1" hidden="0" type="field"/>
-          <column name="label_y" width="-1" hidden="0" type="field"/>
-          <column name="label_rota" width="-1" hidden="0" type="field"/>
-          <column name="always_sho" width="-1" hidden="0" type="field"/>
-          <column name="resident_a" width="-1" hidden="0" type="field"/>
+          <column name="osm_id" hidden="0" type="field" width="-1"/>
+          <column name="name" hidden="0" type="field" width="-1"/>
+          <column name="z_order" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="highway" hidden="0" type="field" width="-1"/>
+          <column name="waterway" hidden="0" type="field" width="-1"/>
+          <column name="aerialway" hidden="0" type="field" width="-1"/>
+          <column name="barrier" hidden="0" type="field" width="-1"/>
+          <column name="man_made" hidden="0" type="field" width="-1"/>
+          <column name="other_tags" hidden="0" type="field" width="-1"/>
+          <column name="never_show" hidden="0" type="field" width="-1"/>
+          <column name="label_x" hidden="0" type="field" width="-1"/>
+          <column name="label_y" hidden="0" type="field" width="-1"/>
+          <column name="label_rota" hidden="0" type="field" width="-1"/>
+          <column name="always_sho" hidden="0" type="field" width="-1"/>
+          <column name="resident_a" hidden="0" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8088,7 +8088,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" readOnly="0" maxScale="0" type="vector" minScale="1e+08" simplifyLocal="1" wkbType="Point" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" geometry="Point" simplifyDrawingHints="0" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" labelsEnabled="1">
+    <maplayer wkbType="Point" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" simplifyLocal="1" simplifyMaxScale="1" simplifyDrawingHints="0" simplifyDrawingTol="1" maxScale="0" minScale="1e+08" readOnly="0" autoRefreshTime="0" labelsEnabled="1" simplifyAlgorithm="0" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" type="vector" geometry="Point">
       <extent>
         <xmin>18.3984390148267174</xmin>
         <ymin>-33.90832575607554134</ymin>
@@ -8132,7 +8132,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -8152,18 +8152,18 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" forceraster="0" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 type="RuleRenderer" enableorderby="0" symbollevels="0" forceraster="0">
         <rules key="{0927a9cd-bbb2-44ea-811b-fdbcb767a09a}">
-          <rule symbol="0" filter="regexp_match( &quot;type&quot;, '(start|finish)')" key="{efda7615-994b-459d-a657-ee8185286b0b}"/>
-          <rule symbol="1" filter="&quot;type&quot; = 'toilets'" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}"/>
-          <rule symbol="2" filter="&quot;type&quot; = 'togbag'" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}"/>
-          <rule symbol="3" filter=" &quot;type&quot; = 'closure'" key="{67af661e-65f1-44a7-9993-d5a668077b33}"/>
-          <rule symbol="4" filter="&quot;type&quot; = 'myciti'" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}"/>
-          <rule symbol="5" filter="&quot;type&quot; = 'parking'" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}"/>
+          <rule filter="regexp_match( &quot;type&quot;, '(start|finish)')" symbol="0" key="{efda7615-994b-459d-a657-ee8185286b0b}"/>
+          <rule filter="&quot;type&quot; = 'toilets'" symbol="1" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}"/>
+          <rule filter="&quot;type&quot; = 'togbag'" symbol="2" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}"/>
+          <rule filter=" &quot;type&quot; = 'closure'" symbol="3" key="{67af661e-65f1-44a7-9993-d5a668077b33}"/>
+          <rule filter="&quot;type&quot; = 'myciti'" symbol="4" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}"/>
+          <rule filter="&quot;type&quot; = 'parking'" symbol="5" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}"/>
         </rules>
         <symbols>
-          <symbol name="0" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-            <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
+          <symbol name="0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker">
               <prop v="0" k="angle"/>
               <prop v="0,0,0,255" k="color"/>
               <prop v="1" k="horizontal_anchor_point"/>
@@ -8184,21 +8184,21 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="size" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( @map_scale &lt; 7000, '14', '7' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '14', '7' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-            <layer enabled="1" pass="0" class="SvgMarker" locked="0">
+          <symbol name="1" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+            <layer locked="0" pass="0" enabled="1" class="SvgMarker">
               <prop v="0" k="angle"/>
               <prop v="0,32,80,255" k="color"/>
               <prop v="0" k="fixedAspectRatio"/>
@@ -8218,21 +8218,21 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="size" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( @map_scale &lt; 7000, '10', '5' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '10', '5' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-            <layer enabled="1" pass="0" class="SvgMarker" locked="0">
+          <symbol name="2" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+            <layer locked="0" pass="0" enabled="1" class="SvgMarker">
               <prop v="0" k="angle"/>
               <prop v="0,0,0,255" k="color"/>
               <prop v="0" k="fixedAspectRatio"/>
@@ -8252,31 +8252,31 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="fillColor" type="Map">
-                      <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 name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;distance&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;distance&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;distance&quot; = '5KM'  THEN '#456419'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="outlineColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="size" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( @map_scale &lt; 7000, '10', '5' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '10', '5' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-            <layer enabled="1" pass="0" class="SvgMarker" locked="0">
+          <symbol name="3" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+            <layer locked="0" pass="0" enabled="1" class="SvgMarker">
               <prop v="0" k="angle"/>
               <prop v="125,139,143,255" k="color"/>
               <prop v="0" k="fixedAspectRatio"/>
@@ -8296,21 +8296,21 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="size" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( @map_scale &lt; 7000, '10', '6' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '10', '6' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="4" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-            <layer enabled="1" pass="0" class="SvgMarker" locked="0">
+          <symbol name="4" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+            <layer locked="0" pass="0" enabled="1" class="SvgMarker">
               <prop v="0" k="angle"/>
               <prop v="0,12,254,255" k="color"/>
               <prop v="0" k="fixedAspectRatio"/>
@@ -8402,19 +8402,19 @@ def my_form_open(dialog, layer, feature):
               </effect>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="size" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="0.875*(if( @map_scale &lt; 7000, '14', '7' ))" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="0.875*(if( @map_scale &lt; 7000, '14', '7' ))"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker">
               <prop v="0" k="angle"/>
               <prop v="255,0,0,0" k="color"/>
               <prop v="1" k="horizontal_anchor_point"/>
@@ -8435,21 +8435,21 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="size" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( @map_scale &lt; 7000, '14', '7' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '14', '7' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="5" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-            <layer enabled="1" pass="0" class="SvgMarker" locked="0">
+          <symbol name="5" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+            <layer locked="0" pass="0" enabled="1" class="SvgMarker">
               <prop v="0" k="angle"/>
               <prop v="43,153,41,255" k="color"/>
               <prop v="0" k="fixedAspectRatio"/>
@@ -8469,15 +8469,15 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="size" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( @map_scale &lt; 7000, '10', '5' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '10', '5' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -8486,36 +8486,36 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" fontSize="10" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="0.9" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="0" fontStrikeout="0" fieldName="name" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-            <text-buffer bufferSizeUnits="MM" bufferDraw="1" bufferNoFill="0" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="0.8" bufferColor="255,255,255,255" bufferSize="2"/>
-            <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeJoinStyle="64" shapeRadiiY="2" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="0" shapeRadiiX="2" shapeBorderWidth="0" shapeSizeY="1" shapeOffsetUnit="MM" shapeOpacity="0.7" shapeSVGFile="" shapeSizeX="1" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+          <text-style fontCapitals="0" blendMode="0" fontUnderline="0" isExpression="0" fontLetterSpacing="0" textOpacity="0.9" fontFamily="Myriad Pro" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" useSubstitutions="0" fieldName="name" fontSizeUnit="Point" textColor="0,0,0,255" fontWeight="63" multilineHeight="1" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSize="10" fontStrikeout="0" fontItalic="0">
+            <text-buffer bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="0.8" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="2" bufferColor="255,255,255,255"/>
+            <background shapeSizeX="1" shapeRadiiUnit="MM" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBlendMode="0" shapeSizeUnit="MM" shapeSizeY="1" shapeSizeType="0" shapeBorderWidth="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.7" shapeRotation="0" shapeOffsetX="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeRadiiY="2" shapeRadiiX="2" shapeOffsetY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOpacity="0.7" shadowScale="100" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowRadius="1.5" shadowRadiusUnit="MM" shadowUnder="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
             <substitutions/>
           </text-style>
-          <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-          <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="2" placement="0" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="10" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MM" dist="3" maxCurvedCharAngleIn="25" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" yOffset="3" xOffset="2" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-          <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="0" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="10" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="0" scaleVisibility="0" obstacleFactor="1.8" fontMaxPixelSize="10000" obstacleType="0"/>
+          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" decimals="3" plussign="0" wrapChar="" reverseDirectionSymbol="0" multilineAlign="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" addDirectionSymbol="0" autoWrapLength="0"/>
+          <placement centroidInside="0" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" preserveRotation="1" quadOffset="2" offsetUnits="MM" geometryGeneratorType="PointGeometry" placementFlags="10" maxCurvedCharAngleIn="25" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-25" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="3" xOffset="2" priority="10" yOffset="3" geometryGenerator="" distUnits="MM" placement="0" offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering mergeLines="0" displayAll="1" obstacleType="0" scaleVisibility="0" obstacle="1" fontMaxPixelSize="10000" fontLimitPixelSize="0" obstacleFactor="1.8" drawLabels="1" labelPerPart="0" limitNumLabels="0" minFeatureSize="0" upsidedownLabels="0" zIndex="10" maxNumLabels="2000" scaleMax="0" scaleMin="0" fontMinPixelSize="3"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="LabelDistance" type="Map">
-                  <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 name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '5', '3' )"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="OffsetQuad" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="2" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="2"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="Size" type="Map">
-                  <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 name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '14', '10' )"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </settings>
@@ -8530,21 +8530,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minimumSize="0" opacity="1" penAlpha="255" penColor="#000000" enabled="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeType="MM" diagramOrientation="Up" labelPlacementMethod="XHeight" scaleBasedVisibility="0" width="15" minScaleDenominator="0" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" barWidth="5" backgroundAlpha="255" lineSizeType="MM" penWidth="0">
+        <DiagramCategory lineSizeType="MM" minimumSize="0" rotationOffset="270" height="15" backgroundColor="#ffffff" barWidth="5" penColor="#000000" scaleDependency="Area" scaleBasedVisibility="0" diagramOrientation="Up" enabled="0" sizeType="MM" penWidth="0" opacity="1" labelPlacementMethod="XHeight" minScaleDenominator="0" penAlpha="255" backgroundAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" width="15" maxScaleDenominator="1e+08">
           <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+          <attribute color="#000000" field="" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" priority="0" linePlacementFlags="18" placement="0" showAll="1" dist="0">
+      <DiagramLayerSettings showAll="1" placement="0" linePlacementFlags="18" priority="0" zIndex="0" dist="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -8593,28 +8593,28 @@ def my_form_open(dialog, layer, feature):
         <default expression="" applyOnUpdate="0" field="distance"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="id"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="type"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="name"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="distance"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="id" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="type" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="name" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="distance" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="distance"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
+        <constraint field="name" exp="" desc=""/>
+        <constraint field="distance" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;type&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;type&quot;" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="id" width="-1" hidden="0" type="field"/>
-          <column name="type" width="-1" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column name="name" width="-1" hidden="0" type="field"/>
-          <column name="distance" width="-1" hidden="0" type="field"/>
+          <column name="id" hidden="0" type="field" width="-1"/>
+          <column name="type" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="name" hidden="0" type="field" width="-1"/>
+          <column name="distance" hidden="0" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8660,19 +8660,19 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" readOnly="0" maxScale="100000" type="vector" minScale="1e+08" simplifyLocal="1" wkbType="Point" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" geometry="Point" simplifyDrawingHints="0" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" labelsEnabled="1">
+    <maplayer wkbType="Point" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" simplifyLocal="1" simplifyMaxScale="1" simplifyDrawingHints="0" simplifyDrawingTol="1" maxScale="100000" minScale="1e+08" readOnly="0" autoRefreshTime="0" labelsEnabled="1" simplifyAlgorithm="0" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" type="vector" geometry="Point">
       <extent>
-        <xmin>18.3754509738640941</xmin>
-        <ymin>-33.94260795275215514</ymin>
-        <xmax>18.41919710472834737</xmax>
-        <ymax>-33.8999969693438814</ymax>
+        <xmin>18.37544309819313781</xmin>
+        <ymin>-33.94257978420861122</ymin>
+        <xmax>18.41917299546326348</xmax>
+        <ymax>-33.89998955749085496</ymax>
       </extent>
-      <id>proposed_road_markers_2b454f1d_6ad8_4b91_805f_f503490286b2</id>
+      <id>proposed_route_markers_b3dac0b0_ee05_431b_a89e_52cc9d9162b0</id>
       <datasource>memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:Integer64(10,0)&amp;field=length_m:Real(10,10)&amp;field=length_km:Real(10,10)&amp;field=Source:String(20,0)&amp;field=org_fid:(0,0)&amp;field=distance:(0,0)</datasource>
       <keywordList>
         <value></value>
       </keywordList>
-      <layername>proposed road markers</layername>
+      <layername>proposed route markers</layername>
       <srs>
         <spatialrefsys>
           <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
@@ -8692,15 +8692,6 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
-        <contact>
-          <name></name>
-          <organization></organization>
-          <position></position>
-          <voice></voice>
-          <fax></fax>
-          <email></email>
-          <role></role>
-        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -8716,15 +8707,7 @@ def my_form_open(dialog, layer, feature):
             <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent>
-          <spatial maxy="0" maxx="0" minz="0" miny="0" crs="" dimensions="2" maxz="0" minx="0"/>
-          <temporal>
-            <period>
-              <start></start>
-              <end></end>
-            </period>
-          </temporal>
-        </extent>
+        <extent/>
       </resourceMetadata>
       <provider encoding="UTF-8">memory</provider>
       <vectorjoins/>
@@ -8744,251 +8727,251 @@ def my_form_open(dialog, layer, feature):
       <renderer-v2 type="nullSymbol"/>
       <labeling type="rule-based">
         <rules key="{9dfa2d77-6e52-4640-91f6-8cd0a7b822ed}">
-          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{a130bab9-8b6c-4395-8ba0-7ae70031713d}" description="Active">
-            <rule filter="&quot;Source&quot; = '21KM'" key="{c646d958-ac1a-4ea1-99c1-2c147334f417}" description="21KM">
+          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="Active" key="{a130bab9-8b6c-4395-8ba0-7ae70031713d}">
+            <rule filter="&quot;Source&quot; = '21KM'" description="21KM" key="{c646d958-ac1a-4ea1-99c1-2c147334f417}">
               <settings>
-                <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" fontSize="10" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="1" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="1" fontStrikeout="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-                  <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                  <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="210,32,39,255" shapeType="0" shapeJoinStyle="128" shapeRadiiY="1" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="210,32,39,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="1" shapeBorderWidth="1" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="1" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+                <text-style fontCapitals="0" blendMode="0" fontUnderline="0" isExpression="1" fontLetterSpacing="0" textOpacity="1" fontFamily="Myriad Pro" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" useSubstitutions="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSizeUnit="Point" textColor="255,255,255,255" fontWeight="63" multilineHeight="1" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSize="10" fontStrikeout="0" fontItalic="0">
+                  <text-buffer bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255"/>
+                  <background shapeSizeX="1" shapeRadiiUnit="MM" shapeBorderColor="210,32,39,255" shapeJoinStyle="128" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBlendMode="0" shapeSizeUnit="MM" shapeSizeY="0" shapeSizeType="0" shapeBorderWidth="1" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeRotation="0" shapeOffsetX="0" shapeFillColor="210,32,39,255" shapeType="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeRadiiY="1" shapeRadiiX="1" shapeOffsetY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOpacity="0.7" shadowScale="100" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowRadius="1.5" shadowRadiusUnit="MM" shadowUnder="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
                   <substitutions/>
                 </text-style>
-                <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="0" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-                <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="3" placement="6" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="10" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="2" maxCurvedCharAngleIn="20" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-                <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="1" scaleVisibility="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacleType="0"/>
+                <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" decimals="0" plussign="0" wrapChar="" reverseDirectionSymbol="0" multilineAlign="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" addDirectionSymbol="0" autoWrapLength="0"/>
+                <placement centroidInside="0" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" preserveRotation="1" quadOffset="3" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" placementFlags="10" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="2" xOffset="0" priority="10" yOffset="0" geometryGenerator="" distUnits="MM" placement="6" offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0"/>
+                <rendering mergeLines="0" displayAll="1" obstacleType="0" scaleVisibility="0" obstacle="1" fontMaxPixelSize="10000" fontLimitPixelSize="0" obstacleFactor="2" drawLabels="1" labelPerPart="0" limitNumLabels="0" minFeatureSize="0" upsidedownLabels="0" zIndex="0" maxNumLabels="2000" scaleMax="10000000" scaleMin="1" fontMinPixelSize="3"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties" type="Map">
                       <Option name="PositionX" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
                       <Option name="PositionY" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
                       <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="field" value="quadrant" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="quadrant"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                       <Option name="Rotation" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="field" value="rotation" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="field" type="QString" value="rotation"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                     </Option>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
               </settings>
             </rule>
-            <rule filter="&quot;Source&quot; = '10KM'" key="{b2fb2188-6121-4982-bc1c-04ddb70f9be7}" description="10KM">
+            <rule filter="&quot;Source&quot; = '10KM'" description="10KM" key="{b2fb2188-6121-4982-bc1c-04ddb70f9be7}">
               <settings>
-                <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" fontSize="10" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="1" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="1" fontStrikeout="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-                  <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                  <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="103,34,144,255" shapeType="0" shapeJoinStyle="128" shapeRadiiY="1" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="103,34,144,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="1" shapeBorderWidth="1" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="1" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+                <text-style fontCapitals="0" blendMode="0" fontUnderline="0" isExpression="1" fontLetterSpacing="0" textOpacity="1" fontFamily="Myriad Pro" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" useSubstitutions="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSizeUnit="Point" textColor="255,255,255,255" fontWeight="63" multilineHeight="1" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSize="10" fontStrikeout="0" fontItalic="0">
+                  <text-buffer bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255"/>
+                  <background shapeSizeX="1" shapeRadiiUnit="MM" shapeBorderColor="103,34,144,255" shapeJoinStyle="128" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBlendMode="0" shapeSizeUnit="MM" shapeSizeY="0" shapeSizeType="0" shapeBorderWidth="1" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeRotation="0" shapeOffsetX="0" shapeFillColor="103,34,144,255" shapeType="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeRadiiY="1" shapeRadiiX="1" shapeOffsetY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOpacity="0.7" shadowScale="100" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowRadius="1.5" shadowRadiusUnit="MM" shadowUnder="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
                   <substitutions/>
                 </text-style>
-                <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="0" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-                <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="6" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="10" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="2" maxCurvedCharAngleIn="20" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-                <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="1" scaleVisibility="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacleType="0"/>
+                <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" decimals="0" plussign="0" wrapChar="" reverseDirectionSymbol="0" multilineAlign="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" addDirectionSymbol="0" autoWrapLength="0"/>
+                <placement centroidInside="0" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" preserveRotation="1" quadOffset="4" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" placementFlags="10" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="2" xOffset="0" priority="10" yOffset="0" geometryGenerator="" distUnits="MM" placement="6" offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0"/>
+                <rendering mergeLines="0" displayAll="1" obstacleType="0" scaleVisibility="0" obstacle="1" fontMaxPixelSize="10000" fontLimitPixelSize="0" obstacleFactor="2" drawLabels="1" labelPerPart="0" limitNumLabels="0" minFeatureSize="0" upsidedownLabels="0" zIndex="0" maxNumLabels="2000" scaleMax="10000000" scaleMin="1" fontMinPixelSize="3"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties" type="Map">
                       <Option name="PositionX" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
                       <Option name="PositionY" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
                       <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="field" value="quadrant" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="quadrant"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                       <Option name="Rotation" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="field" value="rotation" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="field" type="QString" value="rotation"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                     </Option>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
               </settings>
             </rule>
-            <rule filter="&quot;Source&quot; = '5KM'" key="{7b3b06bf-7cd8-4b3c-9c28-a4b85c60458e}" description="5KM">
+            <rule filter="&quot;Source&quot; = '5KM'" description="5KM" key="{7b3b06bf-7cd8-4b3c-9c28-a4b85c60458e}">
               <settings>
-                <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" fontSize="10" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="1" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="1" fontStrikeout="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-                  <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                  <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="145,211,55,255" shapeType="0" shapeJoinStyle="128" shapeRadiiY="1" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="145,211,55,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="1" shapeBorderWidth="1" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="1" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+                <text-style fontCapitals="0" blendMode="0" fontUnderline="0" isExpression="1" fontLetterSpacing="0" textOpacity="1" fontFamily="Myriad Pro" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" useSubstitutions="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontSizeUnit="Point" textColor="255,255,255,255" fontWeight="63" multilineHeight="1" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSize="10" fontStrikeout="0" fontItalic="0">
+                  <text-buffer bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255"/>
+                  <background shapeSizeX="1" shapeRadiiUnit="MM" shapeBorderColor="145,211,55,255" shapeJoinStyle="128" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBlendMode="0" shapeSizeUnit="MM" shapeSizeY="0" shapeSizeType="0" shapeBorderWidth="1" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeRotation="0" shapeOffsetX="0" shapeFillColor="145,211,55,255" shapeType="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeRadiiY="1" shapeRadiiX="1" shapeOffsetY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOpacity="0.7" shadowScale="100" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowRadius="1.5" shadowRadiusUnit="MM" shadowUnder="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
                   <substitutions/>
                 </text-style>
-                <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="0" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-                <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="6" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="10" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="2" maxCurvedCharAngleIn="20" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-                <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="1" scaleVisibility="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacleType="0"/>
+                <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" decimals="0" plussign="0" wrapChar="" reverseDirectionSymbol="0" multilineAlign="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" addDirectionSymbol="0" autoWrapLength="0"/>
+                <placement centroidInside="0" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" preserveRotation="1" quadOffset="4" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" placementFlags="10" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="2" xOffset="0" priority="10" yOffset="0" geometryGenerator="" distUnits="MM" placement="6" offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0"/>
+                <rendering mergeLines="0" displayAll="1" obstacleType="0" scaleVisibility="0" obstacle="1" fontMaxPixelSize="10000" fontLimitPixelSize="0" obstacleFactor="2" drawLabels="1" labelPerPart="0" limitNumLabels="0" minFeatureSize="0" upsidedownLabels="0" zIndex="0" maxNumLabels="2000" scaleMax="10000000" scaleMin="1" fontMinPixelSize="3"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties" type="Map">
                       <Option name="PositionX" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
                       <Option name="PositionY" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
                       <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="field" value="quadrant" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="quadrant"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                       <Option name="Rotation" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="field" value="rotation" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="field" type="QString" value="rotation"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                     </Option>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
               </settings>
             </rule>
           </rule>
-          <rule key="{2b06f76f-7537-425c-a1e0-da99f8965c9f}" description="Always show" active="0">
-            <rule filter="&quot;Source&quot; = '21KM'" key="{c739bb0e-e629-4c73-abbd-017b5b56ae01}" description="21KM" active="0">
+          <rule active="0" description="Always show" key="{2b06f76f-7537-425c-a1e0-da99f8965c9f}">
+            <rule active="0" filter="&quot;Source&quot; = '21KM'" description="21KM" key="{c739bb0e-e629-4c73-abbd-017b5b56ae01}">
               <settings>
-                <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" fontSize="8" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="1" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="1" fontStrikeout="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-                  <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                  <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="210,32,39,255" shapeType="0" shapeJoinStyle="128" shapeRadiiY="1" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="210,32,39,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="0.5" shapeBorderWidth="1" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="0.5" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+                <text-style fontCapitals="0" blendMode="0" fontUnderline="0" isExpression="1" fontLetterSpacing="0" textOpacity="1" fontFamily="Myriad Pro" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" useSubstitutions="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSizeUnit="Point" textColor="255,255,255,255" fontWeight="63" multilineHeight="1" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSize="8" fontStrikeout="0" fontItalic="0">
+                  <text-buffer bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255"/>
+                  <background shapeSizeX="0.5" shapeRadiiUnit="MM" shapeBorderColor="210,32,39,255" shapeJoinStyle="128" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBlendMode="0" shapeSizeUnit="MM" shapeSizeY="0" shapeSizeType="0" shapeBorderWidth="1" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeRotation="0" shapeOffsetX="0" shapeFillColor="210,32,39,255" shapeType="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeRadiiY="1" shapeRadiiX="0.5" shapeOffsetY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOpacity="0.7" shadowScale="100" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowRadius="1.5" shadowRadiusUnit="MM" shadowUnder="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
                   <substitutions/>
                 </text-style>
-                <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="0" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-                <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="3" placement="6" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="10" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="2" maxCurvedCharAngleIn="20" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-                <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="1" scaleVisibility="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacleType="0"/>
+                <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" decimals="0" plussign="0" wrapChar="" reverseDirectionSymbol="0" multilineAlign="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" addDirectionSymbol="0" autoWrapLength="0"/>
+                <placement centroidInside="0" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" preserveRotation="1" quadOffset="3" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" placementFlags="10" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="2" xOffset="0" priority="10" yOffset="0" geometryGenerator="" distUnits="MM" placement="6" offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0"/>
+                <rendering mergeLines="0" displayAll="1" obstacleType="0" scaleVisibility="0" obstacle="1" fontMaxPixelSize="10000" fontLimitPixelSize="0" obstacleFactor="2" drawLabels="1" labelPerPart="0" limitNumLabels="0" minFeatureSize="0" upsidedownLabels="0" zIndex="0" maxNumLabels="2000" scaleMax="10000000" scaleMin="1" fontMinPixelSize="3"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties" type="Map">
                       <Option name="PositionX" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
                       <Option name="PositionY" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
                       <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="field" value="quadrant" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="quadrant"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                       <Option name="Rotation" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="field" value="rotation" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="field" type="QString" value="rotation"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                     </Option>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
               </settings>
             </rule>
-            <rule filter="&quot;Source&quot; = '10KM'" key="{3edc5d00-f213-44ae-9a91-62cbf88e850c}" description="10KM" active="0">
+            <rule active="0" filter="&quot;Source&quot; = '10KM'" description="10KM" key="{3edc5d00-f213-44ae-9a91-62cbf88e850c}">
               <settings>
-                <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" fontSize="8" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="1" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="1" fontStrikeout="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-                  <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                  <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="103,34,144,255" shapeType="0" shapeJoinStyle="128" shapeRadiiY="1" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="103,34,144,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="0.5" shapeBorderWidth="1" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="0.5" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+                <text-style fontCapitals="0" blendMode="0" fontUnderline="0" isExpression="1" fontLetterSpacing="0" textOpacity="1" fontFamily="Myriad Pro" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" useSubstitutions="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSizeUnit="Point" textColor="255,255,255,255" fontWeight="63" multilineHeight="1" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSize="8" fontStrikeout="0" fontItalic="0">
+                  <text-buffer bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255"/>
+                  <background shapeSizeX="0.5" shapeRadiiUnit="MM" shapeBorderColor="103,34,144,255" shapeJoinStyle="128" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBlendMode="0" shapeSizeUnit="MM" shapeSizeY="0" shapeSizeType="0" shapeBorderWidth="1" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeRotation="0" shapeOffsetX="0" shapeFillColor="103,34,144,255" shapeType="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeRadiiY="1" shapeRadiiX="0.5" shapeOffsetY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOpacity="0.7" shadowScale="100" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowRadius="1.5" shadowRadiusUnit="MM" shadowUnder="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
                   <substitutions/>
                 </text-style>
-                <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="0" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-                <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="6" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="10" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="2" maxCurvedCharAngleIn="20" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-                <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="1" scaleVisibility="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacleType="0"/>
+                <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" decimals="0" plussign="0" wrapChar="" reverseDirectionSymbol="0" multilineAlign="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" addDirectionSymbol="0" autoWrapLength="0"/>
+                <placement centroidInside="0" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" preserveRotation="1" quadOffset="4" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" placementFlags="10" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="2" xOffset="0" priority="10" yOffset="0" geometryGenerator="" distUnits="MM" placement="6" offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0"/>
+                <rendering mergeLines="0" displayAll="1" obstacleType="0" scaleVisibility="0" obstacle="1" fontMaxPixelSize="10000" fontLimitPixelSize="0" obstacleFactor="2" drawLabels="1" labelPerPart="0" limitNumLabels="0" minFeatureSize="0" upsidedownLabels="0" zIndex="0" maxNumLabels="2000" scaleMax="10000000" scaleMin="1" fontMinPixelSize="3"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties" type="Map">
                       <Option name="PositionX" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
                       <Option name="PositionY" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
                       <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="field" value="quadrant" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="quadrant"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                       <Option name="Rotation" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="field" value="rotation" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="field" type="QString" value="rotation"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                     </Option>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
               </settings>
             </rule>
-            <rule filter="&quot;Source&quot; = '5KM'" key="{1b5b2a5b-81b0-42be-86e5-12e6f7f654bc}" description="5KM" active="0">
+            <rule active="0" filter="&quot;Source&quot; = '5KM'" description="5KM" key="{1b5b2a5b-81b0-42be-86e5-12e6f7f654bc}">
               <settings>
-                <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" fontSize="8" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="1" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="1" fontStrikeout="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-                  <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                  <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="145,211,55,255" shapeType="0" shapeJoinStyle="128" shapeRadiiY="1" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="145,211,55,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="0.5" shapeBorderWidth="1" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="0.5" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+                <text-style fontCapitals="0" blendMode="0" fontUnderline="0" isExpression="1" fontLetterSpacing="0" textOpacity="1" fontFamily="Myriad Pro" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" useSubstitutions="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontSizeUnit="Point" textColor="255,255,255,255" fontWeight="63" multilineHeight="1" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSize="8" fontStrikeout="0" fontItalic="0">
+                  <text-buffer bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255"/>
+                  <background shapeSizeX="0.5" shapeRadiiUnit="MM" shapeBorderColor="145,211,55,255" shapeJoinStyle="128" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBlendMode="0" shapeSizeUnit="MM" shapeSizeY="0" shapeSizeType="0" shapeBorderWidth="1" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeRotation="0" shapeOffsetX="0" shapeFillColor="145,211,55,255" shapeType="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeRadiiY="1" shapeRadiiX="0.5" shapeOffsetY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOpacity="0.7" shadowScale="100" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowRadius="1.5" shadowRadiusUnit="MM" shadowUnder="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
                   <substitutions/>
                 </text-style>
-                <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="0" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-                <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="6" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="10" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="2" maxCurvedCharAngleIn="20" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-                <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="1" scaleVisibility="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacleType="0"/>
+                <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" decimals="0" plussign="0" wrapChar="" reverseDirectionSymbol="0" multilineAlign="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" addDirectionSymbol="0" autoWrapLength="0"/>
+                <placement centroidInside="0" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" preserveRotation="1" quadOffset="4" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" placementFlags="10" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="2" xOffset="0" priority="10" yOffset="0" geometryGenerator="" distUnits="MM" placement="6" offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0"/>
+                <rendering mergeLines="0" displayAll="1" obstacleType="0" scaleVisibility="0" obstacle="1" fontMaxPixelSize="10000" fontLimitPixelSize="0" obstacleFactor="2" drawLabels="1" labelPerPart="0" limitNumLabels="0" minFeatureSize="0" upsidedownLabels="0" zIndex="0" maxNumLabels="2000" scaleMax="10000000" scaleMin="1" fontMinPixelSize="3"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties" type="Map">
                       <Option name="PositionX" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
                       <Option name="PositionY" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
                       <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="field" value="quadrant" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="quadrant"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                       <Option name="Rotation" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="field" value="rotation" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="field" type="QString" value="rotation"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                     </Option>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
               </settings>
@@ -9006,21 +8989,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minimumSize="0" opacity="1" penAlpha="255" penColor="#000000" enabled="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeType="MM" diagramOrientation="Up" labelPlacementMethod="XHeight" scaleBasedVisibility="0" width="15" minScaleDenominator="100000" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" barWidth="5" backgroundAlpha="255" lineSizeType="MM" penWidth="0">
+        <DiagramCategory lineSizeType="MM" minimumSize="0" rotationOffset="270" height="15" backgroundColor="#ffffff" barWidth="5" penColor="#000000" scaleDependency="Area" scaleBasedVisibility="0" diagramOrientation="Up" enabled="0" sizeType="MM" penWidth="0" opacity="1" labelPlacementMethod="XHeight" minScaleDenominator="100000" penAlpha="255" backgroundAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" width="15" maxScaleDenominator="1e+08">
           <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+          <attribute color="#000000" field="" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" priority="0" linePlacementFlags="2" placement="0" showAll="1" dist="0">
+      <DiagramLayerSettings showAll="1" placement="0" linePlacementFlags="2" priority="0" zIndex="0" dist="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -9029,8 +9012,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -9039,8 +9022,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -9049,8 +9032,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -9059,8 +9042,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -9069,8 +9052,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -9079,8 +9062,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -9089,8 +9072,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -9099,8 +9082,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -9109,8 +9092,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -9119,8 +9102,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -9129,8 +9112,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -9139,8 +9122,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -9177,52 +9160,52 @@ def my_form_open(dialog, layer, feature):
         <default expression="" applyOnUpdate="0" field="distance"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Name"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="descriptio"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="timestamp"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="begin"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="end"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Distance"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="RouteLen"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="length_m"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="length_km"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Source"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="org_fid"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="distance"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="Name" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="descriptio" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="timestamp" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="begin" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="end" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="Distance" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="RouteLen" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="length_m" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="length_km" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="Source" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="org_fid" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="distance" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="Name"/>
-        <constraint desc="" exp="" field="descriptio"/>
-        <constraint desc="" exp="" field="timestamp"/>
-        <constraint desc="" exp="" field="begin"/>
-        <constraint desc="" exp="" field="end"/>
-        <constraint desc="" exp="" field="Distance"/>
-        <constraint desc="" exp="" field="RouteLen"/>
-        <constraint desc="" exp="" field="length_m"/>
-        <constraint desc="" exp="" field="length_km"/>
-        <constraint desc="" exp="" field="Source"/>
-        <constraint desc="" exp="" field="org_fid"/>
-        <constraint desc="" exp="" field="distance"/>
+        <constraint field="Name" exp="" desc=""/>
+        <constraint field="descriptio" exp="" desc=""/>
+        <constraint field="timestamp" exp="" desc=""/>
+        <constraint field="begin" exp="" desc=""/>
+        <constraint field="end" exp="" desc=""/>
+        <constraint field="Distance" exp="" desc=""/>
+        <constraint field="RouteLen" exp="" desc=""/>
+        <constraint field="length_m" exp="" desc=""/>
+        <constraint field="length_km" exp="" desc=""/>
+        <constraint field="Source" exp="" desc=""/>
+        <constraint field="org_fid" exp="" desc=""/>
+        <constraint field="distance" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;distance&quot;" sortOrder="1" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;distance&quot;" actionWidgetStyle="dropDown" sortOrder="1">
         <columns>
-          <column width="-1" hidden="1" type="actions"/>
-          <column name="org_fid" width="-1" hidden="0" type="field"/>
-          <column name="distance" width="-1" hidden="0" type="field"/>
-          <column name="Name" width="-1" hidden="0" type="field"/>
-          <column name="Source" width="-1" hidden="0" type="field"/>
-          <column name="RouteLen" width="-1" hidden="0" type="field"/>
-          <column name="descriptio" width="-1" hidden="0" type="field"/>
-          <column name="timestamp" width="-1" hidden="0" type="field"/>
-          <column name="begin" width="-1" hidden="0" type="field"/>
-          <column name="end" width="-1" hidden="0" type="field"/>
-          <column name="Distance" width="-1" hidden="0" type="field"/>
-          <column name="length_m" width="-1" hidden="0" type="field"/>
-          <column name="length_km" width="-1" hidden="0" type="field"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="org_fid" hidden="0" type="field" width="-1"/>
+          <column name="distance" hidden="0" type="field" width="-1"/>
+          <column name="Name" hidden="0" type="field" width="-1"/>
+          <column name="Source" hidden="0" type="field" width="-1"/>
+          <column name="RouteLen" hidden="0" type="field" width="-1"/>
+          <column name="descriptio" hidden="0" type="field" width="-1"/>
+          <column name="timestamp" hidden="0" type="field" width="-1"/>
+          <column name="begin" hidden="0" type="field" width="-1"/>
+          <column name="end" hidden="0" type="field" width="-1"/>
+          <column name="Distance" hidden="0" type="field" width="-1"/>
+          <column name="length_m" hidden="0" type="field" width="-1"/>
+          <column name="length_km" hidden="0" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9286,7 +9269,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
       <mapTip>Text</mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" readOnly="0" maxScale="100000" type="vector" minScale="1e+08" simplifyLocal="1" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" geometry="Line" simplifyDrawingHints="0" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" labelsEnabled="0">
+    <maplayer wkbType="MultiLineString" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" simplifyLocal="1" simplifyMaxScale="1" simplifyDrawingHints="0" simplifyDrawingTol="1" maxScale="100000" minScale="1e+08" readOnly="0" autoRefreshTime="0" labelsEnabled="0" simplifyAlgorithm="0" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" type="vector" geometry="Line">
       <extent>
         <xmin>18.37527226735897301</xmin>
         <ymin>-33.94586066151139647</ymin>
@@ -9339,11 +9322,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" maxx="0" minz="0" miny="0" crs="" dimensions="2" maxz="0" minx="0"/>
+          <spatial crs="" dimensions="2" maxz="0" minx="0" maxy="0" minz="0" maxx="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -9367,17 +9350,17 @@ def my_form_open(dialog, layer, feature):
         <Removable>0</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" forceraster="0" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 type="RuleRenderer" enableorderby="0" symbollevels="0" forceraster="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule symbol="0" label="Active" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone|spac|constr)' )" key="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" description="Only show when active in Atlas">
-            <rule symbol="1" label="21KM" filter="&quot;Distance&quot; = '21KM'" key="{13a555f1-0140-4584-9ca0-a5c3268249fa}" description="Only show when active in Atlas"/>
-            <rule symbol="2" label="10KM" filter="&quot;Distance&quot; = '10KM'" key="{3047fdca-b9ef-4659-af1a-dbbd7cd48473}" description="Only show when active in Atlas"/>
-            <rule symbol="3" label="5KM" filter="&quot;Distance&quot; = '5KM'" key="{915c5fda-fe09-44ca-bed3-6346c6df4966}" description="Only show when active in Atlas"/>
+          <rule filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone|spac|constr)' )" label="Active" description="Only show when active in Atlas" symbol="0" key="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}">
+            <rule filter="&quot;Distance&quot; = '21KM'" label="21KM" description="Only show when active in Atlas" symbol="1" key="{13a555f1-0140-4584-9ca0-a5c3268249fa}"/>
+            <rule filter="&quot;Distance&quot; = '10KM'" label="10KM" description="Only show when active in Atlas" symbol="2" key="{3047fdca-b9ef-4659-af1a-dbbd7cd48473}"/>
+            <rule filter="&quot;Distance&quot; = '5KM'" label="5KM" description="Only show when active in Atlas" symbol="3" key="{915c5fda-fe09-44ca-bed3-6346c6df4966}"/>
           </rule>
         </rules>
         <symbols>
-          <symbol name="0" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+          <symbol name="0" clip_to_extent="1" type="line" alpha="1" force_rhr="0">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -9396,21 +9379,21 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
+          <symbol name="1" clip_to_extent="1" type="line" alpha="1" force_rhr="0">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine">
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
               <prop v="MM" k="average_angle_unit"/>
@@ -9428,24 +9411,24 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <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 name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <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 name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@1@0" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="FilledMarker" locked="0">
+              <symbol name="@1@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+                <layer locked="0" pass="0" enabled="1" class="FilledMarker">
                   <prop v="0" k="angle"/>
                   <prop v="210,32,39,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -9460,13 +9443,13 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@1@0@0" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-                    <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+                  <symbol name="@@1@0@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill">
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="210,32,39,255" k="color"/>
                       <prop v="bevel" k="joinstyle"/>
@@ -9480,9 +9463,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -9490,7 +9473,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -9509,13 +9492,13 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine">
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
               <prop v="MM" k="average_angle_unit"/>
@@ -9533,13 +9516,13 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@1@2" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
+              <symbol name="@1@2" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker">
                   <prop v="0" k="angle"/>
                   <prop v="210,32,39,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -9560,15 +9543,15 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine">
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
               <prop v="MM" k="average_angle_unit"/>
@@ -9586,13 +9569,13 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@1@3" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
+              <symbol name="@1@3" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker">
                   <prop v="0" k="angle"/>
                   <prop v="210,32,39,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -9613,17 +9596,17 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
+          <symbol name="2" clip_to_extent="1" type="line" alpha="1" force_rhr="0">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine">
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
               <prop v="MM" k="average_angle_unit"/>
@@ -9641,24 +9624,24 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <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 name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <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 name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@0" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="FilledMarker" locked="0">
+              <symbol name="@2@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+                <layer locked="0" pass="0" enabled="1" class="FilledMarker">
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -9673,13 +9656,13 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@2@0@0" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-                    <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+                  <symbol name="@@2@0@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill">
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="103,34,144,255" k="color"/>
                       <prop v="bevel" k="joinstyle"/>
@@ -9693,9 +9676,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -9703,7 +9686,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -9722,13 +9705,13 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine">
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
               <prop v="MM" k="average_angle_unit"/>
@@ -9746,13 +9729,13 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@2" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
+              <symbol name="@2@2" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker">
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -9773,15 +9756,15 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine">
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
               <prop v="MM" k="average_angle_unit"/>
@@ -9799,13 +9782,13 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@3" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
+              <symbol name="@2@3" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker">
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -9826,17 +9809,17 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol name="3" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
+          <symbol name="3" clip_to_extent="1" type="line" alpha="1" force_rhr="0">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine">
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
               <prop v="MM" k="average_angle_unit"/>
@@ -9854,24 +9837,24 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <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 name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <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 name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@3@0" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="FilledMarker" locked="0">
+              <symbol name="@3@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+                <layer locked="0" pass="0" enabled="1" class="FilledMarker">
                   <prop v="0" k="angle"/>
                   <prop v="145,211,55,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -9886,13 +9869,13 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@3@0@0" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-                    <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+                  <symbol name="@@3@0@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill">
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="145,211,55,255" k="color"/>
                       <prop v="bevel" k="joinstyle"/>
@@ -9906,9 +9889,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -9916,7 +9899,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine">
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
               <prop v="MM" k="average_angle_unit"/>
@@ -9934,13 +9917,13 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@3@1" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
+              <symbol name="@3@1" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker">
                   <prop v="0" k="angle"/>
                   <prop v="145,211,55,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -9961,15 +9944,15 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine">
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
               <prop v="MM" k="average_angle_unit"/>
@@ -9987,13 +9970,13 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@3@2" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
+              <symbol name="@3@2" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker">
                   <prop v="0" k="angle"/>
                   <prop v="145,211,55,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -10014,15 +9997,15 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -10041,16 +10024,16 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <orderby>
-          <orderByClause asc="0" nullsFirst="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
+          <orderByClause nullsFirst="0" asc="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
         </orderby>
       </renderer-v2>
       <customproperties>
@@ -10059,6 +10042,9 @@ def my_form_open(dialog, layer, feature):
           <value>COALESCE( "Name", '&lt;NULL>' )</value>
           <value>COALESCE( "Name", '&lt;NULL>' )</value>
           <value>COALESCE( "Name", '&lt;NULL>' )</value>
+          <value>COALESCE( "Name", '&lt;NULL>' )</value>
+          <value>COALESCE( "Name", '&lt;NULL>' )</value>
+          <value>COALESCE( "Name", '&lt;NULL>' )</value>
         </property>
         <property value="0" key="embeddedWidgets/count"/>
         <property key="variableNames"/>
@@ -10068,21 +10054,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minimumSize="0" opacity="1" penAlpha="255" penColor="#000000" enabled="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeType="MM" diagramOrientation="Up" labelPlacementMethod="XHeight" scaleBasedVisibility="0" width="15" minScaleDenominator="100000" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" barWidth="5" backgroundAlpha="255" lineSizeType="MM" penWidth="0">
+        <DiagramCategory lineSizeType="MM" minimumSize="0" rotationOffset="270" height="15" backgroundColor="#ffffff" barWidth="5" penColor="#000000" scaleDependency="Area" scaleBasedVisibility="0" diagramOrientation="Up" enabled="0" sizeType="MM" penWidth="0" opacity="1" labelPlacementMethod="XHeight" minScaleDenominator="100000" penAlpha="255" backgroundAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" width="15" maxScaleDenominator="1e+08">
           <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+          <attribute color="#000000" field="" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" priority="0" linePlacementFlags="2" placement="2" showAll="1" dist="0">
+      <DiagramLayerSettings showAll="1" placement="2" linePlacementFlags="2" priority="0" zIndex="0" dist="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -10091,8 +10077,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -10101,8 +10087,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -10111,8 +10097,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -10121,8 +10107,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -10131,8 +10117,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -10141,8 +10127,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -10151,8 +10137,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -10161,8 +10147,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -10171,8 +10157,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -10181,8 +10167,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -10215,46 +10201,46 @@ def my_form_open(dialog, layer, feature):
         <default expression="" applyOnUpdate="0" field="Source"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Name"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="descriptio"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="timestamp"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="begin"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="end"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Distance"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="RouteLen"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="length_m"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="length_km"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Source"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="Name" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="descriptio" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="timestamp" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="begin" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="end" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="Distance" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="RouteLen" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="length_m" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="length_km" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="Source" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="Name"/>
-        <constraint desc="" exp="" field="descriptio"/>
-        <constraint desc="" exp="" field="timestamp"/>
-        <constraint desc="" exp="" field="begin"/>
-        <constraint desc="" exp="" field="end"/>
-        <constraint desc="" exp="" field="Distance"/>
-        <constraint desc="" exp="" field="RouteLen"/>
-        <constraint desc="" exp="" field="length_m"/>
-        <constraint desc="" exp="" field="length_km"/>
-        <constraint desc="" exp="" field="Source"/>
+        <constraint field="Name" exp="" desc=""/>
+        <constraint field="descriptio" exp="" desc=""/>
+        <constraint field="timestamp" exp="" desc=""/>
+        <constraint field="begin" exp="" desc=""/>
+        <constraint field="end" exp="" desc=""/>
+        <constraint field="Distance" exp="" desc=""/>
+        <constraint field="RouteLen" exp="" desc=""/>
+        <constraint field="length_m" exp="" desc=""/>
+        <constraint field="length_km" exp="" desc=""/>
+        <constraint field="Source" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;Name&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;Name&quot;" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="Name" width="-1" hidden="0" type="field"/>
-          <column name="descriptio" width="-1" hidden="0" type="field"/>
-          <column name="timestamp" width="-1" hidden="0" type="field"/>
-          <column name="begin" width="163" hidden="0" type="field"/>
-          <column name="end" width="-1" hidden="0" type="field"/>
-          <column name="Distance" width="-1" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column name="RouteLen" width="-1" hidden="0" type="field"/>
-          <column name="length_m" width="-1" hidden="0" type="field"/>
-          <column name="length_km" width="-1" hidden="0" type="field"/>
-          <column name="Source" width="-1" hidden="0" type="field"/>
+          <column name="Name" hidden="0" type="field" width="-1"/>
+          <column name="descriptio" hidden="0" type="field" width="-1"/>
+          <column name="timestamp" hidden="0" type="field" width="-1"/>
+          <column name="begin" hidden="0" type="field" width="163"/>
+          <column name="end" hidden="0" type="field" width="-1"/>
+          <column name="Distance" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="RouteLen" hidden="0" type="field" width="-1"/>
+          <column name="length_m" hidden="0" type="field" width="-1"/>
+          <column name="length_km" hidden="0" type="field" width="-1"/>
+          <column name="Source" hidden="0" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10312,7 +10298,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" readOnly="0" maxScale="0" type="vector" minScale="1e+08" simplifyLocal="1" wkbType="MultiPolygon" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" geometry="Polygon" simplifyDrawingHints="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" labelsEnabled="0">
+    <maplayer wkbType="MultiPolygon" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" simplifyLocal="1" simplifyMaxScale="1" simplifyDrawingHints="1" simplifyDrawingTol="1" maxScale="0" minScale="1e+08" readOnly="0" autoRefreshTime="0" labelsEnabled="0" simplifyAlgorithm="0" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" type="vector" geometry="Polygon">
       <extent>
         <xmin>18.37312291788339991</xmin>
         <ymin>-33.931815589166888</ymin>
@@ -10356,7 +10342,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -10376,10 +10362,10 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" forceraster="0" enableorderby="0" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" enableorderby="0" symbollevels="0" forceraster="0">
         <symbols>
-          <symbol name="0" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-            <layer enabled="1" pass="0" class="LinePatternFill" locked="0">
+          <symbol name="0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0">
+            <layer locked="0" pass="0" enabled="1" class="LinePatternFill">
               <prop v="135" k="angle"/>
               <prop v="211,134,33,255" k="color"/>
               <prop v="2" k="distance"/>
@@ -10395,13 +10381,13 @@ def my_form_open(dialog, layer, feature):
               <prop v="MM" k="outline_width_unit"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@0@0" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-                <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+              <symbol name="@0@0" clip_to_extent="1" type="line" alpha="1" force_rhr="0">
+                <layer locked="0" pass="0" enabled="1" class="SimpleLine">
                   <prop v="square" k="capstyle"/>
                   <prop v="5;2" k="customdash"/>
                   <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -10420,15 +10406,15 @@ def my_form_open(dialog, layer, feature):
                   <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill">
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="211,134,33,255" k="color"/>
               <prop v="bevel" k="joinstyle"/>
@@ -10442,9 +10428,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="no" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10463,21 +10449,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minimumSize="0" opacity="1" penAlpha="255" penColor="#000000" enabled="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeType="MM" diagramOrientation="Up" labelPlacementMethod="XHeight" scaleBasedVisibility="0" width="15" minScaleDenominator="0" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" barWidth="5" backgroundAlpha="255" lineSizeType="MM" penWidth="0">
+        <DiagramCategory lineSizeType="MM" minimumSize="0" rotationOffset="270" height="15" backgroundColor="#ffffff" barWidth="5" penColor="#000000" scaleDependency="Area" scaleBasedVisibility="0" diagramOrientation="Up" enabled="0" sizeType="MM" penWidth="0" opacity="1" labelPlacementMethod="XHeight" minScaleDenominator="0" penAlpha="255" backgroundAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" width="15" maxScaleDenominator="1e+08">
           <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+          <attribute color="#000000" field="" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" priority="0" linePlacementFlags="18" placement="1" showAll="1" dist="0">
+      <DiagramLayerSettings showAll="1" placement="1" linePlacementFlags="18" priority="0" zIndex="0" dist="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -10499,20 +10485,20 @@ def my_form_open(dialog, layer, feature):
         <default expression="" applyOnUpdate="0" field="FID"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="FID"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="FID" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="FID"/>
+        <constraint field="FID" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="id" width="-1" hidden="0" type="field"/>
-          <column name="type" width="431" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
+          <column name="id" hidden="0" type="field" width="-1"/>
+          <column name="type" hidden="0" type="field" width="431"/>
+          <column hidden="1" type="actions" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10554,7 +10540,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" readOnly="0" maxScale="0" type="vector" minScale="1e+08" simplifyLocal="1" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" geometry="Line" simplifyDrawingHints="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" labelsEnabled="1">
+    <maplayer wkbType="MultiLineString" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" simplifyLocal="1" simplifyMaxScale="1" simplifyDrawingHints="1" simplifyDrawingTol="1" maxScale="0" minScale="1e+08" readOnly="0" autoRefreshTime="0" labelsEnabled="1" simplifyAlgorithm="0" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" type="vector" geometry="Line">
       <extent>
         <xmin>18.3752895999999879</xmin>
         <ymin>-33.94589500000000726</ymin>
@@ -10598,7 +10584,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -10618,15 +10604,15 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" forceraster="0" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 type="RuleRenderer" enableorderby="0" symbollevels="0" forceraster="0">
         <rules key="{57366f52-c504-4c9a-800f-dcbf1d415bf6}">
-          <rule symbol="0" label="Road Closures" filter="&quot;status&quot; = 'closure'" key="{3d527c2d-2e74-4cfa-bc4b-b23a84bd2b64}" checkstate="0"/>
-          <rule symbol="1" label="One-Way" filter="&quot;status&quot; = 'one-way'" key="{15afbf65-f71f-4335-906e-79a74c987d9a}" checkstate="0"/>
-          <rule symbol="2" label="Road Open" filter="&quot;status&quot; = 'open'" key="{1c49b105-b991-480a-b221-afb9009498f0}" checkstate="0"/>
+          <rule checkstate="0" filter="&quot;status&quot; = 'closure'" label="Road Closures" symbol="0" key="{3d527c2d-2e74-4cfa-bc4b-b23a84bd2b64}"/>
+          <rule checkstate="0" filter="&quot;status&quot; = 'one-way'" label="One-Way" symbol="1" key="{15afbf65-f71f-4335-906e-79a74c987d9a}"/>
+          <rule checkstate="0" filter="&quot;status&quot; = 'open'" label="Road Open" symbol="2" key="{1c49b105-b991-480a-b221-afb9009498f0}"/>
         </rules>
         <symbols>
-          <symbol name="0" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+          <symbol name="0" clip_to_extent="1" type="line" alpha="1" force_rhr="0">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -10645,26 +10631,26 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="outlineStyle" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+          <symbol name="1" clip_to_extent="1" type="line" alpha="1" force_rhr="0">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -10683,24 +10669,24 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="outlineStyle" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" pass="0" class="MarkerLine" locked="0">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine">
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
               <prop v="MM" k="average_angle_unit"/>
@@ -10718,19 +10704,19 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="enabled" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@1@1" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-                <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
+              <symbol name="@1@1" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker">
                   <prop v="0" k="angle"/>
                   <prop v="0,255,0,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -10751,23 +10737,23 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties" type="Map">
                         <Option name="outlineStyle" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol name="2" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+          <symbol name="2" clip_to_extent="1" type="line" alpha="1" force_rhr="0">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -10786,20 +10772,20 @@ def my_form_open(dialog, layer, feature):
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="outlineStyle" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10808,20 +10794,20 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" fontSize="9" namedStyle="Regular" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="1" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="0" fontStrikeout="0" fieldName="times" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="50" useSubstitutions="0">
-            <text-buffer bufferSizeUnits="MM" bufferDraw="1" bufferNoFill="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-            <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeJoinStyle="64" shapeRadiiY="0" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+          <text-style fontCapitals="0" blendMode="0" fontUnderline="0" isExpression="0" fontLetterSpacing="0" textOpacity="1" fontFamily="Myriad Pro" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Regular" useSubstitutions="0" fieldName="times" fontSizeUnit="Point" textColor="0,0,0,255" fontWeight="50" multilineHeight="1" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSize="9" fontStrikeout="0" fontItalic="0">
+            <text-buffer bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255"/>
+            <background shapeSizeX="0" shapeRadiiUnit="MM" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBlendMode="0" shapeSizeUnit="MM" shapeSizeY="0" shapeSizeType="0" shapeBorderWidth="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeRotation="0" shapeOffsetX="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeRadiiY="0" shapeRadiiX="0" shapeOffsetY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOpacity="0.7" shadowScale="100" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowRadius="1.5" shadowRadiusUnit="MM" shadowUnder="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
             <substitutions/>
           </text-style>
-          <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="4294967295" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-          <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="2" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="5" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MM" dist="0" maxCurvedCharAngleIn="25" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-          <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="0" displayAll="0" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="0" scaleVisibility="0" obstacleFactor="1" fontMaxPixelSize="10000" obstacleType="0"/>
+          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" decimals="3" plussign="0" wrapChar="" reverseDirectionSymbol="0" multilineAlign="4294967295" formatNumbers="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" addDirectionSymbol="0" autoWrapLength="0"/>
+          <placement centroidInside="0" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" preserveRotation="1" quadOffset="4" offsetUnits="MM" geometryGeneratorType="PointGeometry" placementFlags="10" maxCurvedCharAngleIn="25" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-25" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="0" xOffset="0" priority="5" yOffset="0" geometryGenerator="" distUnits="MM" placement="2" offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering mergeLines="0" displayAll="0" obstacleType="0" scaleVisibility="0" obstacle="1" fontMaxPixelSize="10000" fontLimitPixelSize="0" obstacleFactor="1" drawLabels="1" labelPerPart="0" limitNumLabels="0" minFeatureSize="0" upsidedownLabels="0" zIndex="0" maxNumLabels="2000" scaleMax="0" scaleMin="0" fontMinPixelSize="3"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </settings>
@@ -10836,21 +10822,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minimumSize="0" opacity="1" penAlpha="255" penColor="#000000" enabled="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeType="MM" diagramOrientation="Up" labelPlacementMethod="XHeight" scaleBasedVisibility="0" width="15" minScaleDenominator="0" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" barWidth="5" backgroundAlpha="255" lineSizeType="MM" penWidth="0">
+        <DiagramCategory lineSizeType="MM" minimumSize="0" rotationOffset="270" height="15" backgroundColor="#ffffff" barWidth="5" penColor="#000000" scaleDependency="Area" scaleBasedVisibility="0" diagramOrientation="Up" enabled="0" sizeType="MM" penWidth="0" opacity="1" labelPlacementMethod="XHeight" minScaleDenominator="0" penAlpha="255" backgroundAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" width="15" maxScaleDenominator="1e+08">
           <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+          <attribute color="#000000" field="" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" priority="0" linePlacementFlags="18" placement="2" showAll="1" dist="0">
+      <DiagramLayerSettings showAll="1" placement="2" linePlacementFlags="18" priority="0" zIndex="0" dist="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -10899,28 +10885,28 @@ def my_form_open(dialog, layer, feature):
         <default expression="" applyOnUpdate="0" field="times"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="id"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="type"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="status"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="times"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="id" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="type" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="status" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="times" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="status"/>
-        <constraint desc="" exp="" field="times"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
+        <constraint field="status" exp="" desc=""/>
+        <constraint field="times" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;id&quot;" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="id" width="-1" hidden="0" type="field"/>
-          <column name="type" width="202" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column name="status" width="-1" hidden="0" type="field"/>
-          <column name="times" width="-1" hidden="0" type="field"/>
+          <column name="id" hidden="0" type="field" width="-1"/>
+          <column name="type" hidden="0" type="field" width="202"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="status" hidden="0" type="field" width="-1"/>
+          <column name="times" hidden="0" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10966,7 +10952,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" readOnly="0" maxScale="100000" type="vector" minScale="1e+08" simplifyLocal="1" wkbType="Point" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" geometry="Point" simplifyDrawingHints="0" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" labelsEnabled="1">
+    <maplayer wkbType="Point" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" simplifyLocal="1" simplifyMaxScale="1" simplifyDrawingHints="0" simplifyDrawingTol="1" maxScale="100000" minScale="1e+08" readOnly="0" autoRefreshTime="0" labelsEnabled="1" simplifyAlgorithm="0" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" type="vector" geometry="Point">
       <extent>
         <xmin>18.37601210021433928</xmin>
         <ymin>-33.94454035775031286</ymin>
@@ -11019,11 +11005,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" maxx="0" minz="0" miny="0" crs="" dimensions="2" maxz="0" minx="0"/>
+          <spatial crs="" dimensions="2" maxz="0" minx="0" maxy="0" minz="0" maxx="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -11050,251 +11036,251 @@ def my_form_open(dialog, layer, feature):
       <renderer-v2 type="nullSymbol"/>
       <labeling type="rule-based">
         <rules key="{9dfa2d77-6e52-4640-91f6-8cd0a7b822ed}">
-          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{a130bab9-8b6c-4395-8ba0-7ae70031713d}" description="Active">
-            <rule filter="&quot;Source&quot; = '21KM'" key="{c646d958-ac1a-4ea1-99c1-2c147334f417}" description="21KM">
+          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="Active" key="{a130bab9-8b6c-4395-8ba0-7ae70031713d}">
+            <rule filter="&quot;Source&quot; = '21KM'" description="21KM" key="{c646d958-ac1a-4ea1-99c1-2c147334f417}">
               <settings>
-                <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" fontSize="10" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="1" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="1" fontStrikeout="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-                  <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                  <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="210,32,39,255" shapeType="0" shapeJoinStyle="128" shapeRadiiY="1" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="210,32,39,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="1" shapeBorderWidth="1" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="1" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+                <text-style fontCapitals="0" blendMode="0" fontUnderline="0" isExpression="1" fontLetterSpacing="0" textOpacity="1" fontFamily="Myriad Pro" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" useSubstitutions="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSizeUnit="Point" textColor="255,255,255,255" fontWeight="63" multilineHeight="1" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSize="10" fontStrikeout="0" fontItalic="0">
+                  <text-buffer bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255"/>
+                  <background shapeSizeX="1" shapeRadiiUnit="MM" shapeBorderColor="210,32,39,255" shapeJoinStyle="128" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBlendMode="0" shapeSizeUnit="MM" shapeSizeY="0" shapeSizeType="0" shapeBorderWidth="1" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeRotation="0" shapeOffsetX="0" shapeFillColor="210,32,39,255" shapeType="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeRadiiY="1" shapeRadiiX="1" shapeOffsetY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOpacity="0.7" shadowScale="100" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowRadius="1.5" shadowRadiusUnit="MM" shadowUnder="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
                   <substitutions/>
                 </text-style>
-                <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="0" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-                <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="3" placement="6" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="10" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="2" maxCurvedCharAngleIn="20" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-                <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="1" scaleVisibility="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacleType="0"/>
+                <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" decimals="0" plussign="0" wrapChar="" reverseDirectionSymbol="0" multilineAlign="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" addDirectionSymbol="0" autoWrapLength="0"/>
+                <placement centroidInside="0" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" preserveRotation="1" quadOffset="3" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" placementFlags="10" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="2" xOffset="0" priority="10" yOffset="0" geometryGenerator="" distUnits="MM" placement="6" offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0"/>
+                <rendering mergeLines="0" displayAll="1" obstacleType="0" scaleVisibility="0" obstacle="1" fontMaxPixelSize="10000" fontLimitPixelSize="0" obstacleFactor="2" drawLabels="1" labelPerPart="0" limitNumLabels="0" minFeatureSize="0" upsidedownLabels="0" zIndex="0" maxNumLabels="2000" scaleMax="10000000" scaleMin="1" fontMinPixelSize="3"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties" type="Map">
                       <Option name="PositionX" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
                       <Option name="PositionY" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
                       <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="field" value="quadrant" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="quadrant"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                       <Option name="Rotation" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="field" value="rotation" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="field" type="QString" value="rotation"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                     </Option>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
               </settings>
             </rule>
-            <rule filter="&quot;Source&quot; = '10KM'" key="{b2fb2188-6121-4982-bc1c-04ddb70f9be7}" description="10KM">
+            <rule filter="&quot;Source&quot; = '10KM'" description="10KM" key="{b2fb2188-6121-4982-bc1c-04ddb70f9be7}">
               <settings>
-                <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" fontSize="10" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="1" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="1" fontStrikeout="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-                  <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                  <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="103,34,144,255" shapeType="0" shapeJoinStyle="128" shapeRadiiY="1" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="103,34,144,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="1" shapeBorderWidth="1" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="1" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+                <text-style fontCapitals="0" blendMode="0" fontUnderline="0" isExpression="1" fontLetterSpacing="0" textOpacity="1" fontFamily="Myriad Pro" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" useSubstitutions="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSizeUnit="Point" textColor="255,255,255,255" fontWeight="63" multilineHeight="1" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSize="10" fontStrikeout="0" fontItalic="0">
+                  <text-buffer bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255"/>
+                  <background shapeSizeX="1" shapeRadiiUnit="MM" shapeBorderColor="103,34,144,255" shapeJoinStyle="128" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBlendMode="0" shapeSizeUnit="MM" shapeSizeY="0" shapeSizeType="0" shapeBorderWidth="1" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeRotation="0" shapeOffsetX="0" shapeFillColor="103,34,144,255" shapeType="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeRadiiY="1" shapeRadiiX="1" shapeOffsetY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOpacity="0.7" shadowScale="100" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowRadius="1.5" shadowRadiusUnit="MM" shadowUnder="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
                   <substitutions/>
                 </text-style>
-                <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="0" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-                <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="6" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="10" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="2" maxCurvedCharAngleIn="20" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-                <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="1" scaleVisibility="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacleType="0"/>
+                <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" decimals="0" plussign="0" wrapChar="" reverseDirectionSymbol="0" multilineAlign="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" addDirectionSymbol="0" autoWrapLength="0"/>
+                <placement centroidInside="0" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" preserveRotation="1" quadOffset="4" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" placementFlags="10" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="2" xOffset="0" priority="10" yOffset="0" geometryGenerator="" distUnits="MM" placement="6" offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0"/>
+                <rendering mergeLines="0" displayAll="1" obstacleType="0" scaleVisibility="0" obstacle="1" fontMaxPixelSize="10000" fontLimitPixelSize="0" obstacleFactor="2" drawLabels="1" labelPerPart="0" limitNumLabels="0" minFeatureSize="0" upsidedownLabels="0" zIndex="0" maxNumLabels="2000" scaleMax="10000000" scaleMin="1" fontMinPixelSize="3"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties" type="Map">
                       <Option name="PositionX" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
                       <Option name="PositionY" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
                       <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="field" value="quadrant" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="quadrant"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                       <Option name="Rotation" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="field" value="rotation" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="field" type="QString" value="rotation"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                     </Option>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
               </settings>
             </rule>
-            <rule filter="&quot;Source&quot; = '5KM'" key="{7b3b06bf-7cd8-4b3c-9c28-a4b85c60458e}" description="5KM">
+            <rule filter="&quot;Source&quot; = '5KM'" description="5KM" key="{7b3b06bf-7cd8-4b3c-9c28-a4b85c60458e}">
               <settings>
-                <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" fontSize="10" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="1" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="1" fontStrikeout="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-                  <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                  <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="145,211,55,255" shapeType="0" shapeJoinStyle="128" shapeRadiiY="1" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="145,211,55,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="1" shapeBorderWidth="1" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="1" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+                <text-style fontCapitals="0" blendMode="0" fontUnderline="0" isExpression="1" fontLetterSpacing="0" textOpacity="1" fontFamily="Myriad Pro" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" useSubstitutions="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontSizeUnit="Point" textColor="255,255,255,255" fontWeight="63" multilineHeight="1" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSize="10" fontStrikeout="0" fontItalic="0">
+                  <text-buffer bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255"/>
+                  <background shapeSizeX="1" shapeRadiiUnit="MM" shapeBorderColor="145,211,55,255" shapeJoinStyle="128" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBlendMode="0" shapeSizeUnit="MM" shapeSizeY="0" shapeSizeType="0" shapeBorderWidth="1" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeRotation="0" shapeOffsetX="0" shapeFillColor="145,211,55,255" shapeType="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeRadiiY="1" shapeRadiiX="1" shapeOffsetY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOpacity="0.7" shadowScale="100" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowRadius="1.5" shadowRadiusUnit="MM" shadowUnder="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
                   <substitutions/>
                 </text-style>
-                <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="0" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-                <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="6" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="10" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="2" maxCurvedCharAngleIn="20" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-                <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="1" scaleVisibility="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacleType="0"/>
+                <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" decimals="0" plussign="0" wrapChar="" reverseDirectionSymbol="0" multilineAlign="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" addDirectionSymbol="0" autoWrapLength="0"/>
+                <placement centroidInside="0" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" preserveRotation="1" quadOffset="4" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" placementFlags="10" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="2" xOffset="0" priority="10" yOffset="0" geometryGenerator="" distUnits="MM" placement="6" offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0"/>
+                <rendering mergeLines="0" displayAll="1" obstacleType="0" scaleVisibility="0" obstacle="1" fontMaxPixelSize="10000" fontLimitPixelSize="0" obstacleFactor="2" drawLabels="1" labelPerPart="0" limitNumLabels="0" minFeatureSize="0" upsidedownLabels="0" zIndex="0" maxNumLabels="2000" scaleMax="10000000" scaleMin="1" fontMinPixelSize="3"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties" type="Map">
                       <Option name="PositionX" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
                       <Option name="PositionY" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
                       <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="field" value="quadrant" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="quadrant"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                       <Option name="Rotation" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="field" value="rotation" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="field" type="QString" value="rotation"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                     </Option>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
               </settings>
             </rule>
           </rule>
-          <rule key="{2b06f76f-7537-425c-a1e0-da99f8965c9f}" description="Always show" active="0">
-            <rule filter="&quot;Source&quot; = '21KM'" key="{c739bb0e-e629-4c73-abbd-017b5b56ae01}" description="21KM" active="0">
+          <rule active="0" description="Always show" key="{2b06f76f-7537-425c-a1e0-da99f8965c9f}">
+            <rule active="0" filter="&quot;Source&quot; = '21KM'" description="21KM" key="{c739bb0e-e629-4c73-abbd-017b5b56ae01}">
               <settings>
-                <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" fontSize="8" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="1" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="1" fontStrikeout="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-                  <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                  <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="210,32,39,255" shapeType="0" shapeJoinStyle="128" shapeRadiiY="1" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="210,32,39,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="0.5" shapeBorderWidth="1" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="0.5" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+                <text-style fontCapitals="0" blendMode="0" fontUnderline="0" isExpression="1" fontLetterSpacing="0" textOpacity="1" fontFamily="Myriad Pro" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" useSubstitutions="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSizeUnit="Point" textColor="255,255,255,255" fontWeight="63" multilineHeight="1" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSize="8" fontStrikeout="0" fontItalic="0">
+                  <text-buffer bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255"/>
+                  <background shapeSizeX="0.5" shapeRadiiUnit="MM" shapeBorderColor="210,32,39,255" shapeJoinStyle="128" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBlendMode="0" shapeSizeUnit="MM" shapeSizeY="0" shapeSizeType="0" shapeBorderWidth="1" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeRotation="0" shapeOffsetX="0" shapeFillColor="210,32,39,255" shapeType="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeRadiiY="1" shapeRadiiX="0.5" shapeOffsetY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOpacity="0.7" shadowScale="100" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowRadius="1.5" shadowRadiusUnit="MM" shadowUnder="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
                   <substitutions/>
                 </text-style>
-                <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="0" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-                <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="3" placement="6" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="10" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="2" maxCurvedCharAngleIn="20" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-                <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="1" scaleVisibility="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacleType="0"/>
+                <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" decimals="0" plussign="0" wrapChar="" reverseDirectionSymbol="0" multilineAlign="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" addDirectionSymbol="0" autoWrapLength="0"/>
+                <placement centroidInside="0" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" preserveRotation="1" quadOffset="3" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" placementFlags="10" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="2" xOffset="0" priority="10" yOffset="0" geometryGenerator="" distUnits="MM" placement="6" offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0"/>
+                <rendering mergeLines="0" displayAll="1" obstacleType="0" scaleVisibility="0" obstacle="1" fontMaxPixelSize="10000" fontLimitPixelSize="0" obstacleFactor="2" drawLabels="1" labelPerPart="0" limitNumLabels="0" minFeatureSize="0" upsidedownLabels="0" zIndex="0" maxNumLabels="2000" scaleMax="10000000" scaleMin="1" fontMinPixelSize="3"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties" type="Map">
                       <Option name="PositionX" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
                       <Option name="PositionY" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
                       <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="field" value="quadrant" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="quadrant"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                       <Option name="Rotation" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="field" value="rotation" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="field" type="QString" value="rotation"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                     </Option>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
               </settings>
             </rule>
-            <rule filter="&quot;Source&quot; = '10KM'" key="{3edc5d00-f213-44ae-9a91-62cbf88e850c}" description="10KM" active="0">
+            <rule active="0" filter="&quot;Source&quot; = '10KM'" description="10KM" key="{3edc5d00-f213-44ae-9a91-62cbf88e850c}">
               <settings>
-                <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" fontSize="8" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="1" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="1" fontStrikeout="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-                  <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                  <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="103,34,144,255" shapeType="0" shapeJoinStyle="128" shapeRadiiY="1" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="103,34,144,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="0.5" shapeBorderWidth="1" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="0.5" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+                <text-style fontCapitals="0" blendMode="0" fontUnderline="0" isExpression="1" fontLetterSpacing="0" textOpacity="1" fontFamily="Myriad Pro" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" useSubstitutions="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSizeUnit="Point" textColor="255,255,255,255" fontWeight="63" multilineHeight="1" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSize="8" fontStrikeout="0" fontItalic="0">
+                  <text-buffer bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255"/>
+                  <background shapeSizeX="0.5" shapeRadiiUnit="MM" shapeBorderColor="103,34,144,255" shapeJoinStyle="128" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBlendMode="0" shapeSizeUnit="MM" shapeSizeY="0" shapeSizeType="0" shapeBorderWidth="1" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeRotation="0" shapeOffsetX="0" shapeFillColor="103,34,144,255" shapeType="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeRadiiY="1" shapeRadiiX="0.5" shapeOffsetY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOpacity="0.7" shadowScale="100" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowRadius="1.5" shadowRadiusUnit="MM" shadowUnder="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
                   <substitutions/>
                 </text-style>
-                <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="0" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-                <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="6" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="10" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="2" maxCurvedCharAngleIn="20" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-                <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="1" scaleVisibility="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacleType="0"/>
+                <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" decimals="0" plussign="0" wrapChar="" reverseDirectionSymbol="0" multilineAlign="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" addDirectionSymbol="0" autoWrapLength="0"/>
+                <placement centroidInside="0" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" preserveRotation="1" quadOffset="4" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" placementFlags="10" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="2" xOffset="0" priority="10" yOffset="0" geometryGenerator="" distUnits="MM" placement="6" offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0"/>
+                <rendering mergeLines="0" displayAll="1" obstacleType="0" scaleVisibility="0" obstacle="1" fontMaxPixelSize="10000" fontLimitPixelSize="0" obstacleFactor="2" drawLabels="1" labelPerPart="0" limitNumLabels="0" minFeatureSize="0" upsidedownLabels="0" zIndex="0" maxNumLabels="2000" scaleMax="10000000" scaleMin="1" fontMinPixelSize="3"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties" type="Map">
                       <Option name="PositionX" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
                       <Option name="PositionY" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
                       <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="field" value="quadrant" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="quadrant"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                       <Option name="Rotation" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="field" value="rotation" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="field" type="QString" value="rotation"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                     </Option>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
               </settings>
             </rule>
-            <rule filter="&quot;Source&quot; = '5KM'" key="{1b5b2a5b-81b0-42be-86e5-12e6f7f654bc}" description="5KM" active="0">
+            <rule active="0" filter="&quot;Source&quot; = '5KM'" description="5KM" key="{1b5b2a5b-81b0-42be-86e5-12e6f7f654bc}">
               <settings>
-                <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" fontSize="8" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="1" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="1" fontStrikeout="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-                  <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                  <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="145,211,55,255" shapeType="0" shapeJoinStyle="128" shapeRadiiY="1" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="145,211,55,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="0.5" shapeBorderWidth="1" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="0.5" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+                <text-style fontCapitals="0" blendMode="0" fontUnderline="0" isExpression="1" fontLetterSpacing="0" textOpacity="1" fontFamily="Myriad Pro" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" useSubstitutions="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontSizeUnit="Point" textColor="255,255,255,255" fontWeight="63" multilineHeight="1" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSize="8" fontStrikeout="0" fontItalic="0">
+                  <text-buffer bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255"/>
+                  <background shapeSizeX="0.5" shapeRadiiUnit="MM" shapeBorderColor="145,211,55,255" shapeJoinStyle="128" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBlendMode="0" shapeSizeUnit="MM" shapeSizeY="0" shapeSizeType="0" shapeBorderWidth="1" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeRotation="0" shapeOffsetX="0" shapeFillColor="145,211,55,255" shapeType="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeRadiiY="1" shapeRadiiX="0.5" shapeOffsetY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOpacity="0.7" shadowScale="100" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowRadius="1.5" shadowRadiusUnit="MM" shadowUnder="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
                   <substitutions/>
                 </text-style>
-                <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="0" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-                <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="6" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="10" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="2" maxCurvedCharAngleIn="20" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-                <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="1" scaleVisibility="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacleType="0"/>
+                <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" decimals="0" plussign="0" wrapChar="" reverseDirectionSymbol="0" multilineAlign="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" addDirectionSymbol="0" autoWrapLength="0"/>
+                <placement centroidInside="0" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" preserveRotation="1" quadOffset="4" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" placementFlags="10" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="2" xOffset="0" priority="10" yOffset="0" geometryGenerator="" distUnits="MM" placement="6" offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0"/>
+                <rendering mergeLines="0" displayAll="1" obstacleType="0" scaleVisibility="0" obstacle="1" fontMaxPixelSize="10000" fontLimitPixelSize="0" obstacleFactor="2" drawLabels="1" labelPerPart="0" limitNumLabels="0" minFeatureSize="0" upsidedownLabels="0" zIndex="0" maxNumLabels="2000" scaleMax="10000000" scaleMin="1" fontMinPixelSize="3"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties" type="Map">
                       <Option name="PositionX" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
                       <Option name="PositionY" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
                       <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="field" value="quadrant" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="quadrant"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                       <Option name="Rotation" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="field" value="rotation" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="field" type="QString" value="rotation"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                     </Option>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
               </settings>
@@ -11312,21 +11298,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minimumSize="0" opacity="1" penAlpha="255" penColor="#000000" enabled="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeType="MM" diagramOrientation="Up" labelPlacementMethod="XHeight" scaleBasedVisibility="0" width="15" minScaleDenominator="100000" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" barWidth="5" backgroundAlpha="255" lineSizeType="MM" penWidth="0">
+        <DiagramCategory lineSizeType="MM" minimumSize="0" rotationOffset="270" height="15" backgroundColor="#ffffff" barWidth="5" penColor="#000000" scaleDependency="Area" scaleBasedVisibility="0" diagramOrientation="Up" enabled="0" sizeType="MM" penWidth="0" opacity="1" labelPlacementMethod="XHeight" minScaleDenominator="100000" penAlpha="255" backgroundAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" width="15" maxScaleDenominator="1e+08">
           <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+          <attribute color="#000000" field="" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" priority="0" linePlacementFlags="2" placement="0" showAll="1" dist="0">
+      <DiagramLayerSettings showAll="1" placement="0" linePlacementFlags="2" priority="0" zIndex="0" dist="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -11335,8 +11321,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11345,8 +11331,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11355,8 +11341,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11365,8 +11351,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11375,8 +11361,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11385,8 +11371,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11395,8 +11381,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11405,8 +11391,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11415,8 +11401,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11425,8 +11411,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11435,8 +11421,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11445,8 +11431,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11483,52 +11469,52 @@ def my_form_open(dialog, layer, feature):
         <default expression="" applyOnUpdate="0" field="distance"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Name"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="descriptio"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="timestamp"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="begin"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="end"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Distance"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="RouteLen"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="length_m"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="length_km"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Source"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="org_fid"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="distance"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="Name" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="descriptio" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="timestamp" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="begin" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="end" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="Distance" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="RouteLen" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="length_m" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="length_km" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="Source" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="org_fid" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="distance" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="Name"/>
-        <constraint desc="" exp="" field="descriptio"/>
-        <constraint desc="" exp="" field="timestamp"/>
-        <constraint desc="" exp="" field="begin"/>
-        <constraint desc="" exp="" field="end"/>
-        <constraint desc="" exp="" field="Distance"/>
-        <constraint desc="" exp="" field="RouteLen"/>
-        <constraint desc="" exp="" field="length_m"/>
-        <constraint desc="" exp="" field="length_km"/>
-        <constraint desc="" exp="" field="Source"/>
-        <constraint desc="" exp="" field="org_fid"/>
-        <constraint desc="" exp="" field="distance"/>
+        <constraint field="Name" exp="" desc=""/>
+        <constraint field="descriptio" exp="" desc=""/>
+        <constraint field="timestamp" exp="" desc=""/>
+        <constraint field="begin" exp="" desc=""/>
+        <constraint field="end" exp="" desc=""/>
+        <constraint field="Distance" exp="" desc=""/>
+        <constraint field="RouteLen" exp="" desc=""/>
+        <constraint field="length_m" exp="" desc=""/>
+        <constraint field="length_km" exp="" desc=""/>
+        <constraint field="Source" exp="" desc=""/>
+        <constraint field="org_fid" exp="" desc=""/>
+        <constraint field="distance" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;distance&quot;" sortOrder="1" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;distance&quot;" actionWidgetStyle="dropDown" sortOrder="1">
         <columns>
-          <column width="-1" hidden="1" type="actions"/>
-          <column name="org_fid" width="-1" hidden="0" type="field"/>
-          <column name="distance" width="-1" hidden="0" type="field"/>
-          <column name="Name" width="-1" hidden="0" type="field"/>
-          <column name="Source" width="-1" hidden="0" type="field"/>
-          <column name="RouteLen" width="-1" hidden="0" type="field"/>
-          <column name="descriptio" width="-1" hidden="0" type="field"/>
-          <column name="timestamp" width="-1" hidden="0" type="field"/>
-          <column name="begin" width="-1" hidden="0" type="field"/>
-          <column name="end" width="-1" hidden="0" type="field"/>
-          <column name="Distance" width="-1" hidden="0" type="field"/>
-          <column name="length_m" width="-1" hidden="0" type="field"/>
-          <column name="length_km" width="-1" hidden="0" type="field"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="org_fid" hidden="0" type="field" width="-1"/>
+          <column name="distance" hidden="0" type="field" width="-1"/>
+          <column name="Name" hidden="0" type="field" width="-1"/>
+          <column name="Source" hidden="0" type="field" width="-1"/>
+          <column name="RouteLen" hidden="0" type="field" width="-1"/>
+          <column name="descriptio" hidden="0" type="field" width="-1"/>
+          <column name="timestamp" hidden="0" type="field" width="-1"/>
+          <column name="begin" hidden="0" type="field" width="-1"/>
+          <column name="end" hidden="0" type="field" width="-1"/>
+          <column name="Distance" hidden="0" type="field" width="-1"/>
+          <column name="length_m" hidden="0" type="field" width="-1"/>
+          <column name="length_km" hidden="0" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11592,7 +11578,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
       <mapTip>Text</mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" readOnly="0" maxScale="100000" type="vector" minScale="1e+08" simplifyLocal="1" wkbType="Point" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" geometry="Point" simplifyDrawingHints="0" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" labelsEnabled="1">
+    <maplayer wkbType="Point" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" simplifyLocal="1" simplifyMaxScale="1" simplifyDrawingHints="0" simplifyDrawingTol="1" maxScale="100000" minScale="1e+08" readOnly="0" autoRefreshTime="0" labelsEnabled="1" simplifyAlgorithm="0" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" type="vector" geometry="Point">
       <extent>
         <xmin>18.37564686539056424</xmin>
         <ymin>-33.94557380387234957</ymin>
@@ -11636,7 +11622,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -11659,145 +11645,145 @@ def my_form_open(dialog, layer, feature):
       <renderer-v2 type="nullSymbol"/>
       <labeling type="rule-based">
         <rules key="{dcce4a01-cb4f-41a8-88eb-a09338c9148b}">
-          <rule filter="&quot;Source&quot; = '21KM' AND ( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' ) OR 'marshal plan' = attribute( @atlas_feature , 'type' ) OR 'marshal' = attribute( @atlas_feature , 'type' ) )" key="{85c566ca-8799-48c9-8ba8-26b2b1f35482}" description="21KM">
+          <rule filter="&quot;Source&quot; = '21KM' AND ( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' ) OR 'marshal plan' = attribute( @atlas_feature , 'type' ) OR 'marshal' = attribute( @atlas_feature , 'type' ) )" description="21KM" key="{85c566ca-8799-48c9-8ba8-26b2b1f35482}">
             <settings>
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" fontSize="10" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="1" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="1" fontStrikeout="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-                <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="210,32,39,255" shapeType="0" shapeJoinStyle="128" shapeRadiiY="1" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="210,32,39,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="1" shapeBorderWidth="1" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="1" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+              <text-style fontCapitals="0" blendMode="0" fontUnderline="0" isExpression="1" fontLetterSpacing="0" textOpacity="1" fontFamily="Myriad Pro" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" useSubstitutions="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSizeUnit="Point" textColor="255,255,255,255" fontWeight="63" multilineHeight="1" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSize="10" fontStrikeout="0" fontItalic="0">
+                <text-buffer bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255"/>
+                <background shapeSizeX="1" shapeRadiiUnit="MM" shapeBorderColor="210,32,39,255" shapeJoinStyle="128" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBlendMode="0" shapeSizeUnit="MM" shapeSizeY="0" shapeSizeType="0" shapeBorderWidth="1" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeRotation="0" shapeOffsetX="0" shapeFillColor="210,32,39,255" shapeType="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeRadiiY="1" shapeRadiiX="1" shapeOffsetY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOpacity="0.7" shadowScale="100" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowRadius="1.5" shadowRadiusUnit="MM" shadowUnder="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="0" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-              <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="3" placement="6" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="10" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="2" maxCurvedCharAngleIn="20" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-              <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="1" scaleVisibility="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacleType="0"/>
+              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" decimals="0" plussign="0" wrapChar="" reverseDirectionSymbol="0" multilineAlign="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" addDirectionSymbol="0" autoWrapLength="0"/>
+              <placement centroidInside="0" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" preserveRotation="1" quadOffset="3" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" placementFlags="10" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="2" xOffset="0" priority="10" yOffset="0" geometryGenerator="" distUnits="MM" placement="6" offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering mergeLines="0" displayAll="1" obstacleType="0" scaleVisibility="0" obstacle="1" fontMaxPixelSize="10000" fontLimitPixelSize="0" obstacleFactor="2" drawLabels="1" labelPerPart="0" limitNumLabels="0" minFeatureSize="0" upsidedownLabels="0" zIndex="0" maxNumLabels="2000" scaleMax="10000000" scaleMin="1" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="PositionX" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="PositionY" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="PredefinedPositionOrder" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="field" value="quadrant" type="QString"/>
-                      <Option name="type" value="2" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="quadrant"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                     <Option name="Rotation" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="field" value="rotation" type="QString"/>
-                      <Option name="type" value="2" type="int"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="field" type="QString" value="rotation"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </settings>
           </rule>
-          <rule filter="&quot;Source&quot; = '10KM' AND ( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' ) OR 'marshal plan' = attribute( @atlas_feature , 'type' ) OR 'marshal' = attribute( @atlas_feature , 'type' ) )" key="{f30a25fa-c4c5-427d-99bc-14adf7dbed5e}" description="10KM">
+          <rule filter="&quot;Source&quot; = '10KM' AND ( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' ) OR 'marshal plan' = attribute( @atlas_feature , 'type' ) OR 'marshal' = attribute( @atlas_feature , 'type' ) )" description="10KM" key="{f30a25fa-c4c5-427d-99bc-14adf7dbed5e}">
             <settings>
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" fontSize="10" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="1" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="1" fontStrikeout="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-                <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="103,34,144,255" shapeType="0" shapeJoinStyle="128" shapeRadiiY="1" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="103,34,144,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="1" shapeBorderWidth="1" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="1" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+              <text-style fontCapitals="0" blendMode="0" fontUnderline="0" isExpression="1" fontLetterSpacing="0" textOpacity="1" fontFamily="Myriad Pro" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" useSubstitutions="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSizeUnit="Point" textColor="255,255,255,255" fontWeight="63" multilineHeight="1" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSize="10" fontStrikeout="0" fontItalic="0">
+                <text-buffer bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255"/>
+                <background shapeSizeX="1" shapeRadiiUnit="MM" shapeBorderColor="103,34,144,255" shapeJoinStyle="128" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBlendMode="0" shapeSizeUnit="MM" shapeSizeY="0" shapeSizeType="0" shapeBorderWidth="1" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeRotation="0" shapeOffsetX="0" shapeFillColor="103,34,144,255" shapeType="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeRadiiY="1" shapeRadiiX="1" shapeOffsetY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOpacity="0.7" shadowScale="100" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowRadius="1.5" shadowRadiusUnit="MM" shadowUnder="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="0" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-              <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="6" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="10" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="2" maxCurvedCharAngleIn="20" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-              <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="1" scaleVisibility="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacleType="0"/>
+              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" decimals="0" plussign="0" wrapChar="" reverseDirectionSymbol="0" multilineAlign="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" addDirectionSymbol="0" autoWrapLength="0"/>
+              <placement centroidInside="0" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" preserveRotation="1" quadOffset="4" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" placementFlags="10" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="2" xOffset="0" priority="10" yOffset="0" geometryGenerator="" distUnits="MM" placement="6" offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering mergeLines="0" displayAll="1" obstacleType="0" scaleVisibility="0" obstacle="1" fontMaxPixelSize="10000" fontLimitPixelSize="0" obstacleFactor="2" drawLabels="1" labelPerPart="0" limitNumLabels="0" minFeatureSize="0" upsidedownLabels="0" zIndex="0" maxNumLabels="2000" scaleMax="10000000" scaleMin="1" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="PositionX" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="PositionY" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="PredefinedPositionOrder" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="field" value="quadrant" type="QString"/>
-                      <Option name="type" value="2" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="quadrant"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                     <Option name="Rotation" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="field" value="rotation" type="QString"/>
-                      <Option name="type" value="2" type="int"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="field" type="QString" value="rotation"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </settings>
           </rule>
-          <rule filter="&quot;Source&quot; = '5KM' AND ( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' ) OR 'marshal plan' = attribute( @atlas_feature , 'type' ) OR 'marshal' = attribute( @atlas_feature , 'type' ) )" key="{17df8049-285c-4bd2-ba2d-a83de3deab9d}" description="5KM">
+          <rule filter="&quot;Source&quot; = '5KM' AND ( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' ) OR 'marshal plan' = attribute( @atlas_feature , 'type' ) OR 'marshal' = attribute( @atlas_feature , 'type' ) )" description="5KM" key="{17df8049-285c-4bd2-ba2d-a83de3deab9d}">
             <settings>
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" fontSize="10" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="1" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="1" fontStrikeout="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-                <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="145,211,55,255" shapeType="0" shapeJoinStyle="128" shapeRadiiY="1" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="145,211,55,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="1" shapeBorderWidth="1" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="1" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+              <text-style fontCapitals="0" blendMode="0" fontUnderline="0" isExpression="1" fontLetterSpacing="0" textOpacity="1" fontFamily="Myriad Pro" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" useSubstitutions="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontSizeUnit="Point" textColor="255,255,255,255" fontWeight="63" multilineHeight="1" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSize="10" fontStrikeout="0" fontItalic="0">
+                <text-buffer bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255"/>
+                <background shapeSizeX="1" shapeRadiiUnit="MM" shapeBorderColor="145,211,55,255" shapeJoinStyle="128" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBlendMode="0" shapeSizeUnit="MM" shapeSizeY="0" shapeSizeType="0" shapeBorderWidth="1" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeRotation="0" shapeOffsetX="0" shapeFillColor="145,211,55,255" shapeType="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeRadiiY="1" shapeRadiiX="1" shapeOffsetY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOpacity="0.7" shadowScale="100" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowRadius="1.5" shadowRadiusUnit="MM" shadowUnder="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="0" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-              <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="6" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="10" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="2" maxCurvedCharAngleIn="20" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-              <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="1" scaleVisibility="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacleType="0"/>
+              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" decimals="0" plussign="0" wrapChar="" reverseDirectionSymbol="0" multilineAlign="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" addDirectionSymbol="0" autoWrapLength="0"/>
+              <placement centroidInside="0" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" preserveRotation="1" quadOffset="4" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" placementFlags="10" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="2" xOffset="0" priority="10" yOffset="0" geometryGenerator="" distUnits="MM" placement="6" offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering mergeLines="0" displayAll="1" obstacleType="0" scaleVisibility="0" obstacle="1" fontMaxPixelSize="10000" fontLimitPixelSize="0" obstacleFactor="2" drawLabels="1" labelPerPart="0" limitNumLabels="0" minFeatureSize="0" upsidedownLabels="0" zIndex="0" maxNumLabels="2000" scaleMax="10000000" scaleMin="1" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="PositionX" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="PositionY" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="PredefinedPositionOrder" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="field" value="quadrant" type="QString"/>
-                      <Option name="type" value="2" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="quadrant"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                     <Option name="Rotation" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="field" value="rotation" type="QString"/>
-                      <Option name="type" value="2" type="int"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="field" type="QString" value="rotation"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </settings>
           </rule>
-          <rule key="{72fc497c-35d7-45d4-9380-f31c6758babc}" description="Always show" active="0">
+          <rule active="0" description="Always show" key="{72fc497c-35d7-45d4-9380-f31c6758babc}">
             <settings>
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" fontSize="11" namedStyle="Italic" multilineHeight="1" fontItalic="1" fontSizeUnit="Point" blendMode="0" textOpacity="1" fontLetterSpacing="0" fontFamily="Roboto Condensed" fontWordSpacing="0" fontCapitals="0" isExpression="0" fontStrikeout="0" fieldName="Name" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="50" useSubstitutions="0">
-                <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeJoinStyle="64" shapeRadiiY="0" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+              <text-style fontCapitals="0" blendMode="0" fontUnderline="0" isExpression="0" fontLetterSpacing="0" textOpacity="1" fontFamily="Roboto Condensed" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Italic" useSubstitutions="0" fieldName="Name" fontSizeUnit="Point" textColor="0,0,0,255" fontWeight="50" multilineHeight="1" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSize="11" fontStrikeout="0" fontItalic="1">
+                <text-buffer bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255"/>
+                <background shapeSizeX="0" shapeRadiiUnit="MM" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBlendMode="0" shapeSizeUnit="MM" shapeSizeY="0" shapeSizeType="0" shapeBorderWidth="0" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeRotation="0" shapeOffsetX="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeRadiiY="0" shapeRadiiX="0" shapeOffsetY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOpacity="0.7" shadowScale="100" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowRadius="1.5" shadowRadiusUnit="MM" shadowUnder="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-              <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="0" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="5" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="0" maxCurvedCharAngleIn="25" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-              <rendering drawLabels="1" maxNumLabels="2000" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="0" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="1" scaleVisibility="0" obstacleFactor="1" fontMaxPixelSize="10000" obstacleType="0"/>
+              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" decimals="3" plussign="0" wrapChar="" reverseDirectionSymbol="0" multilineAlign="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" addDirectionSymbol="0" autoWrapLength="0"/>
+              <placement centroidInside="0" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" preserveRotation="1" quadOffset="4" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" placementFlags="10" maxCurvedCharAngleIn="25" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-25" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="0" xOffset="0" priority="5" yOffset="0" geometryGenerator="" distUnits="MM" placement="0" offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering mergeLines="0" displayAll="0" obstacleType="0" scaleVisibility="0" obstacle="1" fontMaxPixelSize="10000" fontLimitPixelSize="0" obstacleFactor="1" drawLabels="1" labelPerPart="0" limitNumLabels="0" minFeatureSize="0" upsidedownLabels="0" zIndex="0" maxNumLabels="2000" scaleMax="10000000" scaleMin="1" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </settings>
@@ -11814,21 +11800,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minimumSize="0" opacity="1" penAlpha="255" penColor="#000000" enabled="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeType="MM" diagramOrientation="Up" labelPlacementMethod="XHeight" scaleBasedVisibility="0" width="15" minScaleDenominator="100000" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" barWidth="5" backgroundAlpha="255" lineSizeType="MM" penWidth="0">
+        <DiagramCategory lineSizeType="MM" minimumSize="0" rotationOffset="270" height="15" backgroundColor="#ffffff" barWidth="5" penColor="#000000" scaleDependency="Area" scaleBasedVisibility="0" diagramOrientation="Up" enabled="0" sizeType="MM" penWidth="0" opacity="1" labelPlacementMethod="XHeight" minScaleDenominator="100000" penAlpha="255" backgroundAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" width="15" maxScaleDenominator="1e+08">
           <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+          <attribute color="#000000" field="" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" priority="0" linePlacementFlags="2" placement="0" showAll="1" dist="0">
+      <DiagramLayerSettings showAll="1" placement="0" linePlacementFlags="2" priority="0" zIndex="0" dist="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -11837,8 +11823,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11847,8 +11833,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11857,8 +11843,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11867,8 +11853,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11877,8 +11863,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11887,8 +11873,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11897,8 +11883,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11907,8 +11893,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11917,8 +11903,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11927,8 +11913,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11937,8 +11923,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11947,8 +11933,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11985,52 +11971,52 @@ def my_form_open(dialog, layer, feature):
         <default expression="" applyOnUpdate="0" field="distance"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Name"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="descriptio"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="timestamp"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="begin"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="end"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Distance"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="RouteLen"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="length_m"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="length_km"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Source"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="org_fid"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="distance"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="Name" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="descriptio" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="timestamp" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="begin" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="end" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="Distance" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="RouteLen" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="length_m" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="length_km" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="Source" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="org_fid" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="distance" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="Name"/>
-        <constraint desc="" exp="" field="descriptio"/>
-        <constraint desc="" exp="" field="timestamp"/>
-        <constraint desc="" exp="" field="begin"/>
-        <constraint desc="" exp="" field="end"/>
-        <constraint desc="" exp="" field="Distance"/>
-        <constraint desc="" exp="" field="RouteLen"/>
-        <constraint desc="" exp="" field="length_m"/>
-        <constraint desc="" exp="" field="length_km"/>
-        <constraint desc="" exp="" field="Source"/>
-        <constraint desc="" exp="" field="org_fid"/>
-        <constraint desc="" exp="" field="distance"/>
+        <constraint field="Name" exp="" desc=""/>
+        <constraint field="descriptio" exp="" desc=""/>
+        <constraint field="timestamp" exp="" desc=""/>
+        <constraint field="begin" exp="" desc=""/>
+        <constraint field="end" exp="" desc=""/>
+        <constraint field="Distance" exp="" desc=""/>
+        <constraint field="RouteLen" exp="" desc=""/>
+        <constraint field="length_m" exp="" desc=""/>
+        <constraint field="length_km" exp="" desc=""/>
+        <constraint field="Source" exp="" desc=""/>
+        <constraint field="org_fid" exp="" desc=""/>
+        <constraint field="distance" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;distance&quot;" sortOrder="1" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;distance&quot;" actionWidgetStyle="dropDown" sortOrder="1">
         <columns>
-          <column width="-1" hidden="1" type="actions"/>
-          <column name="org_fid" width="-1" hidden="0" type="field"/>
-          <column name="distance" width="-1" hidden="0" type="field"/>
-          <column name="Name" width="-1" hidden="0" type="field"/>
-          <column name="Source" width="-1" hidden="0" type="field"/>
-          <column name="RouteLen" width="-1" hidden="0" type="field"/>
-          <column name="descriptio" width="-1" hidden="0" type="field"/>
-          <column name="timestamp" width="-1" hidden="0" type="field"/>
-          <column name="begin" width="-1" hidden="0" type="field"/>
-          <column name="end" width="-1" hidden="0" type="field"/>
-          <column name="Distance" width="-1" hidden="0" type="field"/>
-          <column name="length_m" width="-1" hidden="0" type="field"/>
-          <column name="length_km" width="-1" hidden="0" type="field"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="org_fid" hidden="0" type="field" width="-1"/>
+          <column name="distance" hidden="0" type="field" width="-1"/>
+          <column name="Name" hidden="0" type="field" width="-1"/>
+          <column name="Source" hidden="0" type="field" width="-1"/>
+          <column name="RouteLen" hidden="0" type="field" width="-1"/>
+          <column name="descriptio" hidden="0" type="field" width="-1"/>
+          <column name="timestamp" hidden="0" type="field" width="-1"/>
+          <column name="begin" hidden="0" type="field" width="-1"/>
+          <column name="end" hidden="0" type="field" width="-1"/>
+          <column name="Distance" hidden="0" type="field" width="-1"/>
+          <column name="length_m" hidden="0" type="field" width="-1"/>
+          <column name="length_km" hidden="0" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -12094,7 +12080,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
       <mapTip>Text</mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" readOnly="0" maxScale="0" type="vector" minScale="1e+08" simplifyLocal="1" wkbType="MultiPolygon" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" geometry="Polygon" simplifyDrawingHints="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" labelsEnabled="0">
+    <maplayer wkbType="MultiPolygon" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" simplifyLocal="1" simplifyMaxScale="1" simplifyDrawingHints="1" simplifyDrawingTol="1" maxScale="0" minScale="1e+08" readOnly="0" autoRefreshTime="0" labelsEnabled="0" simplifyAlgorithm="0" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" type="vector" geometry="Polygon">
       <extent>
         <xmin>18.40435736428151614</xmin>
         <ymin>-33.90613600950420903</ymin>
@@ -12138,7 +12124,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -12158,10 +12144,10 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" forceraster="0" enableorderby="0" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" enableorderby="0" symbollevels="0" forceraster="0">
         <symbols>
-          <symbol name="0" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-            <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+          <symbol name="0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill">
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="114,155,111,255" k="color"/>
               <prop v="bevel" k="joinstyle"/>
@@ -12175,9 +12161,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -12192,9 +12178,9 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
-          <Option value="" type="QString"/>
+          <Option type="QString" value=""/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
@@ -12234,25 +12220,25 @@ def my_form_open(dialog, layer, feature):
         <default expression="" applyOnUpdate="0" field="rotation"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="id"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="area"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="rotation"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="id" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="area" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="rotation" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="area"/>
-        <constraint desc="" exp="" field="rotation"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="area" exp="" desc=""/>
+        <constraint field="rotation" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;rotation&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;rotation&quot;" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="id" width="-1" hidden="0" type="field"/>
-          <column name="area" width="-1" hidden="0" type="field"/>
-          <column name="rotation" width="-1" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
+          <column name="id" hidden="0" type="field" width="-1"/>
+          <column name="area" hidden="0" type="field" width="-1"/>
+          <column name="rotation" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -12272,7 +12258,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" readOnly="0" maxScale="0" type="vector" minScale="1e+08" simplifyLocal="1" wkbType="Point" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" geometry="Point" simplifyDrawingHints="0" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" labelsEnabled="0">
+    <maplayer wkbType="Point" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" simplifyLocal="1" simplifyMaxScale="1" simplifyDrawingHints="0" simplifyDrawingTol="1" maxScale="0" minScale="1e+08" readOnly="0" autoRefreshTime="0" labelsEnabled="0" simplifyAlgorithm="0" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" type="vector" geometry="Point">
       <extent>
         <xmin>18.37527292247776955</xmin>
         <ymin>-33.94586016049600374</ymin>
@@ -12316,7 +12302,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -12336,15 +12322,15 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" forceraster="0" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 type="RuleRenderer" enableorderby="0" symbollevels="0" forceraster="0">
         <rules key="{01115dc1-cc6e-4980-a968-7ef94a3b9df6}">
-          <rule symbol="0" filter="&quot;Distance&quot; = '21KM'" key="{71dc0866-b893-48a0-be36-e2b65a581610}"/>
-          <rule symbol="1" filter="&quot;Distance&quot; = '10KM'" key="{405230e7-6e6f-4e87-b9bc-b89e44296582}"/>
-          <rule symbol="2" filter="&quot;Distance&quot; = '5KM'" key="{c5d85d4d-6b78-403d-ab66-ecd04556e7d7}"/>
+          <rule filter="&quot;Distance&quot; = '21KM'" symbol="0" key="{71dc0866-b893-48a0-be36-e2b65a581610}"/>
+          <rule filter="&quot;Distance&quot; = '10KM'" symbol="1" key="{405230e7-6e6f-4e87-b9bc-b89e44296582}"/>
+          <rule filter="&quot;Distance&quot; = '5KM'" symbol="2" key="{c5d85d4d-6b78-403d-ab66-ecd04556e7d7}"/>
         </rules>
         <symbols>
-          <symbol name="0" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-            <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
+          <symbol name="0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker">
               <prop v="0" k="angle"/>
               <prop v="210,32,39,255" k="color"/>
               <prop v="1" k="horizontal_anchor_point"/>
@@ -12365,21 +12351,21 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="size" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" alpha="0.8" force_rhr="0" clip_to_extent="1" type="marker">
-            <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
+          <symbol name="1" clip_to_extent="1" type="marker" alpha="0.8" force_rhr="0">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker">
               <prop v="0" k="angle"/>
               <prop v="103,34,144,255" k="color"/>
               <prop v="1" k="horizontal_anchor_point"/>
@@ -12400,21 +12386,21 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="size" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" alpha="0.8" force_rhr="0" clip_to_extent="1" type="marker">
-            <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
+          <symbol name="2" clip_to_extent="1" type="marker" alpha="0.8" force_rhr="0">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker">
               <prop v="0" k="angle"/>
               <prop v="145,211,55,255" k="color"/>
               <prop v="1" k="horizontal_anchor_point"/>
@@ -12435,15 +12421,15 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="size" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -12452,46 +12438,46 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,255,255" fontSize="9" namedStyle="Semibold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="0.8" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="1" fontStrikeout="0" fieldName="IF(&quot;Distance&quot; IS attribute( @atlas_feature, 'Distance' ), display, '')" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="63" useSubstitutions="0">
-            <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-            <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="0,0,255,255" shapeType="0" shapeJoinStyle="128" shapeRadiiY="0.5" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="0.5" shapeBorderWidth="0.2" shapeSizeY="1" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="1" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+          <text-style fontCapitals="0" blendMode="0" fontUnderline="0" isExpression="1" fontLetterSpacing="0" textOpacity="0.8" fontFamily="Myriad Pro" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" useSubstitutions="0" fieldName="IF(&quot;Distance&quot; IS attribute( @atlas_feature, 'Distance' ), display, '')" fontSizeUnit="Point" textColor="0,0,255,255" fontWeight="63" multilineHeight="1" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSize="9" fontStrikeout="0" fontItalic="0">
+            <text-buffer bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255"/>
+            <background shapeSizeX="1" shapeRadiiUnit="MM" shapeBorderColor="0,0,255,255" shapeJoinStyle="128" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBlendMode="0" shapeSizeUnit="MM" shapeSizeY="1" shapeSizeType="0" shapeBorderWidth="0.2" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeRotation="0" shapeOffsetX="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeRadiiY="0.5" shapeRadiiX="0.5" shapeOffsetY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOpacity="0.7" shadowScale="100" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowRadius="1.5" shadowRadiusUnit="MM" shadowUnder="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
             <substitutions/>
           </text-style>
-          <text-format formatNumbers="0" autoWrapLength="17" useMaxLineLengthForAutoWrap="1" multilineAlign="2" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-          <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" placement="0" repeatDistanceUnits="MM" preserveRotation="0" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="LineGeometry" geometryGenerator="" priority="10" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MM" dist="0" maxCurvedCharAngleIn="25" centroidInside="0" centroidWhole="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" yOffset="0" xOffset="0" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-          <rendering drawLabels="1" maxNumLabels="2" mergeLines="0" labelPerPart="0" scaleMax="0" displayAll="1" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="0" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="0" scaleVisibility="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacleType="0"/>
+          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" decimals="3" plussign="0" wrapChar="" reverseDirectionSymbol="0" multilineAlign="2" formatNumbers="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" addDirectionSymbol="0" autoWrapLength="17"/>
+          <placement centroidInside="0" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" preserveRotation="0" quadOffset="4" offsetUnits="MM" geometryGeneratorType="LineGeometry" placementFlags="10" maxCurvedCharAngleIn="25" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-25" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="0" xOffset="0" priority="10" yOffset="0" geometryGenerator="" distUnits="MM" placement="0" offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering mergeLines="0" displayAll="1" obstacleType="0" scaleVisibility="0" obstacle="1" fontMaxPixelSize="10000" fontLimitPixelSize="0" obstacleFactor="2" drawLabels="1" labelPerPart="0" limitNumLabels="0" minFeatureSize="0" upsidedownLabels="0" zIndex="0" maxNumLabels="2" scaleMax="0" scaleMin="0" fontMinPixelSize="3"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="AlwaysShow" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="type" value="1" type="int"/>
-                  <Option name="val" value="" type="QString"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="type" type="int" value="1"/>
+                  <Option name="val" type="QString" value=""/>
                 </Option>
                 <Option name="Hali" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="'Center'" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="'Center'"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="PositionX" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="field" value="" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value=""/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
                 <Option name="PositionY" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="field" value="" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value=""/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
                 <Option name="Vali" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="'Half'" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="'Half'"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </settings>
@@ -12511,21 +12497,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minimumSize="0" opacity="1" penAlpha="255" penColor="#000000" enabled="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeType="MM" diagramOrientation="Up" labelPlacementMethod="XHeight" scaleBasedVisibility="0" width="15" minScaleDenominator="0" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" barWidth="5" backgroundAlpha="255" lineSizeType="MM" penWidth="0">
+        <DiagramCategory lineSizeType="MM" minimumSize="0" rotationOffset="270" height="15" backgroundColor="#ffffff" barWidth="5" penColor="#000000" scaleDependency="Area" scaleBasedVisibility="0" diagramOrientation="Up" enabled="0" sizeType="MM" penWidth="0" opacity="1" labelPlacementMethod="XHeight" minScaleDenominator="0" penAlpha="255" backgroundAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" width="15" maxScaleDenominator="1e+08">
           <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+          <attribute color="#000000" field="" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" priority="0" linePlacementFlags="18" placement="0" showAll="1" dist="0">
+      <DiagramLayerSettings showAll="1" placement="0" linePlacementFlags="18" priority="0" zIndex="0" dist="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -12534,8 +12520,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -12544,8 +12530,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -12554,8 +12540,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -12564,8 +12550,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -12574,8 +12560,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -12584,8 +12570,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -12594,8 +12580,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -12604,8 +12590,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -12614,8 +12600,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -12624,8 +12610,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -12694,56 +12680,56 @@ def my_form_open(dialog, layer, feature):
         <default expression="" applyOnUpdate="0" field="last_runne"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Name"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="descriptio"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="timestamp"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="begin"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="end"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Distance"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="RouteLen"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="length_m"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="length_km"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="Source"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="org_fid"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="distance_1"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="first_runn"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="last_runne"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="Name" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="descriptio" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="timestamp" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="begin" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="end" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="Distance" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="RouteLen" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="length_m" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="length_km" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="Source" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="org_fid" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="distance_1" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="first_runn" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="last_runne" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="Name"/>
-        <constraint desc="" exp="" field="descriptio"/>
-        <constraint desc="" exp="" field="timestamp"/>
-        <constraint desc="" exp="" field="begin"/>
-        <constraint desc="" exp="" field="end"/>
-        <constraint desc="" exp="" field="Distance"/>
-        <constraint desc="" exp="" field="RouteLen"/>
-        <constraint desc="" exp="" field="length_m"/>
-        <constraint desc="" exp="" field="length_km"/>
-        <constraint desc="" exp="" field="Source"/>
-        <constraint desc="" exp="" field="org_fid"/>
-        <constraint desc="" exp="" field="distance_1"/>
-        <constraint desc="" exp="" field="first_runn"/>
-        <constraint desc="" exp="" field="last_runne"/>
+        <constraint field="Name" exp="" desc=""/>
+        <constraint field="descriptio" exp="" desc=""/>
+        <constraint field="timestamp" exp="" desc=""/>
+        <constraint field="begin" exp="" desc=""/>
+        <constraint field="end" exp="" desc=""/>
+        <constraint field="Distance" exp="" desc=""/>
+        <constraint field="RouteLen" exp="" desc=""/>
+        <constraint field="length_m" exp="" desc=""/>
+        <constraint field="length_km" exp="" desc=""/>
+        <constraint field="Source" exp="" desc=""/>
+        <constraint field="org_fid" exp="" desc=""/>
+        <constraint field="distance_1" exp="" desc=""/>
+        <constraint field="first_runn" exp="" desc=""/>
+        <constraint field="last_runne" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;display&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;display&quot;" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="Name" width="-1" hidden="0" type="field"/>
-          <column name="descriptio" width="-1" hidden="0" type="field"/>
-          <column name="timestamp" width="-1" hidden="0" type="field"/>
-          <column name="begin" width="179" hidden="0" type="field"/>
-          <column name="end" width="-1" hidden="0" type="field"/>
-          <column name="Distance" width="-1" hidden="0" type="field"/>
-          <column name="RouteLen" width="-1" hidden="0" type="field"/>
-          <column name="length_m" width="-1" hidden="0" type="field"/>
-          <column name="length_km" width="-1" hidden="0" type="field"/>
-          <column name="Source" width="-1" hidden="0" type="field"/>
-          <column name="org_fid" width="-1" hidden="0" type="field"/>
-          <column name="distance" width="177" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
+          <column name="Name" hidden="0" type="field" width="-1"/>
+          <column name="descriptio" hidden="0" type="field" width="-1"/>
+          <column name="timestamp" hidden="0" type="field" width="-1"/>
+          <column name="begin" hidden="0" type="field" width="179"/>
+          <column name="end" hidden="0" type="field" width="-1"/>
+          <column name="Distance" hidden="0" type="field" width="-1"/>
+          <column name="RouteLen" hidden="0" type="field" width="-1"/>
+          <column name="length_m" hidden="0" type="field" width="-1"/>
+          <column name="length_km" hidden="0" type="field" width="-1"/>
+          <column name="Source" hidden="0" type="field" width="-1"/>
+          <column name="org_fid" hidden="0" type="field" width="-1"/>
+          <column name="distance" hidden="0" type="field" width="177"/>
+          <column hidden="1" type="actions" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -12819,7 +12805,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" readOnly="0" maxScale="0" type="vector" minScale="1e+08" simplifyLocal="1" wkbType="MultiPolygon" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingTol="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" geometry="Polygon" simplifyDrawingHints="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" labelsEnabled="1">
+    <maplayer wkbType="MultiPolygon" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" simplifyLocal="1" simplifyMaxScale="1" simplifyDrawingHints="1" simplifyDrawingTol="1" maxScale="0" minScale="1e+08" readOnly="0" autoRefreshTime="0" labelsEnabled="1" simplifyAlgorithm="0" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" type="vector" geometry="Polygon">
       <extent>
         <xmin>18.37549461152003971</xmin>
         <ymin>-33.94162201868364548</ymin>
@@ -12872,11 +12858,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" maxx="0" minz="0" miny="0" crs="" dimensions="2" maxz="0" minx="0"/>
+          <spatial crs="" dimensions="2" maxz="0" minx="0" maxy="0" minz="0" maxx="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -12903,22 +12889,22 @@ def my_form_open(dialog, layer, feature):
       <renderer-v2 type="nullSymbol"/>
       <labeling type="rule-based">
         <rules key="{5dc8b36b-2058-4678-ad09-9a66ad011982}">
-          <rule filter="CASE&#xa;WHEN attribute( @atlas_feature , 'RouteLen' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'RouteLen' ) ) THEN 1&#xa;ELSE 0&#xa;END" key="{6ef417ce-9c3a-42d0-a533-3a83b1a257ea}" description="Show water tables">
+          <rule filter="CASE&#xa;WHEN attribute( @atlas_feature , 'RouteLen' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'RouteLen' ) ) THEN 1&#xa;ELSE 0&#xa;END" description="Show water tables" key="{6ef417ce-9c3a-42d0-a533-3a83b1a257ea}">
             <settings>
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="31,120,180,255" fontSize="8" namedStyle="Bold" multilineHeight="1" fontItalic="0" fontSizeUnit="Point" blendMode="0" textOpacity="0.9" fontLetterSpacing="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontCapitals="0" isExpression="0" fontStrikeout="0" fieldName="label" previewBkgrdColor="#ffffff" fontUnderline="0" fontWeight="75" useSubstitutions="0">
-                <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="0.4" bufferColor="255,255,255,255" bufferSize="0.75"/>
-                <background shapeOffsetY="-0.15" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="31,120,206,255" shapeType="0" shapeJoinStyle="128" shapeRadiiY="0.5" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,204" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="1" shapeRadiiX="0.5" shapeBorderWidth="0.75" shapeSizeY="0.3" shapeOffsetUnit="MM" shapeOpacity="0.6" shapeSVGFile="" shapeSizeX="0.75" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+              <text-style fontCapitals="0" blendMode="0" fontUnderline="0" isExpression="0" fontLetterSpacing="0" textOpacity="0.9" fontFamily="Myriad Pro" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Bold" useSubstitutions="0" fieldName="label" fontSizeUnit="Point" textColor="31,120,180,255" fontWeight="75" multilineHeight="1" fontWordSpacing="0" previewBkgrdColor="#ffffff" fontSize="8" fontStrikeout="0" fontItalic="0">
+                <text-buffer bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="0.4" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="0.75" bufferColor="255,255,255,255"/>
+                <background shapeSizeX="0.75" shapeRadiiUnit="MM" shapeBorderColor="31,120,206,255" shapeJoinStyle="128" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBlendMode="0" shapeSizeUnit="MM" shapeSizeY="0.3" shapeSizeType="0" shapeBorderWidth="0.75" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.6" shapeRotation="0" shapeOffsetX="0" shapeFillColor="255,255,255,204" shapeType="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeRadiiY="0.5" shapeRadiiX="0.5" shapeOffsetY="-0.15" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOpacity="0.7" shadowScale="100" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowRadius="1.5" shadowRadiusUnit="MM" shadowUnder="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="1" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" decimals="3" leftDirectionSymbol="&lt;" wrapChar="" addDirectionSymbol="0"/>
-              <placement offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" quadOffset="1" placement="0" repeatDistanceUnits="MM" preserveRotation="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" geometryGeneratorType="PointGeometry" geometryGenerator="" priority="5" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" offsetUnits="MapUnit" dist="0" maxCurvedCharAngleIn="25" centroidInside="0" centroidWhole="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" yOffset="0" xOffset="1" fitInPolygonOnly="0" repeatDistance="0" geometryGeneratorEnabled="0"/>
-              <rendering drawLabels="1" maxNumLabels="6" mergeLines="0" labelPerPart="0" scaleMax="10000000" displayAll="0" fontLimitPixelSize="0" upsidedownLabels="0" minFeatureSize="0" zIndex="5" fontMinPixelSize="3" limitNumLabels="0" obstacle="1" scaleMin="1" scaleVisibility="0" obstacleFactor="0.76" fontMaxPixelSize="10000" obstacleType="0"/>
+              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" decimals="3" plussign="0" wrapChar="" reverseDirectionSymbol="0" multilineAlign="1" formatNumbers="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" addDirectionSymbol="0" autoWrapLength="0"/>
+              <placement centroidInside="0" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" preserveRotation="1" quadOffset="1" offsetUnits="MapUnit" geometryGeneratorType="PointGeometry" placementFlags="10" maxCurvedCharAngleIn="25" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-25" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="0" xOffset="1" priority="5" yOffset="0" geometryGenerator="" distUnits="MM" placement="0" offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="1" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering mergeLines="0" displayAll="0" obstacleType="0" scaleVisibility="0" obstacle="1" fontMaxPixelSize="10000" fontLimitPixelSize="0" obstacleFactor="0.76" drawLabels="1" labelPerPart="0" limitNumLabels="0" minFeatureSize="0" upsidedownLabels="0" zIndex="5" maxNumLabels="6" scaleMax="10000000" scaleMin="1" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </settings>
@@ -12935,21 +12921,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minimumSize="0" opacity="1" penAlpha="255" penColor="#000000" enabled="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeType="MM" diagramOrientation="Up" labelPlacementMethod="XHeight" scaleBasedVisibility="0" width="15" minScaleDenominator="0" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" barWidth="5" backgroundAlpha="255" lineSizeType="MM" penWidth="0">
+        <DiagramCategory lineSizeType="MM" minimumSize="0" rotationOffset="270" height="15" backgroundColor="#ffffff" barWidth="5" penColor="#000000" scaleDependency="Area" scaleBasedVisibility="0" diagramOrientation="Up" enabled="0" sizeType="MM" penWidth="0" opacity="1" labelPlacementMethod="XHeight" minScaleDenominator="0" penAlpha="255" backgroundAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" width="15" maxScaleDenominator="1e+08">
           <fontProperties style="" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" color="#000000" field=""/>
+          <attribute color="#000000" field="" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" priority="0" linePlacementFlags="2" placement="0" showAll="1" dist="0">
+      <DiagramLayerSettings showAll="1" placement="0" linePlacementFlags="2" priority="0" zIndex="0" dist="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -12958,8 +12944,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -12968,8 +12954,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -12978,8 +12964,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -13007,28 +12993,28 @@ def my_form_open(dialog, layer, feature):
         <default expression="" applyOnUpdate="0" field="races"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="id"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="table_set"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="label"/>
-        <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="races"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="id" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="table_set" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="label" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" exp_strength="0" field="races" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="table_set"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="races"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="table_set" exp="" desc=""/>
+        <constraint field="label" exp="" desc=""/>
+        <constraint field="races" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;table_set&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;table_set&quot;" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="id" width="-1" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column name="table_set" width="-1" hidden="0" type="field"/>
-          <column name="label" width="-1" hidden="0" type="field"/>
-          <column name="races" width="130" hidden="0" type="field"/>
+          <column name="id" hidden="0" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column name="table_set" hidden="0" type="field" width="-1"/>
+          <column name="label" hidden="0" type="field" width="-1"/>
+          <column name="races" hidden="0" type="field" width="130"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13100,7 +13086,7 @@ def my_form_open(dialog, layer, feature):
     <layer id="timelapse_55fe61aa_52c4_42b5_a917_d0927767c9d7"/>
     <layer id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
     <layer id="proposed_routes_f10ccfbd_1547_42d0_8c19_862e4ffde38b"/>
-    <layer id="proposed_road_markers_2b454f1d_6ad8_4b91_805f_f503490286b2"/>
+    <layer id="proposed_route_markers_b3dac0b0_ee05_431b_a89e_52cc9d9162b0"/>
   </layerorder>
   <properties>
     <DefaultStyles>
@@ -13276,7 +13262,7 @@ def my_form_open(dialog, layer, feature):
       <disabledLayers type="QStringList"/>
     </Identify>
     <Layouts>
-      <lastLayoutExportDir type="QString">/home/tim/Documents/GunRunMaps/GIS Base Map/Routes/20191002 - Gun Run 2019 - All Routes rev 1.6.png</lastLayoutExportDir>
+      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/Routes/20191002 - Gun Run 2019 - Routes rev 1.72.pdf</lastLayoutExportDir>
     </Layouts>
     <Legend>
       <filterByMap type="bool">false</filterByMap>
@@ -13415,273 +13401,268 @@ def my_form_open(dialog, layer, feature):
   </properties>
   <visibility-presets>
     <visibility-preset name="Access Routes" has-expanded-info="1">
-      <layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" style="default" expanded="1"/>
+      <layer expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" style="default"/>
       <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="0"/>
+      <layer expanded="0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Elevation"/>
         <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
         <expanded-group-node id="Feeding Stations"/>
+        <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-node id="Elevation"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="All Routes" has-expanded-info="1">
-      <layer id="all_routes20170907054841602" style="default" expanded="1"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="1" id="water_tables20170921142016467" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="all_routes20170907054841602" style="default"/>
       <checked-legend-nodes id="all_routes20170907054841602">
-        <checked-legend-node id="{bdaba96f-7e1b-4d42-b7dd-7e0ac1c340de}"/>
-        <checked-legend-node id="{3047fdca-b9ef-4659-af1a-dbbd7cd48473}"/>
-        <checked-legend-node id="{5a375156-c44c-4982-93d6-82ae53deda3e}"/>
-        <checked-legend-node id="{189f7600-691f-4bc6-a9c0-bc9a9a18e5fa}"/>
         <checked-legend-node id="{915c5fda-fe09-44ca-bed3-6346c6df4966}"/>
+        <checked-legend-node id="{5a375156-c44c-4982-93d6-82ae53deda3e}"/>
+        <checked-legend-node id="{3047fdca-b9ef-4659-af1a-dbbd7cd48473}"/>
         <checked-legend-node id="{b026320a-2fe6-4a3f-85ba-a22f63a10db1}"/>
+        <checked-legend-node id="{189f7600-691f-4bc6-a9c0-bc9a9a18e5fa}"/>
         <checked-legend-node id="{13a555f1-0140-4584-9ca0-a5c3268249fa}"/>
+        <checked-legend-node id="{bdaba96f-7e1b-4d42-b7dd-7e0ac1c340de}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes20170907054841602">
         <expanded-legend-node id="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
       </expanded-legend-nodes>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer id="water_tables20170921142016467" style="default" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-group-nodes>
+        <expanded-group-node id="Marshal pages"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <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="Map"/>
+        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Residents Access"/>
         <expanded-group-node id="Elevation"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshal pages"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Start and Finish pages"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Ask Me" has-expanded-info="1">
-      <layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" style="default" expanded="0"/>
-      <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="0"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" style="default" expanded="1"/>
+      <layer expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" style="default"/>
       <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
+      <layer expanded="0" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" style="default"/>
+      <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
+      <layer expanded="0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Elevation"/>
         <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
         <expanded-group-node id="Feeding Stations"/>
+        <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="Ask Me"/>
         <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Elevation"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Fencing" has-expanded-info="1">
-      <layer id="all_routes20170907054841602" style="default" expanded="1"/>
+      <layer expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="1" id="route_markers_400718de_4c66_4725_81c9_caa6b73d2d82" style="default"/>
+      <expanded-legend-nodes id="route_markers_400718de_4c66_4725_81c9_caa6b73d2d82"/>
+      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="default"/>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer expanded="1" id="water_tables20170921142016467" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="all_routes20170907054841602" style="default"/>
       <expanded-legend-nodes id="all_routes20170907054841602">
         <expanded-legend-node id="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
       </expanded-legend-nodes>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer id="route_markers_400718de_4c66_4725_81c9_caa6b73d2d82" style="default" expanded="1"/>
-      <expanded-legend-nodes id="route_markers_400718de_4c66_4725_81c9_caa6b73d2d82"/>
-      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="default" expanded="1"/>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer id="water_tables20170921142016467" style="default" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" expanded="1"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-group-nodes>
+        <expanded-group-node id="Marshal pages"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <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="Map"/>
+        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Residents Access"/>
         <expanded-group-node id="Elevation"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshal pages"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Start and Finish pages"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Marshal map - inset" has-expanded-info="1">
-      <layer id="all_routes20170907054841602" style="default" expanded="1"/>
+      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default"/>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer expanded="1" id="extra_security20170921130834191" style="default"/>
+      <expanded-legend-nodes id="extra_security20170921130834191"/>
+      <layer expanded="1" id="water_tables20170921142016467" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="all_routes20170907054841602" style="default"/>
       <expanded-legend-nodes id="all_routes20170907054841602">
         <expanded-legend-node id="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
       </expanded-legend-nodes>
-      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" expanded="1"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer id="water_tables20170921142016467" style="default" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" expanded="1"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="extra_security20170921130834191" style="default" expanded="1"/>
-      <expanded-legend-nodes id="extra_security20170921130834191"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Elevation"/>
         <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
         <expanded-group-node id="Feeding Stations"/>
+        <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-node id="Elevation"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Marshal map - main" has-expanded-info="1">
-      <layer id="all_routes20170907054841602" style="default" expanded="1"/>
+      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default"/>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer expanded="1" id="extra_security20170921130834191" style="default"/>
+      <expanded-legend-nodes id="extra_security20170921130834191"/>
+      <layer expanded="1" id="water_tables20170921142016467" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer expanded="0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="all_routes20170907054841602" style="default"/>
       <expanded-legend-nodes id="all_routes20170907054841602">
         <expanded-legend-node id="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
       </expanded-legend-nodes>
-      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" expanded="1"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer id="water_tables20170921142016467" style="default" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="0"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="extra_security20170921130834191" style="default" expanded="1"/>
-      <expanded-legend-nodes id="extra_security20170921130834191"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Elevation"/>
         <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
         <expanded-group-node id="Feeding Stations"/>
+        <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-node id="Elevation"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Marshal overview" has-expanded-info="1">
-      <layer id="all_routes20170907054841602" style="default" expanded="1"/>
+      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default"/>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer expanded="1" id="extra_security20170921130834191" style="default"/>
+      <expanded-legend-nodes id="extra_security20170921130834191"/>
+      <layer expanded="1" id="water_tables20170921142016467" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="all_routes20170907054841602" style="default"/>
       <expanded-legend-nodes id="all_routes20170907054841602">
         <expanded-legend-node id="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
       </expanded-legend-nodes>
-      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" expanded="1"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer id="water_tables20170921142016467" style="default" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" expanded="1"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="extra_security20170921130834191" style="default" expanded="1"/>
-      <expanded-legend-nodes id="extra_security20170921130834191"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Elevation"/>
         <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
         <expanded-group-node id="Feeding Stations"/>
+        <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-node id="Elevation"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Proposed Routes" has-expanded-info="1">
-      <layer id="proposed_road_markers_2b454f1d_6ad8_4b91_805f_f503490286b2" style="default" expanded="1"/>
-      <expanded-legend-nodes id="proposed_road_markers_2b454f1d_6ad8_4b91_805f_f503490286b2"/>
-      <layer id="proposed_routes_f10ccfbd_1547_42d0_8c19_862e4ffde38b" style="default" expanded="1"/>
-      <checked-legend-nodes id="proposed_routes_f10ccfbd_1547_42d0_8c19_862e4ffde38b">
-        <checked-legend-node id="{3047fdca-b9ef-4659-af1a-dbbd7cd48473}"/>
-        <checked-legend-node id="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
-        <checked-legend-node id="{915c5fda-fe09-44ca-bed3-6346c6df4966}"/>
-        <checked-legend-node id="{13a555f1-0140-4584-9ca0-a5c3268249fa}"/>
-      </checked-legend-nodes>
+      <layer expanded="1" id="proposed_route_markers_b3dac0b0_ee05_431b_a89e_52cc9d9162b0" style="default"/>
+      <expanded-legend-nodes id="proposed_route_markers_b3dac0b0_ee05_431b_a89e_52cc9d9162b0"/>
+      <layer expanded="1" id="proposed_routes_f10ccfbd_1547_42d0_8c19_862e4ffde38b" style="default"/>
       <expanded-legend-nodes id="proposed_routes_f10ccfbd_1547_42d0_8c19_862e4ffde38b">
         <expanded-legend-node id="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
       </expanded-legend-nodes>
-      <layer id="water_tables20170921142016467" style="default" expanded="1"/>
+      <layer expanded="1" id="water_tables20170921142016467" style="default"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="1"/>
+      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
         <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Map"/>
-        <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Routes" has-expanded-info="1">
-      <layer id="route_markers_400718de_4c66_4725_81c9_caa6b73d2d82" style="default" expanded="1"/>
+      <layer expanded="1" id="route_markers_400718de_4c66_4725_81c9_caa6b73d2d82" style="default"/>
       <expanded-legend-nodes id="route_markers_400718de_4c66_4725_81c9_caa6b73d2d82"/>
-      <layer id="all_routes20170907054841602" style="default" expanded="1"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="1" id="water_tables20170921142016467" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="all_routes20170907054841602" style="default"/>
       <checked-legend-nodes id="all_routes20170907054841602">
+        <checked-legend-node id="{915c5fda-fe09-44ca-bed3-6346c6df4966}"/>
         <checked-legend-node id="{3047fdca-b9ef-4659-af1a-dbbd7cd48473}"/>
         <checked-legend-node id="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
-        <checked-legend-node id="{915c5fda-fe09-44ca-bed3-6346c6df4966}"/>
         <checked-legend-node id="{13a555f1-0140-4584-9ca0-a5c3268249fa}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes20170907054841602">
         <expanded-legend-node id="{5a375156-c44c-4982-93d6-82ae53deda3e}"/>
         <expanded-legend-node id="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
       </expanded-legend-nodes>
-      <layer id="water_tables20170921142016467" style="default" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
         <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Map"/>
-        <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Start/Finish" has-expanded-info="1">
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="default" expanded="1"/>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" expanded="1"/>
+      <layer expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" style="default" expanded="1"/>
-      <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
-      <layer id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" style="default" expanded="1"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="default"/>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer expanded="1" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" style="default"/>
       <expanded-legend-nodes id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe"/>
+      <layer expanded="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" style="default"/>
+      <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-group-nodes>
+        <expanded-group-node id="Marshal pages"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <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="Map"/>
+        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Residents Access"/>
         <expanded-group-node id="Elevation"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshal pages"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Start and Finish pages"/>
       </expanded-group-nodes>
     </visibility-preset>
   </visibility-presets>
@@ -13708,12 +13689,12 @@ def my_form_open(dialog, layer, feature):
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout name="Routes" worldFileMap="" units="mm" printResolution="192">
-      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
-      <Grid resolution="10" offsetY="0" resUnits="mm" offsetUnits="mm" offsetX="0"/>
+    <Layout name="Routes" units="mm" printResolution="192" worldFileMap="">
+      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
+      <Grid offsetY="0" offsetX="0" resolution="10" resUnits="mm" offsetUnits="mm"/>
       <PageCollection>
-        <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-          <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+        <symbol name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill">
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
             <prop v="miter" k="joinstyle"/>
@@ -13727,130 +13708,130 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="0" itemRotation="0" positionOnPage="0,0,mm" background="true" id="" type="65638" excludeFromExports="0" position="0,0,mm" blendMode="0" referencePoint="0" frame="false" uuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" visibility="1" templateUuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" positionLock="false" groupUuid="" frameJoinStyle="miter" size="297,210,mm">
-          <FrameColor red="0" green="0" alpha="255" blue="0"/>
-          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+        <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" visibility="1" positionOnPage="0,0,mm" size="297,210,mm" positionLock="false" groupUuid="" position="0,0,mm" templateUuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" opacity="1" frame="false" zValue="0" frameJoinStyle="miter" background="true" type="65638" referencePoint="0" itemRotation="0">
+          <FrameColor green="0" blue="0" alpha="255" red="0"/>
+          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
           </LayoutObject>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide page="0" orientation="2" units="mm" position="0"/>
+          <Guide position="0" page="0" units="mm" orientation="2"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="9" marginX="1" itemRotation="0" positionOnPage="9.44946,191.611,mm" background="false" id="" type="65641" excludeFromExports="0" position="9.44946,191.611,mm" blendMode="0" halign="1" referencePoint="0" frame="false" uuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" valign="64" visibility="1" templateUuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" positionLock="true" marginY="1" groupUuid="" labelText="[%&quot;Distance&quot;%]" frameJoinStyle="miter" size="14.1764,7.471,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" htmlState="0" visibility="1" positionOnPage="9.44946,191.611,mm" valign="64" halign="1" size="14.1764,7.471,mm" positionLock="true" groupUuid="" position="9.44946,191.611,mm" templateUuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" labelText="[%&quot;Distance&quot;%]" opacity="1" frame="false" zValue="9" marginY="1" frameJoinStyle="miter" background="false" type="65641" marginX="1" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Semibold" description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="8" marginX="0" itemRotation="0" positionOnPage="24.2445,191.81,mm" background="false" id="" type="65641" excludeFromExports="0" position="24.2445,191.81,mm" blendMode="0" halign="1" referencePoint="0" frame="false" uuid="{d9f4225c-620f-4a62-a293-599f109f5206}" valign="64" visibility="1" templateUuid="{d9f4225c-620f-4a62-a293-599f109f5206}" positionLock="true" marginY="1" groupUuid="" labelText="RACE ROUTE" frameJoinStyle="miter" size="29.2025,7.272,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{d9f4225c-620f-4a62-a293-599f109f5206}" htmlState="0" visibility="1" positionOnPage="24.2445,191.81,mm" valign="64" halign="1" size="29.2025,7.272,mm" positionLock="true" groupUuid="" position="24.2445,191.81,mm" templateUuid="{d9f4225c-620f-4a62-a293-599f109f5206}" labelText="RACE ROUTE" opacity="1" frame="false" zValue="8" marginY="1" frameJoinStyle="miter" background="false" type="65641" marginX="0" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="6" marginX="1" itemRotation="0" positionOnPage="204.225,191.81,mm" background="false" id="" type="65641" excludeFromExports="0" position="204.225,191.81,mm" blendMode="0" halign="2" referencePoint="0" frame="false" uuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" valign="64" visibility="1" templateUuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" positionLock="true" marginY="1" groupUuid="" labelText="REVISION 1.71 (proposed)" frameJoinStyle="miter" size="57.4836,6.8714,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" htmlState="0" visibility="1" positionOnPage="204.225,191.81,mm" valign="64" halign="2" size="57.4836,6.8714,mm" positionLock="true" groupUuid="" position="204.225,191.81,mm" templateUuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" labelText="REVISION 1.72 (proposed)" opacity="1" frame="false" zValue="6" marginY="1" frameJoinStyle="miter" background="false" type="65641" marginX="1" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="5" marginX="1" itemRotation="0" positionOnPage="210.038,199.082,mm" background="false" id="" type="65641" excludeFromExports="0" position="210.038,199.082,mm" blendMode="0" halign="2" referencePoint="0" frame="false" uuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" valign="64" visibility="1" templateUuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" positionLock="true" marginY="1" groupUuid="" labelText="Sunday, 20 October 2019" frameJoinStyle="miter" size="51.6706,6.60801,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" htmlState="0" visibility="1" positionOnPage="210.038,199.082,mm" valign="64" halign="2" size="51.6706,6.60801,mm" positionLock="true" groupUuid="" position="210.038,199.082,mm" templateUuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" labelText="Sunday, 20 October 2019" opacity="1" frame="false" zValue="5" marginY="1" frameJoinStyle="miter" background="false" type="65641" marginX="1" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" svgBorderWidth="0.2" outlineWidthM="0.3,mm" anchorPoint="4" opacity="1" svgFillColor="255,255,255,255" zValue="4" itemRotation="0" northOffset="0" positionOnPage="262.196,188.218,mm" background="false" id="" type="65640" excludeFromExports="0" pictureRotation="0" position="262.196,188.218,mm" blendMode="0" resizeMode="0" referencePoint="0" frame="false" uuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" mapUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" visibility="1" templateUuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" positionLock="true" groupUuid="" frameJoinStyle="miter" pictureWidth="29.7523" northMode="0" size="29.7523,17.4718,mm" pictureHeight="17.4074">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" northMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" svgBorderColor="0,0,0,255" uuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" svgBorderWidth="0.2" mapUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" resizeMode="0" visibility="1" positionOnPage="262.196,188.218,mm" pictureRotation="0" size="29.7523,17.4718,mm" positionLock="true" groupUuid="" position="262.196,188.218,mm" templateUuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" pictureHeight="17.4074" northOffset="0" opacity="1" anchorPoint="4" frame="false" zValue="4" frameJoinStyle="miter" background="false" type="65640" file="../Gun_Run_Logo.png" pictureWidth="29.7523" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" shapeType="1" zValue="3" itemRotation="0" positionOnPage="9.59946,198.832,mm" background="false" id="" type="65643" excludeFromExports="0" position="9.59946,198.832,mm" blendMode="0" referencePoint="0" frame="false" uuid="{5e005555-54ea-40fd-a5a7-20254950b890}" visibility="1" templateUuid="{5e005555-54ea-40fd-a5a7-20254950b890}" positionLock="true" groupUuid="" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" size="251.959,0.1,mm">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{5e005555-54ea-40fd-a5a7-20254950b890}" visibility="1" positionOnPage="9.59946,198.832,mm" size="251.959,0.1,mm" positionLock="true" groupUuid="" position="9.59946,198.832,mm" templateUuid="{5e005555-54ea-40fd-a5a7-20254950b890}" opacity="1" frame="false" zValue="3" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" background="false" shapeType="1" type="65643" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-          <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+        <symbol name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill">
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
             <prop v="miter" k="joinstyle"/>
@@ -13864,64 +13845,64 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem followPreset="true" outlineWidthM="0.3,mm" opacity="1" keepLayerSet="false" zValue="2" itemRotation="0" mapFlags="0" positionOnPage="5.86559,4.09761,mm" background="true" id="" type="65639" excludeFromExports="0" position="5.86559,4.09761,mm" blendMode="0" referencePoint="0" frame="true" uuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" visibility="1" templateUuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" positionLock="true" groupUuid="" frameJoinStyle="miter" mapRotation="0" labelMargin="0,mm" drawCanvasItems="false" size="67.7828,166.874,mm" followPresetName="Proposed Routes">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" visibility="1" mapFlags="0" mapRotation="0" followPresetName="Proposed Routes" labelMargin="0,mm" positionOnPage="5.86559,4.09761,mm" drawCanvasItems="false" size="67.7828,166.874,mm" positionLock="true" groupUuid="" position="5.86559,4.09761,mm" followPreset="true" templateUuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" opacity="1" frame="true" zValue="2" frameJoinStyle="miter" background="true" type="65639" keepLayerSet="false" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedMapXMax" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedMapYMax" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedOpacity" type="Map">
-                  <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 name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <Extent xmax="18.38563681624126289" ymax="-33.91513741583252539" ymin="-33.94652930000000168" xmin="18.37288570000000121"/>
         <LayerSet/>
-        <ComposerMapGrid leftAnnotationPosition="1" topAnnotationDirection="0" name="Grid 1" unit="0" gridFrameMargin="0" topFrameDivisions="0" offsetY="0" leftFrameDivisions="0" position="3" annotationPrecision="3" blendMode="0" bottomAnnotationDirection="0" rightAnnotationDisplay="0" frameAnnotationDistance="1" rightAnnotationPosition="1" frameFillColor2="0,0,0,255" showAnnotation="0" gridFramePenThickness="0.5" gridFrameStyle="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" show="0" gridStyle="0" annotationFontColor="0,0,0,255" crossLength="3" offsetX="0" rightAnnotationDirection="0" intervalY="0" frameFillColor1="255,255,255,255" leftAnnotationDisplay="0" leftAnnotationDirection="0" gridFramePenColor="0,0,0,255" intervalX="0" rightFrameDivisions="0" annotationExpression="" gridFrameWidth="2" bottomAnnotationPosition="1" gridFrameSideFlags="15" annotationFormat="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" bottomFrameDivisions="0" topAnnotationPosition="1">
+        <ComposerMapGrid gridFramePenThickness="0.5" annotationFormat="0" rightAnnotationDisplay="0" gridFrameStyle="0" frameFillColor1="255,255,255,255" position="3" gridFrameMargin="0" annotationFontColor="0,0,0,255" annotationExpression="" bottomFrameDivisions="0" name="Grid 1" topFrameDivisions="0" bottomAnnotationDirection="0" gridFrameWidth="2" intervalX="0" frameFillColor2="0,0,0,255" leftAnnotationDirection="0" rightAnnotationPosition="1" annotationPrecision="3" crossLength="3" rightAnnotationDirection="0" unit="0" show="0" topAnnotationDisplay="0" leftAnnotationPosition="1" gridFramePenColor="0,0,0,255" frameAnnotationDistance="1" leftAnnotationDisplay="0" gridStyle="0" blendMode="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" intervalY="0" bottomAnnotationDisplay="0" rightFrameDivisions="0" topAnnotationDirection="0" bottomAnnotationPosition="1" offsetY="0" gridFrameSideFlags="15" topAnnotationPosition="1" leftFrameDivisions="0" offsetX="0" showAnnotation="0">
           <lineStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-              <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+            <symbol name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine">
                 <prop v="square" k="capstyle"/>
                 <prop v="5;2" k="customdash"/>
                 <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -13940,17 +13921,17 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-              <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
+            <symbol name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+              <layer locked="0" pass="0" enabled="1" class="SimpleMarker">
                 <prop v="0" k="angle"/>
                 <prop v="0,0,0,255" k="color"/>
                 <prop v="1" k="horizontal_anchor_point"/>
@@ -13971,9 +13952,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -13984,41 +13965,41 @@ def my_form_open(dialog, layer, feature):
         <AtlasMap atlasDriven="0" margin="0.05" scalingMode="2"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutItem followPreset="true" outlineWidthM="0.15,mm" opacity="1" keepLayerSet="false" zValue="1" itemRotation="0" mapFlags="0" positionOnPage="9.44946,9.08557,mm" background="true" id="" type="65639" excludeFromExports="0" position="9.44946,9.08557,mm" blendMode="0" referencePoint="0" frame="true" uuid="{b35d820c-6054-4426-a840-5216bed2ca94}" visibility="1" templateUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" positionLock="true" groupUuid="" frameJoinStyle="round" mapRotation="0" labelMargin="0,mm" drawCanvasItems="true" size="282.012,182.649,mm" followPresetName="Proposed Routes">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" id="" outlineWidthM="0.15,mm" excludeFromExports="0" uuid="{b35d820c-6054-4426-a840-5216bed2ca94}" visibility="1" mapFlags="0" mapRotation="0" followPresetName="Proposed Routes" labelMargin="0,mm" positionOnPage="9.44946,9.08557,mm" drawCanvasItems="true" size="282.012,182.649,mm" positionLock="true" groupUuid="" position="9.44946,9.08557,mm" followPreset="true" templateUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" opacity="1" frame="true" zValue="1" frameJoinStyle="round" background="true" type="65639" keepLayerSet="false" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '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 name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.368'&#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 name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.368'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.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 name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmax="18.42103445111282056" ymax="-33.89565141814495774" ymin="-33.92999999999999972" xmin="18.36799999999999855"/>
+        <Extent xmax="18.41993426871829342" ymax="-33.89747009916650455" ymin="-33.91199999999999903" xmin="18.39750000000000085"/>
         <LayerSet/>
-        <ComposerMapGrid leftAnnotationPosition="1" topAnnotationDirection="0" name="Grid 1" unit="0" gridFrameMargin="0" topFrameDivisions="0" offsetY="0" leftFrameDivisions="0" position="3" annotationPrecision="3" blendMode="0" bottomAnnotationDirection="0" rightAnnotationDisplay="0" frameAnnotationDistance="1" rightAnnotationPosition="1" frameFillColor2="0,0,0,255" showAnnotation="0" gridFramePenThickness="0.5" gridFrameStyle="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" show="0" gridStyle="0" annotationFontColor="0,0,0,255" crossLength="3" offsetX="0" rightAnnotationDirection="0" intervalY="0" frameFillColor1="255,255,255,255" leftAnnotationDisplay="0" leftAnnotationDirection="0" gridFramePenColor="0,0,0,255" intervalX="0" rightFrameDivisions="0" annotationExpression="" gridFrameWidth="2" bottomAnnotationPosition="1" gridFrameSideFlags="15" annotationFormat="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" bottomFrameDivisions="0" topAnnotationPosition="1">
+        <ComposerMapGrid gridFramePenThickness="0.5" annotationFormat="0" rightAnnotationDisplay="0" gridFrameStyle="0" frameFillColor1="255,255,255,255" position="3" gridFrameMargin="0" annotationFontColor="0,0,0,255" annotationExpression="" bottomFrameDivisions="0" name="Grid 1" topFrameDivisions="0" bottomAnnotationDirection="0" gridFrameWidth="2" intervalX="0" frameFillColor2="0,0,0,255" leftAnnotationDirection="0" rightAnnotationPosition="1" annotationPrecision="3" crossLength="3" rightAnnotationDirection="0" unit="0" show="0" topAnnotationDisplay="0" leftAnnotationPosition="1" gridFramePenColor="0,0,0,255" frameAnnotationDistance="1" leftAnnotationDisplay="0" gridStyle="0" blendMode="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" intervalY="0" bottomAnnotationDisplay="0" rightFrameDivisions="0" topAnnotationDirection="0" bottomAnnotationPosition="1" offsetY="0" gridFrameSideFlags="15" topAnnotationPosition="1" leftFrameDivisions="0" offsetX="0" showAnnotation="0">
           <lineStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-              <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+            <symbol name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine">
                 <prop v="square" k="capstyle"/>
                 <prop v="5;2" k="customdash"/>
                 <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -14037,17 +14018,17 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-              <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
+            <symbol name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+              <layer locked="0" pass="0" enabled="1" class="SimpleMarker">
                 <prop v="0" k="angle"/>
                 <prop v="0,0,0,255" k="color"/>
                 <prop v="1" k="horizontal_anchor_point"/>
@@ -14068,9 +14049,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -14095,14 +14076,14 @@ def my_form_open(dialog, layer, feature):
         <property value="0" key="pdfTextFormat"/>
         <property value="true" key="singleFile"/>
       </customproperties>
-      <Atlas coverageLayer="proposed_routes_f10ccfbd_1547_42d0_8c19_862e4ffde38b" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/proposed_routes.shp|layername=proposed_routes" pageNameExpression="&quot;Distance&quot;" enabled="1" sortAscending="0" coverageLayerProvider="ogr" coverageLayerName="proposed_routes" filterFeatures="1" hideCoverage="0" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortKey="length_m" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21)' )" sortFeatures="1"/>
+      <Atlas sortAscending="0" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/proposed_routes.shp|layername=proposed_routes" sortKey="length_m" filterFeatures="1" enabled="1" coverageLayerProvider="ogr" coverageLayer="proposed_routes_f10ccfbd_1547_42d0_8c19_862e4ffde38b" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21)' )" hideCoverage="0" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" pageNameExpression="&quot;Distance&quot;" coverageLayerName="proposed_routes" sortFeatures="1"/>
     </Layout>
-    <Layout name="Marshals" worldFileMap="" units="mm" printResolution="120">
-      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
-      <Grid resolution="10" offsetY="0" resUnits="mm" offsetUnits="mm" offsetX="0"/>
+    <Layout name="Marshals" units="mm" printResolution="120" worldFileMap="">
+      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
+      <Grid offsetY="0" offsetX="0" resolution="10" resUnits="mm" offsetUnits="mm"/>
       <PageCollection>
-        <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-          <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+        <symbol name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill">
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
             <prop v="miter" k="joinstyle"/>
@@ -14116,22 +14097,22 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="0" itemRotation="0" positionOnPage="0,0,mm" background="true" id="" type="65638" excludeFromExports="0" position="0,0,mm" blendMode="0" referencePoint="0" frame="false" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" visibility="1" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" positionLock="false" groupUuid="" frameJoinStyle="miter" size="297,210,mm">
-          <FrameColor red="0" green="0" alpha="255" blue="0"/>
-          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+        <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" visibility="1" positionOnPage="0,0,mm" size="297,210,mm" positionLock="false" groupUuid="" position="0,0,mm" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" opacity="1" frame="false" zValue="0" frameJoinStyle="miter" background="true" type="65638" referencePoint="0" itemRotation="0">
+          <FrameColor green="0" blue="0" alpha="255" red="0"/>
+          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
@@ -14139,15 +14120,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem splitLayer="0" rasterBorderColor="0,0,0,255" position="128.239,3.58,mm" visibility="1" blendMode="0" rasterBorderWidth="0" itemRotation="0" background="true" legendFilterByAtlas="0" size="19.9422,26,mm" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" wmsLegendWidth="50" columnSpace="2" frame="true" symbolAlignment="1" outlineWidthM="0.1,mm" opacity="1" symbolWidth="7" symbolHeight="4" boxSpace="2" resizeToContents="1" rasterBorder="1" id="" wrapChar="" referencePoint="0" equalColumnWidth="1" groupUuid="" columnCount="1" positionLock="true" fontColor="#000000" type="65642" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" excludeFromExports="0" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" lineSpacing="1" zValue="5" titleAlignment="1" title="" wmsLegendHeight="25" positionOnPage="128.239,3.58,mm" frameJoinStyle="bevel">
-        <FrameColor red="128" green="128" alpha="255" blue="128"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem position="128.239,3.58,mm" rasterBorder="1" excludeFromExports="0" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" id="" positionOnPage="128.239,3.58,mm" positionLock="true" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" outlineWidthM="0.1,mm" titleAlignment="1" fontColor="#000000" groupUuid="" rasterBorderWidth="0" columnSpace="2" wmsLegendHeight="25" symbolWidth="7" wrapChar="" rasterBorderColor="0,0,0,255" resizeToContents="1" type="65642" frameJoinStyle="bevel" opacity="1" referencePoint="0" itemRotation="0" legendFilterByAtlas="0" blendMode="0" visibility="1" background="true" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" symbolAlignment="1" zValue="5" size="19.9422,26,mm" wmsLegendWidth="50" symbolHeight="4" frame="true" columnCount="1" boxSpace="2" lineSpacing="1" equalColumnWidth="1" title="" splitLayer="0">
+        <FrameColor green="128" blue="128" alpha="255" red="128"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
@@ -14165,15 +14146,15 @@ def my_form_open(dialog, layer, feature):
           <style name="symbol" marginTop="2" alignment="1">
             <styleFont style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style name="symbolLabel" marginLeft="2" marginTop="2" alignment="1">
+          <style name="symbolLabel" marginTop="2" marginLeft="2" alignment="1">
             <styleFont style="Semibold" description="Myriad Pro,8,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties/>
-          <layer-tree-group name="Routes" checked="Qt::Checked" expanded="1">
+          <layer-tree-group expanded="1" name="Routes" checked="Qt::Checked">
             <customproperties/>
-            <layer-tree-layer name="all_routes" checked="Qt::Checked" id="all_routes20170907054841602" providerKey="ogr" expanded="1" source="./all_routes.shp">
+            <layer-tree-layer expanded="1" id="all_routes20170907054841602" name="all_routes" providerKey="ogr" checked="Qt::Checked" source="./all_routes.shp">
               <customproperties>
                 <property value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" key="expandedLegendNodes"/>
                 <property value="1,2,3" key="legend/node-order"/>
@@ -14185,25 +14166,25 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem followPreset="true" outlineWidthM="0.2,mm" opacity="1" keepLayerSet="false" zValue="4" itemRotation="0" mapFlags="0" positionOnPage="102.986,142.175,mm" background="true" id="" type="65639" excludeFromExports="0" position="102.986,142.175,mm" blendMode="0" referencePoint="0" frame="true" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" visibility="1" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" positionLock="true" groupUuid="" frameJoinStyle="miter" mapRotation="0" labelMargin="0,mm" drawCanvasItems="false" size="50.4055,50.7436,mm" followPresetName="Marshal map - inset">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" id="" outlineWidthM="0.2,mm" excludeFromExports="0" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" visibility="1" mapFlags="0" mapRotation="0" followPresetName="Marshal map - inset" labelMargin="0,mm" positionOnPage="102.986,142.175,mm" drawCanvasItems="false" size="50.4055,50.7436,mm" positionLock="true" groupUuid="" position="102.986,142.175,mm" followPreset="true" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" opacity="1" frame="true" zValue="4" frameJoinStyle="miter" background="true" type="65639" keepLayerSet="false" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <Extent xmax="18.40867058941471512" ymax="-33.9047436175620831" ymin="-33.90511059368537161" xmin="18.40830605842002043"/>
         <LayerSet/>
-        <ComposerMapGrid leftAnnotationPosition="1" topAnnotationDirection="0" name="Grid 1" unit="0" gridFrameMargin="0" topFrameDivisions="0" offsetY="0" leftFrameDivisions="0" position="3" annotationPrecision="3" blendMode="0" bottomAnnotationDirection="0" rightAnnotationDisplay="0" frameAnnotationDistance="1" rightAnnotationPosition="1" frameFillColor2="0,0,0,255" showAnnotation="0" gridFramePenThickness="0.5" gridFrameStyle="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" show="0" gridStyle="0" annotationFontColor="0,0,0,255" crossLength="3" offsetX="0" rightAnnotationDirection="0" intervalY="0" frameFillColor1="255,255,255,255" leftAnnotationDisplay="0" leftAnnotationDirection="0" gridFramePenColor="0,0,0,255" intervalX="0" rightFrameDivisions="0" annotationExpression="" gridFrameWidth="2" bottomAnnotationPosition="1" gridFrameSideFlags="15" annotationFormat="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" bottomFrameDivisions="0" topAnnotationPosition="1">
+        <ComposerMapGrid gridFramePenThickness="0.5" annotationFormat="0" rightAnnotationDisplay="0" gridFrameStyle="0" frameFillColor1="255,255,255,255" position="3" gridFrameMargin="0" annotationFontColor="0,0,0,255" annotationExpression="" bottomFrameDivisions="0" name="Grid 1" topFrameDivisions="0" bottomAnnotationDirection="0" gridFrameWidth="2" intervalX="0" frameFillColor2="0,0,0,255" leftAnnotationDirection="0" rightAnnotationPosition="1" annotationPrecision="3" crossLength="3" rightAnnotationDirection="0" unit="0" show="0" topAnnotationDisplay="0" leftAnnotationPosition="1" gridFramePenColor="0,0,0,255" frameAnnotationDistance="1" leftAnnotationDisplay="0" gridStyle="0" blendMode="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" intervalY="0" bottomAnnotationDisplay="0" rightFrameDivisions="0" topAnnotationDirection="0" bottomAnnotationPosition="1" offsetY="0" gridFrameSideFlags="15" topAnnotationPosition="1" leftFrameDivisions="0" offsetX="0" showAnnotation="0">
           <lineStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-              <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+            <symbol name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine">
                 <prop v="square" k="capstyle"/>
                 <prop v="5;2" k="customdash"/>
                 <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -14222,17 +14203,17 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-              <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
+            <symbol name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+              <layer locked="0" pass="0" enabled="1" class="SimpleMarker">
                 <prop v="0" k="angle"/>
                 <prop v="0,0,0,255" k="color"/>
                 <prop v="1" k="horizontal_anchor_point"/>
@@ -14253,9 +14234,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -14263,9 +14244,9 @@ def my_form_open(dialog, layer, feature):
           </markerStyle>
           <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <ComposerMapOverview name="Overview 1" centered="1" blendMode="0" inverted="0" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" show="1" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" position="3">
-          <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-            <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+        <ComposerMapOverview blendMode="0" centered="1" name="Overview 1" position="3" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" show="1" inverted="0">
+          <symbol name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill">
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="0,65,170,102" k="color"/>
               <prop v="bevel" k="joinstyle"/>
@@ -14279,9 +14260,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -14290,25 +14271,25 @@ def my_form_open(dialog, layer, feature):
         <AtlasMap atlasDriven="1" margin="0.10000000000000001" scalingMode="0"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutItem followPreset="true" outlineWidthM="0.3,mm" opacity="1" keepLayerSet="false" zValue="3" itemRotation="0" mapFlags="0" positionOnPage="3.53,6.0007,mm" background="false" id="" type="65639" excludeFromExports="0" position="3.53,6.0007,mm" blendMode="0" referencePoint="0" frame="false" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" visibility="1" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" positionLock="true" groupUuid="" frameJoinStyle="miter" mapRotation="0" labelMargin="0,mm" drawCanvasItems="true" size="142,181,mm" followPresetName="Marshal map - main">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" visibility="1" mapFlags="0" mapRotation="0" followPresetName="Marshal map - main" labelMargin="0,mm" positionOnPage="3.53,6.0007,mm" drawCanvasItems="true" size="142,181,mm" positionLock="true" groupUuid="" position="3.53,6.0007,mm" followPreset="true" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" opacity="1" frame="false" zValue="3" frameJoinStyle="miter" background="false" type="65639" keepLayerSet="false" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <Extent xmax="18.41054220300782873" ymax="-33.90230913298024973" ymin="-33.90754507826720499" xmin="18.40643444482690683"/>
         <LayerSet/>
-        <ComposerMapGrid leftAnnotationPosition="1" topAnnotationDirection="0" name="Grid 1" unit="0" gridFrameMargin="0" topFrameDivisions="0" offsetY="0" leftFrameDivisions="0" position="3" annotationPrecision="3" blendMode="0" bottomAnnotationDirection="0" rightAnnotationDisplay="0" frameAnnotationDistance="1" rightAnnotationPosition="1" frameFillColor2="0,0,0,255" showAnnotation="0" gridFramePenThickness="0.5" gridFrameStyle="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" show="0" gridStyle="0" annotationFontColor="0,0,0,255" crossLength="3" offsetX="0" rightAnnotationDirection="0" intervalY="0" frameFillColor1="255,255,255,255" leftAnnotationDisplay="0" leftAnnotationDirection="0" gridFramePenColor="0,0,0,255" intervalX="0" rightFrameDivisions="0" annotationExpression="" gridFrameWidth="2" bottomAnnotationPosition="1" gridFrameSideFlags="15" annotationFormat="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" bottomFrameDivisions="0" topAnnotationPosition="1">
+        <ComposerMapGrid gridFramePenThickness="0.5" annotationFormat="0" rightAnnotationDisplay="0" gridFrameStyle="0" frameFillColor1="255,255,255,255" position="3" gridFrameMargin="0" annotationFontColor="0,0,0,255" annotationExpression="" bottomFrameDivisions="0" name="Grid 1" topFrameDivisions="0" bottomAnnotationDirection="0" gridFrameWidth="2" intervalX="0" frameFillColor2="0,0,0,255" leftAnnotationDirection="0" rightAnnotationPosition="1" annotationPrecision="3" crossLength="3" rightAnnotationDirection="0" unit="0" show="0" topAnnotationDisplay="0" leftAnnotationPosition="1" gridFramePenColor="0,0,0,255" frameAnnotationDistance="1" leftAnnotationDisplay="0" gridStyle="0" blendMode="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" intervalY="0" bottomAnnotationDisplay="0" rightFrameDivisions="0" topAnnotationDirection="0" bottomAnnotationPosition="1" offsetY="0" gridFrameSideFlags="15" topAnnotationPosition="1" leftFrameDivisions="0" offsetX="0" showAnnotation="0">
           <lineStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-              <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+            <symbol name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine">
                 <prop v="square" k="capstyle"/>
                 <prop v="5;2" k="customdash"/>
                 <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -14327,17 +14308,17 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-              <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
+            <symbol name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+              <layer locked="0" pass="0" enabled="1" class="SimpleMarker">
                 <prop v="0" k="angle"/>
                 <prop v="0,0,0,255" k="color"/>
                 <prop v="1" k="horizontal_anchor_point"/>
@@ -14358,9 +14339,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -14371,48 +14352,48 @@ def my_form_open(dialog, layer, feature):
         <AtlasMap atlasDriven="1" margin="0.10000000000000001" scalingMode="0"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="2" hideBackgroundIfEmpty="0" itemRotation="0" hidePageIfEmpty="0" positionOnPage="277.3,6.0007,mm" background="false" id="" type="65647" excludeFromExports="0" position="277.3,6.0007,mm" blendMode="0" sectionX="0" referencePoint="2" frame="false" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" sectionWidth="127.436" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" visibility="1" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" positionLock="true" groupUuid="" frameJoinStyle="round" sectionY="0" size="127.436,159.418,mm" sectionHeight="159.418">
-        <FrameColor red="119" green="119" alpha="255" blue="119"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" sectionHeight="159.418" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" sectionX="0" visibility="1" sectionY="0" sectionWidth="127.436" positionOnPage="277.3,6.0007,mm" size="127.436,159.418,mm" positionLock="true" groupUuid="" position="277.3,6.0007,mm" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" hideBackgroundIfEmpty="0" opacity="1" frame="false" zValue="2" frameJoinStyle="round" background="false" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" type="65647" referencePoint="2" itemRotation="0" hidePageIfEmpty="0">
+        <FrameColor green="119" blue="119" alpha="255" red="119"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem svgBorderColor="0,0,0,255" file="../Gun_Run_Logo_2018.png" svgBorderWidth="0.2" outlineWidthM="0.3,mm" anchorPoint="0" opacity="1" svgFillColor="255,255,255,255" zValue="1" itemRotation="0" northOffset="0" positionOnPage="230.194,167.419,mm" background="false" id="" type="65640" excludeFromExports="0" pictureRotation="0" position="230.194,167.419,mm" blendMode="0" resizeMode="0" referencePoint="0" frame="false" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" mapUuid="" visibility="1" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" positionLock="true" groupUuid="" frameJoinStyle="miter" pictureWidth="27.4317" northMode="0" size="47.1065,27.6,mm" pictureHeight="27.6">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" northMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" svgBorderColor="0,0,0,255" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" svgBorderWidth="0.2" mapUuid="" resizeMode="0" visibility="1" positionOnPage="230.194,167.419,mm" pictureRotation="0" size="47.1065,27.6,mm" positionLock="true" groupUuid="" position="230.194,167.419,mm" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" pictureHeight="27.6" northOffset="0" opacity="1" anchorPoint="0" frame="false" zValue="1" frameJoinStyle="miter" background="false" type="65640" file="../Gun_Run_Logo_2018.png" pictureWidth="27.4317" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutMultiFrame maxBreakDistance="12" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;tr>&lt;td>Name&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', &quot;csv_name&quot;, '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;/td>&lt;/tr>', '')%]&#xa;&lt;tr>&lt;td>Club&lt;/td>&lt;td>[%csv_club%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%csv_captain%]&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>&lt;b>VOC&lt;/b>&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;tr>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&amp;nbsp;&lt;/td>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain_phone&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;/td>&lt;tr>')%]&#xa;&#xa;&lt;tr>&lt;td>Roger Steward&lt;/td>&lt;td>081 037 3033&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Timothy Allen&lt;/td>&lt;td>072 703 9574&lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please return your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephen Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>" resizeMode="0" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" contentMode="1" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}" stylesheetEnabled="true" evaluateExpressions="true" type="65648" useSmartBreaks="true" url="">
+      <LayoutMultiFrame stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}" type="65648" contentMode="1" evaluateExpressions="true" useSmartBreaks="true" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" stylesheetEnabled="true" resizeMode="0" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;tr>&lt;td>Name&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', &quot;csv_name&quot;, '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;/td>&lt;/tr>', '')%]&#xa;&lt;tr>&lt;td>Club&lt;/td>&lt;td>[%csv_club%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%csv_captain%]&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>&lt;b>VOC&lt;/b>&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;tr>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&amp;nbsp;&lt;/td>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain_phone&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;/td>&lt;tr>')%]&#xa;&#xa;&lt;tr>&lt;td>Roger Steward&lt;/td>&lt;td>081 037 3033&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Timothy Allen&lt;/td>&lt;td>072 703 9574&lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please return your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephen Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>" maxBreakDistance="12" url="">
         <childFrame uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
@@ -14435,14 +14416,14 @@ def my_form_open(dialog, layer, feature):
         <property value="3.53" key="resizeToContentsTopMargin"/>
         <property value="false" key="singleFile"/>
       </customproperties>
-      <Atlas coverageLayer="all_routes20170907054841602" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/all_routes.shp" pageNameExpression="&quot;position&quot;" enabled="1" sortAscending="1" coverageLayerProvider="ogr" coverageLayerName="all_routes" filterFeatures="0" hideCoverage="0" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" sortKey="position" sortFeatures="1"/>
+      <Atlas sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/all_routes.shp" sortKey="position" filterFeatures="0" enabled="1" coverageLayerProvider="ogr" coverageLayer="all_routes20170907054841602" hideCoverage="0" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" pageNameExpression="&quot;position&quot;" coverageLayerName="all_routes" sortFeatures="1"/>
     </Layout>
-    <Layout name="Marshal Plan" worldFileMap="" units="mm" printResolution="120">
-      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
-      <Grid resolution="10" offsetY="0" resUnits="mm" offsetUnits="mm" offsetX="0"/>
+    <Layout name="Marshal Plan" units="mm" printResolution="120" worldFileMap="">
+      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
+      <Grid offsetY="0" offsetX="0" resolution="10" resUnits="mm" offsetUnits="mm"/>
       <PageCollection>
-        <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-          <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+        <symbol name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill">
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
             <prop v="miter" k="joinstyle"/>
@@ -14456,22 +14437,22 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="0" itemRotation="0" positionOnPage="0,0,mm" background="true" id="" type="65638" excludeFromExports="0" position="0,0,mm" blendMode="0" referencePoint="0" frame="false" uuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" visibility="1" templateUuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" positionLock="false" groupUuid="" frameJoinStyle="miter" size="297,420,mm">
-          <FrameColor red="0" green="0" alpha="255" blue="0"/>
-          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+        <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" visibility="1" positionOnPage="0,0,mm" size="297,420,mm" positionLock="false" groupUuid="" position="0,0,mm" templateUuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" opacity="1" frame="false" zValue="0" frameJoinStyle="miter" background="true" type="65638" referencePoint="0" itemRotation="0">
+          <FrameColor green="0" blue="0" alpha="255" red="0"/>
+          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
@@ -14479,15 +14460,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem splitLayer="0" rasterBorderColor="0,0,0,255" position="15.6525,12.5708,mm" visibility="1" blendMode="0" rasterBorderWidth="0" itemRotation="0" background="true" legendFilterByAtlas="0" size="21.6797,27,mm" map_uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" wmsLegendWidth="50" columnSpace="2" frame="false" symbolAlignment="1" outlineWidthM="0.3,mm" opacity="1" symbolWidth="7" symbolHeight="4" boxSpace="2" resizeToContents="1" rasterBorder="1" id="" wrapChar="" referencePoint="0" equalColumnWidth="1" groupUuid="" columnCount="1" positionLock="true" fontColor="#000000" type="65642" uuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" excludeFromExports="0" templateUuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" lineSpacing="1" zValue="8" titleAlignment="1" title="" wmsLegendHeight="25" positionOnPage="15.6525,12.5708,mm" frameJoinStyle="miter">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem position="15.6525,12.5708,mm" rasterBorder="1" excludeFromExports="0" map_uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" id="" positionOnPage="15.6525,12.5708,mm" positionLock="true" templateUuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" outlineWidthM="0.3,mm" titleAlignment="1" fontColor="#000000" groupUuid="" rasterBorderWidth="0" columnSpace="2" wmsLegendHeight="25" symbolWidth="7" wrapChar="" rasterBorderColor="0,0,0,255" resizeToContents="1" type="65642" frameJoinStyle="miter" opacity="1" referencePoint="0" itemRotation="0" legendFilterByAtlas="0" blendMode="0" visibility="1" background="true" uuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" symbolAlignment="1" zValue="8" size="21.6797,27,mm" wmsLegendWidth="50" symbolHeight="4" frame="false" columnCount="1" boxSpace="2" lineSpacing="1" equalColumnWidth="1" title="" splitLayer="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
@@ -14505,15 +14486,15 @@ def my_form_open(dialog, layer, feature):
           <style name="symbol" marginTop="2" alignment="1">
             <styleFont style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style name="symbolLabel" marginLeft="2" marginTop="2" alignment="1">
+          <style name="symbolLabel" marginTop="2" marginLeft="2" alignment="1">
             <styleFont style="Semibold" description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties/>
-          <layer-tree-group name="Routes" checked="Qt::Checked" expanded="1">
+          <layer-tree-group expanded="1" name="Routes" checked="Qt::Checked">
             <customproperties/>
-            <layer-tree-layer name="all_routes" checked="Qt::Checked" id="all_routes20170907054841602" providerKey="ogr" expanded="1" source="./all_routes.shp">
+            <layer-tree-layer expanded="1" id="all_routes20170907054841602" name="all_routes" providerKey="ogr" checked="Qt::Checked" source="./all_routes.shp">
               <customproperties>
                 <property value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" key="expandedLegendNodes"/>
                 <property value="1,2,3" key="legend/node-order"/>
@@ -14525,105 +14506,105 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="7" marginX="1" itemRotation="0" positionOnPage="5.69321,399.106,mm" background="false" id="" type="65641" excludeFromExports="0" position="5.69321,399.106,mm" blendMode="0" halign="1" referencePoint="0" frame="false" uuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" valign="64" visibility="1" templateUuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" positionLock="true" marginY="1" groupUuid="" labelText="MARSHAL POSITIONS" frameJoinStyle="miter" size="45.1194,7.36972,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" htmlState="0" visibility="1" positionOnPage="5.69321,399.106,mm" valign="64" halign="1" size="45.1194,7.36972,mm" positionLock="true" groupUuid="" position="5.69321,399.106,mm" templateUuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" labelText="MARSHAL POSITIONS" opacity="1" frame="false" zValue="7" marginY="1" frameJoinStyle="miter" background="false" type="65641" marginX="1" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Semibold" description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="6" marginX="1" itemRotation="0" positionOnPage="5.69321,406.988,mm" background="false" id="" type="65641" excludeFromExports="0" position="5.69321,406.988,mm" blendMode="0" halign="1" referencePoint="0" frame="false" uuid="{619c5aac-2a47-4730-9726-57b172205ef7}" valign="32" visibility="1" templateUuid="{619c5aac-2a47-4730-9726-57b172205ef7}" positionLock="true" marginY="1" groupUuid="" labelText="Page [% &quot;page&quot; %]" frameJoinStyle="miter" size="16.2476,7.80192,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{619c5aac-2a47-4730-9726-57b172205ef7}" htmlState="0" visibility="1" positionOnPage="5.69321,406.988,mm" valign="32" halign="1" size="16.2476,7.80192,mm" positionLock="true" groupUuid="" position="5.69321,406.988,mm" templateUuid="{619c5aac-2a47-4730-9726-57b172205ef7}" labelText="Page [% &quot;page&quot; %]" opacity="1" frame="false" zValue="6" marginY="1" frameJoinStyle="miter" background="false" type="65641" marginX="1" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="5" marginX="1" itemRotation="0" positionOnPage="214.292,406.988,mm" background="false" id="" type="65641" excludeFromExports="0" position="214.292,406.988,mm" blendMode="0" halign="2" referencePoint="0" frame="false" uuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" valign="32" visibility="1" templateUuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" positionLock="true" marginY="1" groupUuid="" labelText="REVISION 3.2" frameJoinStyle="miter" size="27.7839,7.51682,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" htmlState="0" visibility="1" positionOnPage="214.292,406.988,mm" valign="32" halign="2" size="27.7839,7.51682,mm" positionLock="true" groupUuid="" position="214.292,406.988,mm" templateUuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" labelText="REVISION 3.2" opacity="1" frame="false" zValue="5" marginY="1" frameJoinStyle="miter" background="false" type="65641" marginX="1" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="4" marginX="1" itemRotation="0" positionOnPage="185.72,399.107,mm" background="false" id="" type="65641" excludeFromExports="0" position="185.72,399.107,mm" blendMode="0" halign="2" referencePoint="0" frame="false" uuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" valign="64" visibility="1" templateUuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" positionLock="true" marginY="1" groupUuid="" labelText="Sunday, 20 October 2019" frameJoinStyle="miter" size="56.3557,7.36902,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" htmlState="0" visibility="1" positionOnPage="185.72,399.107,mm" valign="64" halign="2" size="56.3557,7.36902,mm" positionLock="true" groupUuid="" position="185.72,399.107,mm" templateUuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" labelText="Sunday, 20 October 2019" opacity="1" frame="false" zValue="4" marginY="1" frameJoinStyle="miter" background="false" type="65641" marginX="1" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem svgBorderColor="0,0,0,255" file="../Gun_Run_Logo_2018.png" svgBorderWidth="0.2" outlineWidthM="0.3,mm" anchorPoint="8" opacity="1" svgFillColor="255,255,255,255" zValue="3" itemRotation="0" northOffset="0" positionOnPage="243.319,382.696,mm" background="false" id="" type="65640" excludeFromExports="0" pictureRotation="0" position="243.319,382.696,mm" blendMode="0" resizeMode="0" referencePoint="0" frame="false" uuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" mapUuid="" visibility="1" templateUuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" positionLock="true" groupUuid="" frameJoinStyle="miter" pictureWidth="31.1059" northMode="0" size="49.3143,31.2967,mm" pictureHeight="31.2967">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" northMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" svgBorderColor="0,0,0,255" uuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" svgBorderWidth="0.2" mapUuid="" resizeMode="0" visibility="1" positionOnPage="243.319,382.696,mm" pictureRotation="0" size="49.3143,31.2967,mm" positionLock="true" groupUuid="" position="243.319,382.696,mm" templateUuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" pictureHeight="31.2967" northOffset="0" opacity="1" anchorPoint="8" frame="false" zValue="3" frameJoinStyle="miter" background="false" type="65640" file="../Gun_Run_Logo_2018.png" pictureWidth="31.1059" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" shapeType="1" zValue="2" itemRotation="0" positionOnPage="5.84321,406.626,mm" background="false" id="" type="65643" excludeFromExports="0" position="5.84321,406.626,mm" blendMode="0" referencePoint="0" frame="false" uuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" visibility="1" templateUuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" positionLock="true" groupUuid="" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" size="236.083,0.14328,mm">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" visibility="1" positionOnPage="5.84321,406.626,mm" size="236.083,0.14328,mm" positionLock="true" groupUuid="" position="5.84321,406.626,mm" templateUuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" opacity="1" frame="false" zValue="2" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" background="false" shapeType="1" type="65643" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-          <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+        <symbol name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill">
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
             <prop v="miter" k="joinstyle"/>
@@ -14637,39 +14618,39 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem followPreset="true" outlineWidthM="0.3,mm" opacity="1" keepLayerSet="false" zValue="1" itemRotation="0" mapFlags="0" positionOnPage="5.03,5.9483,mm" background="true" id="" type="65639" excludeFromExports="0" position="5.03,5.9483,mm" blendMode="0" referencePoint="0" frame="false" uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" visibility="1" templateUuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" positionLock="true" groupUuid="" frameJoinStyle="miter" mapRotation="0" labelMargin="0,mm" drawCanvasItems="false" size="286.94,392.396,mm" followPresetName="Marshal overview">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" visibility="1" mapFlags="0" mapRotation="0" followPresetName="Marshal overview" labelMargin="0,mm" positionOnPage="5.03,5.9483,mm" drawCanvasItems="false" size="286.94,392.396,mm" positionLock="true" groupUuid="" position="5.03,5.9483,mm" followPreset="true" templateUuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" opacity="1" frame="false" zValue="1" frameJoinStyle="miter" background="true" type="65639" keepLayerSet="false" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="field" value="" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value=""/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
                 <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="field" value="" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value=""/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
                 <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="field" value="" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value=""/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
@@ -14682,14 +14663,14 @@ def my_form_open(dialog, layer, feature):
       <customproperties>
         <property value="png" key="atlasRasterFormat"/>
       </customproperties>
-      <Atlas coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" pageNameExpression="&quot;page&quot;" enabled="1" sortAscending="1" coverageLayerProvider="ogr" coverageLayerName="marshal overviews" filterFeatures="0" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" sortKey="page" sortFeatures="1"/>
+      <Atlas sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" sortKey="page" filterFeatures="0" enabled="1" coverageLayerProvider="ogr" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;page&quot;" coverageLayerName="marshal overviews" sortFeatures="1"/>
     </Layout>
-    <Layout name="Start &amp; Finish Backgrounds" worldFileMap="" units="mm" printResolution="300">
-      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
-      <Grid resolution="10" offsetY="0" resUnits="mm" offsetUnits="mm" offsetX="0"/>
+    <Layout name="Start &amp; Finish Backgrounds" units="mm" printResolution="300" worldFileMap="">
+      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
+      <Grid offsetY="0" offsetX="0" resolution="10" resUnits="mm" offsetUnits="mm"/>
       <PageCollection>
-        <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-          <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+        <symbol name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill">
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
             <prop v="miter" k="joinstyle"/>
@@ -14703,22 +14684,22 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="0" itemRotation="0" positionOnPage="0,0,mm" background="true" id="" type="65638" excludeFromExports="0" position="0,0,mm" blendMode="0" referencePoint="0" frame="false" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" visibility="1" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" positionLock="false" groupUuid="" frameJoinStyle="miter" size="297,210,mm">
-          <FrameColor red="0" green="0" alpha="255" blue="0"/>
-          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+        <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" visibility="1" positionOnPage="0,0,mm" size="297,210,mm" positionLock="false" groupUuid="" position="0,0,mm" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" opacity="1" frame="false" zValue="0" frameJoinStyle="miter" background="true" type="65638" referencePoint="0" itemRotation="0">
+          <FrameColor green="0" blue="0" alpha="255" red="0"/>
+          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
@@ -14726,99 +14707,99 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem svgBorderColor="0,0,0,255" file="arrows/NorthArrow_11.svg" svgBorderWidth="0.2" outlineWidthM="0.3,mm" anchorPoint="0" opacity="1" svgFillColor="255,255,255,255" zValue="4" itemRotation="0" northOffset="0" positionOnPage="286.027,2,mm" background="false" id="" type="65640" excludeFromExports="0" pictureRotation="330" position="286.027,2,mm" blendMode="0" resizeMode="0" referencePoint="0" frame="false" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" visibility="1" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" positionLock="true" groupUuid="" frameJoinStyle="miter" pictureWidth="6.31767" northMode="0" size="9.45865,11,mm" pictureHeight="7.97477">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" northMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" svgBorderColor="0,0,0,255" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" svgBorderWidth="0.2" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" resizeMode="0" visibility="1" positionOnPage="286.027,2,mm" pictureRotation="330" size="9.45865,11,mm" positionLock="true" groupUuid="" position="286.027,2,mm" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" pictureHeight="7.97477" northOffset="0" opacity="1" anchorPoint="0" frame="false" zValue="4" frameJoinStyle="miter" background="false" type="65640" file="arrows/NorthArrow_11.svg" pictureWidth="6.31767" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="3" marginX="1" itemRotation="270" positionOnPage="285.027,205.886,mm" background="false" id="" type="65641" excludeFromExports="0" position="285.027,205.886,mm" blendMode="0" halign="1" referencePoint="0" frame="false" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" valign="64" visibility="1" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" positionLock="true" marginY="1" groupUuid="" labelText="[%upper( &quot;area&quot; )%]" frameJoinStyle="miter" size="142.543,10.3185,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" htmlState="0" visibility="1" positionOnPage="285.027,205.886,mm" valign="64" halign="1" size="142.543,10.3185,mm" positionLock="true" groupUuid="" position="285.027,205.886,mm" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" labelText="[%upper( &quot;area&quot; )%]" opacity="1" frame="false" zValue="3" marginY="1" frameJoinStyle="miter" background="false" type="65641" marginX="1" referencePoint="0" itemRotation="270">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidth="0.3" segmentMillimeters="26.485" position="7,189.669,mm" visibility="1" blendMode="0" maxBarWidth="150" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" height="3" itemRotation="0" background="false" size="144.798,16.2165,mm" lineJoinStyle="miter" labelBarSpace="3" frame="false" lineCapStyle="square" numUnitsPerSegment="30" outlineWidthM="0.3,mm" opacity="1" style="Single Box" minBarWidth="50" id="" referencePoint="0" groupUuid="" unitType="meters" numMapUnitsPerScaleBarUnit="1" positionLock="true" numSegmentsLeft="2" numSegments="4" alignment="0" type="65646" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" boxContentSpace="1" excludeFromExports="0" segmentSizeMode="1" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" zValue="2" unitLabel="m" positionOnPage="7,189.669,mm" frameJoinStyle="miter">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem position="7,189.669,mm" boxContentSpace="1" excludeFromExports="0" height="3" unitLabel="m" id="" outlineWidth="0.3" numUnitsPerSegment="30" positionOnPage="7,189.669,mm" positionLock="true" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" outlineWidthM="0.3,mm" numMapUnitsPerScaleBarUnit="1" groupUuid="" numSegmentsLeft="2" maxBarWidth="150" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" type="65646" style="Single Box" frameJoinStyle="miter" opacity="1" referencePoint="0" itemRotation="0" blendMode="0" lineCapStyle="square" visibility="1" lineJoinStyle="miter" background="false" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" zValue="2" size="144.798,16.2165,mm" segmentMillimeters="26.485" minBarWidth="50" alignment="0" frame="false" segmentSizeMode="1" numSegments="4" unitType="meters" labelBarSpace="3">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <text-style fontUnderline="0" fontCapitals="0" fontItalic="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" textColor="0,0,0,255" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" blendMode="0" fontWeight="50" fontSize="12" fontLetterSpacing="0" multilineHeight="1">
-          <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-          <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeJoinStyle="64" shapeRadiiY="0" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+        <text-style blendMode="0" fontSize="12" textColor="0,0,0,255" multilineHeight="1" fontSizeUnit="Point" fontLetterSpacing="0" fontItalic="0" fontUnderline="0" textOpacity="1" fontStrikeout="0" fontWeight="50" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontCapitals="0" namedStyle="" fontFamily="Myriad Pro">
+          <text-buffer bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255"/>
+          <background shapeSizeX="0" shapeRadiiUnit="MM" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBlendMode="0" shapeSizeUnit="MM" shapeSizeY="0" shapeSizeType="0" shapeBorderWidth="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeRotation="0" shapeOffsetX="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeRadiiY="0" shapeRadiiX="0" shapeOffsetY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOpacity="0.7" shadowScale="100" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowRadius="1.5" shadowRadiusUnit="MM" shadowUnder="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
         </text-style>
-        <fillColor red="0" green="0" alpha="255" blue="0"/>
-        <fillColor2 red="255" green="255" alpha="255" blue="255"/>
-        <strokeColor red="0" green="0" alpha="255" blue="0"/>
+        <fillColor green="0" blue="0" alpha="255" red="0"/>
+        <fillColor2 green="255" blue="255" alpha="255" red="255"/>
+        <strokeColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem followPreset="true" outlineWidthM="0.3,mm" opacity="1" keepLayerSet="false" zValue="1" itemRotation="0" mapFlags="0" positionOnPage="7,5.5,mm" background="false" id="" type="65639" excludeFromExports="0" position="7,5.5,mm" blendMode="0" referencePoint="0" frame="false" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" visibility="1" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" positionLock="true" groupUuid="" frameJoinStyle="miter" mapRotation="330" labelMargin="0,mm" drawCanvasItems="false" size="278.027,180.318,mm" followPresetName="Start/Finish">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" visibility="1" mapFlags="0" mapRotation="330" followPresetName="Start/Finish" labelMargin="0,mm" positionOnPage="7,5.5,mm" drawCanvasItems="false" size="278.027,180.318,mm" positionLock="true" groupUuid="" position="7,5.5,mm" followPreset="true" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" opacity="1" frame="false" zValue="1" frameJoinStyle="miter" background="false" type="65639" keepLayerSet="false" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapRotation" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="field" value="rotation" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="rotation"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="field" value="id" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value="id"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
                 <Option name="dataDefinedRotation" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="field" value="angle" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value="angle"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <Extent xmax="18.41529351624939181" ymax="-33.90054080002538228" ymin="-33.90274914295450515" xmin="18.41188853742018949"/>
         <LayerSet/>
-        <ComposerMapGrid leftAnnotationPosition="1" topAnnotationDirection="0" name="Grid 1" unit="1" gridFrameMargin="0" topFrameDivisions="0" offsetY="0" leftFrameDivisions="0" position="3" annotationPrecision="3" blendMode="0" bottomAnnotationDirection="0" rightAnnotationDisplay="3" frameAnnotationDistance="1" rightAnnotationPosition="1" frameFillColor2="0,0,0,255" showAnnotation="0" gridFramePenThickness="0.5" gridFrameStyle="0" bottomAnnotationDisplay="3" topAnnotationDisplay="3" show="0" gridStyle="0" annotationFontColor="0,0,0,255" crossLength="3" offsetX="0" rightAnnotationDirection="0" intervalY="5" frameFillColor1="255,255,255,255" leftAnnotationDisplay="3" leftAnnotationDirection="0" gridFramePenColor="0,0,0,255" intervalX="5" rightFrameDivisions="0" annotationExpression="" gridFrameWidth="2" bottomAnnotationPosition="1" gridFrameSideFlags="15" annotationFormat="4" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" bottomFrameDivisions="0" topAnnotationPosition="1">
+        <ComposerMapGrid gridFramePenThickness="0.5" annotationFormat="4" rightAnnotationDisplay="3" gridFrameStyle="0" frameFillColor1="255,255,255,255" position="3" gridFrameMargin="0" annotationFontColor="0,0,0,255" annotationExpression="" bottomFrameDivisions="0" name="Grid 1" topFrameDivisions="0" bottomAnnotationDirection="0" gridFrameWidth="2" intervalX="5" frameFillColor2="0,0,0,255" leftAnnotationDirection="0" rightAnnotationPosition="1" annotationPrecision="3" crossLength="3" rightAnnotationDirection="0" unit="1" show="0" topAnnotationDisplay="3" leftAnnotationPosition="1" gridFramePenColor="0,0,0,255" frameAnnotationDistance="1" leftAnnotationDisplay="3" gridStyle="0" blendMode="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" intervalY="5" bottomAnnotationDisplay="3" rightFrameDivisions="0" topAnnotationDirection="0" bottomAnnotationPosition="1" offsetY="0" gridFrameSideFlags="15" topAnnotationPosition="1" leftFrameDivisions="0" offsetX="0" showAnnotation="0">
           <lineStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-              <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+            <symbol name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine">
                 <prop v="square" k="capstyle"/>
                 <prop v="5;2" k="customdash"/>
                 <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -14837,17 +14818,17 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-              <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
+            <symbol name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+              <layer locked="0" pass="0" enabled="1" class="SimpleMarker">
                 <prop v="0" k="angle"/>
                 <prop v="0,0,0,255" k="color"/>
                 <prop v="1" k="horizontal_anchor_point"/>
@@ -14868,9 +14849,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -14905,14 +14886,14 @@ def my_form_open(dialog, layer, feature):
         <property value="0" key="pdfTextFormat"/>
         <property value="true" key="singleFile"/>
       </customproperties>
-      <Atlas coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/start_finish_area.shp" pageNameExpression="&quot;area&quot;" enabled="1" sortAscending="1" coverageLayerProvider="ogr" coverageLayerName="start_finish_area" filterFeatures="0" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" sortKey="area" sortFeatures="1"/>
+      <Atlas sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/start_finish_area.shp" sortKey="area" filterFeatures="0" enabled="1" coverageLayerProvider="ogr" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;area&quot;" coverageLayerName="start_finish_area" sortFeatures="1"/>
     </Layout>
-    <Layout name="Fencing" worldFileMap="" units="mm" printResolution="300">
-      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
-      <Grid resolution="10" offsetY="0" resUnits="mm" offsetUnits="mm" offsetX="0"/>
+    <Layout name="Fencing" units="mm" printResolution="300" worldFileMap="">
+      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
+      <Grid offsetY="0" offsetX="0" resolution="10" resUnits="mm" offsetUnits="mm"/>
       <PageCollection>
-        <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-          <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+        <symbol name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill">
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
             <prop v="miter" k="joinstyle"/>
@@ -14926,22 +14907,22 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="0" itemRotation="0" positionOnPage="0,0,mm" background="true" id="" type="65638" excludeFromExports="0" position="0,0,mm" blendMode="0" referencePoint="0" frame="false" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" visibility="1" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" positionLock="false" groupUuid="" frameJoinStyle="miter" size="297,210,mm">
-          <FrameColor red="0" green="0" alpha="255" blue="0"/>
-          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+        <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" visibility="1" positionOnPage="0,0,mm" size="297,210,mm" positionLock="false" groupUuid="" position="0,0,mm" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" opacity="1" frame="false" zValue="0" frameJoinStyle="miter" background="true" type="65638" referencePoint="0" itemRotation="0">
+          <FrameColor green="0" blue="0" alpha="255" red="0"/>
+          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
@@ -14949,105 +14930,105 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="9" marginX="1" itemRotation="0" positionOnPage="6.76779,190.27,mm" background="false" id="" type="65641" excludeFromExports="0" position="6.76779,190.27,mm" blendMode="0" halign="1" referencePoint="0" frame="false" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" valign="64" visibility="1" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" positionLock="true" marginY="1" groupUuid="" labelText="FENCING: [% &quot;name&quot; %]" frameJoinStyle="miter" size="148.46,7.36972,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" htmlState="0" visibility="1" positionOnPage="6.76779,190.27,mm" valign="64" halign="1" size="148.46,7.36972,mm" positionLock="true" groupUuid="" position="6.76779,190.27,mm" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" labelText="FENCING: [% &quot;name&quot; %]" opacity="1" frame="false" zValue="9" marginY="1" frameJoinStyle="miter" background="false" type="65641" marginX="1" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Semibold" description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="8" marginX="1" itemRotation="0" positionOnPage="6.76779,198.083,mm" background="false" id="" type="65641" excludeFromExports="0" position="6.76779,198.083,mm" blendMode="0" halign="1" referencePoint="0" frame="false" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" valign="32" visibility="1" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" positionLock="true" marginY="1" groupUuid="" labelText="Page [%@layout_page %]" frameJoinStyle="miter" size="148.46,7.80192,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" htmlState="0" visibility="1" positionOnPage="6.76779,198.083,mm" valign="32" halign="1" size="148.46,7.80192,mm" positionLock="true" groupUuid="" position="6.76779,198.083,mm" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" labelText="Page [%@layout_page %]" opacity="1" frame="false" zValue="8" marginY="1" frameJoinStyle="miter" background="false" type="65641" marginX="1" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="7" marginX="1" itemRotation="0" positionOnPage="211.295,197.64,mm" background="false" id="" type="65641" excludeFromExports="0" position="211.295,197.64,mm" blendMode="0" halign="2" referencePoint="0" frame="false" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" valign="32" visibility="1" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" positionLock="true" marginY="1" groupUuid="" labelText="REVISION 1.0" frameJoinStyle="miter" size="27.7839,7.51682,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" htmlState="0" visibility="1" positionOnPage="211.295,197.64,mm" valign="32" halign="2" size="27.7839,7.51682,mm" positionLock="true" groupUuid="" position="211.295,197.64,mm" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" labelText="REVISION 1.0" opacity="1" frame="false" zValue="7" marginY="1" frameJoinStyle="miter" background="false" type="65641" marginX="1" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="6" marginX="1" itemRotation="0" positionOnPage="182.723,190.271,mm" background="false" id="" type="65641" excludeFromExports="0" position="182.723,190.271,mm" blendMode="0" halign="2" referencePoint="0" frame="false" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" valign="64" visibility="1" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" positionLock="true" marginY="1" groupUuid="" labelText="Sunday, 20 October 2019" frameJoinStyle="miter" size="56.3557,7.36902,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" htmlState="0" visibility="1" positionOnPage="182.723,190.271,mm" valign="64" halign="2" size="56.3557,7.36902,mm" positionLock="true" groupUuid="" position="182.723,190.271,mm" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" labelText="Sunday, 20 October 2019" opacity="1" frame="false" zValue="6" marginY="1" frameJoinStyle="miter" background="false" type="65641" marginX="1" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" svgBorderWidth="0.2" outlineWidthM="0.3,mm" anchorPoint="8" opacity="1" svgFillColor="255,255,255,255" zValue="5" itemRotation="0" northOffset="0" positionOnPage="243.098,175.353,mm" background="false" id="" type="65640" excludeFromExports="0" pictureRotation="0" position="243.098,175.353,mm" blendMode="0" resizeMode="0" referencePoint="0" frame="false" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" mapUuid="" visibility="1" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" positionLock="true" groupUuid="" frameJoinStyle="miter" pictureWidth="49.3143" northMode="0" size="49.3143,29.8354,mm" pictureHeight="28.8527">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" northMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" svgBorderColor="0,0,0,255" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" svgBorderWidth="0.2" mapUuid="" resizeMode="0" visibility="1" positionOnPage="243.098,175.353,mm" pictureRotation="0" size="49.3143,29.8354,mm" positionLock="true" groupUuid="" position="243.098,175.353,mm" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" pictureHeight="28.8527" northOffset="0" opacity="1" anchorPoint="8" frame="false" zValue="5" frameJoinStyle="miter" background="false" type="65640" file="../Gun_Run_Logo.png" pictureWidth="49.3143" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" shapeType="1" zValue="4" itemRotation="0" positionOnPage="6.91779,197.79,mm" background="false" id="" type="65643" excludeFromExports="0" position="6.91779,197.79,mm" blendMode="0" referencePoint="0" frame="false" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" visibility="1" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" positionLock="true" groupUuid="" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" size="232.01,0.14328,mm">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" visibility="1" positionOnPage="6.91779,197.79,mm" size="232.01,0.14328,mm" positionLock="true" groupUuid="" position="6.91779,197.79,mm" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" opacity="1" frame="false" zValue="4" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" background="false" shapeType="1" type="65643" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-          <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+        <symbol name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill">
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
             <prop v="miter" k="joinstyle"/>
@@ -15061,45 +15042,45 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem outlineWidth="0.2" segmentMillimeters="33.1642" position="6.76779,2.8482,mm" visibility="1" blendMode="0" maxBarWidth="100" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" height="2" itemRotation="0" background="false" size="112.219,15.8378,mm" lineJoinStyle="round" labelBarSpace="1" frame="false" lineCapStyle="square" numUnitsPerSegment="600" outlineWidthM="0.3,mm" opacity="1" style="Double Box" minBarWidth="25" id="" referencePoint="0" groupUuid="" unitType="meters" numMapUnitsPerScaleBarUnit="1" positionLock="true" numSegmentsLeft="2" numSegments="2" alignment="0" type="65646" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" boxContentSpace="0.2" excludeFromExports="0" segmentSizeMode="1" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" zValue="3" unitLabel="m" positionOnPage="6.76779,2.8482,mm" frameJoinStyle="miter">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem position="6.76779,2.8482,mm" boxContentSpace="0.2" excludeFromExports="0" height="2" unitLabel="m" id="" outlineWidth="0.2" numUnitsPerSegment="600" positionOnPage="6.76779,2.8482,mm" positionLock="true" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" outlineWidthM="0.3,mm" numMapUnitsPerScaleBarUnit="1" groupUuid="" numSegmentsLeft="2" maxBarWidth="100" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" type="65646" style="Double Box" frameJoinStyle="miter" opacity="1" referencePoint="0" itemRotation="0" blendMode="0" lineCapStyle="square" visibility="1" lineJoinStyle="round" background="false" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" zValue="3" size="112.219,15.8378,mm" segmentMillimeters="33.1642" minBarWidth="25" alignment="0" frame="false" segmentSizeMode="1" numSegments="2" unitType="meters" labelBarSpace="1">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <text-style fontUnderline="0" fontCapitals="0" fontItalic="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" textColor="0,0,0,255" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" blendMode="0" fontWeight="50" fontSize="12" fontLetterSpacing="0" multilineHeight="1">
-          <text-buffer bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferColor="255,255,255,255" bufferSize="1"/>
-          <background shapeOffsetY="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeJoinStyle="64" shapeRadiiY="0" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeDraw="0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSVGFile="" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0"/>
+        <text-style blendMode="0" fontSize="12" textColor="0,0,0,255" multilineHeight="1" fontSizeUnit="Point" fontLetterSpacing="0" fontItalic="0" fontUnderline="0" textOpacity="1" fontStrikeout="0" fontWeight="50" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontCapitals="0" namedStyle="" fontFamily="Myriad Pro">
+          <text-buffer bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255"/>
+          <background shapeSizeX="0" shapeRadiiUnit="MM" shapeBorderColor="128,128,128,255" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBlendMode="0" shapeSizeUnit="MM" shapeSizeY="0" shapeSizeType="0" shapeBorderWidth="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeRotation="0" shapeOffsetX="0" shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeRadiiY="0" shapeRadiiX="0" shapeOffsetY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOpacity="0.7" shadowScale="100" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowRadius="1.5" shadowRadiusUnit="MM" shadowUnder="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
         </text-style>
-        <fillColor red="0" green="0" alpha="255" blue="0"/>
-        <fillColor2 red="255" green="255" alpha="255" blue="255"/>
-        <strokeColor red="0" green="0" alpha="255" blue="0"/>
+        <fillColor green="0" blue="0" alpha="255" red="0"/>
+        <fillColor2 green="255" blue="255" alpha="255" red="255"/>
+        <strokeColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem splitLayer="0" rasterBorderColor="0,0,0,255" position="9.94906,16.8614,mm" visibility="1" blendMode="0" rasterBorderWidth="0" itemRotation="0" background="true" legendFilterByAtlas="0" size="38.1563,54.9504,mm" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" wmsLegendWidth="50" columnSpace="2" frame="true" symbolAlignment="1" outlineWidthM="0.3,mm" opacity="1" symbolWidth="7" symbolHeight="4" boxSpace="2" resizeToContents="0" rasterBorder="1" id="" wrapChar="" referencePoint="0" equalColumnWidth="1" groupUuid="" columnCount="1" positionLock="false" fontColor="#000000" type="65642" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" excludeFromExports="0" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" lineSpacing="1" zValue="2" titleAlignment="1" title="" wmsLegendHeight="25" positionOnPage="9.94906,16.8614,mm" frameJoinStyle="miter">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem position="9.94906,16.8614,mm" rasterBorder="1" excludeFromExports="0" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" id="" positionOnPage="9.94906,16.8614,mm" positionLock="false" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" outlineWidthM="0.3,mm" titleAlignment="1" fontColor="#000000" groupUuid="" rasterBorderWidth="0" columnSpace="2" wmsLegendHeight="25" symbolWidth="7" wrapChar="" rasterBorderColor="0,0,0,255" resizeToContents="0" type="65642" frameJoinStyle="miter" opacity="1" referencePoint="0" itemRotation="0" legendFilterByAtlas="0" blendMode="0" visibility="1" background="true" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" symbolAlignment="1" zValue="2" size="38.1563,54.9504,mm" wmsLegendWidth="50" symbolHeight="4" frame="true" columnCount="1" boxSpace="2" lineSpacing="1" equalColumnWidth="1" title="" splitLayer="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
@@ -15117,24 +15098,24 @@ def my_form_open(dialog, layer, feature):
           <style name="symbol" marginTop="2.5" alignment="1">
             <styleFont style="" description="Myriad Pro,9,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style name="symbolLabel" marginLeft="2" marginTop="2" alignment="1">
+          <style name="symbolLabel" marginTop="2" marginLeft="2" alignment="1">
             <styleFont style="Regular" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties/>
-          <layer-tree-group name="Fencing and Cones" checked="Qt::Checked" expanded="1">
+          <layer-tree-group expanded="1" name="Fencing and Cones" checked="Qt::Checked">
             <customproperties/>
-            <layer-tree-layer name="fencing" checked="Qt::Checked" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" expanded="1" source="./fencing.shp|layername=fencing">
+            <layer-tree-layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" name="fencing" providerKey="ogr" checked="Qt::Checked" source="./fencing.shp|layername=fencing">
               <customproperties>
                 <property value="0,1,2" key="legend/node-order"/>
                 <property value="hidden" key="legend/title-style"/>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group name="Routes" checked="Qt::Checked" expanded="1">
+          <layer-tree-group expanded="1" name="Routes" checked="Qt::Checked">
             <customproperties/>
-            <layer-tree-layer name="all_routes" checked="Qt::Checked" id="all_routes20170907054841602" providerKey="ogr" expanded="1" source="./all_routes.shp">
+            <layer-tree-layer expanded="1" id="all_routes20170907054841602" name="all_routes" providerKey="ogr" checked="Qt::Checked" source="./all_routes.shp">
               <customproperties>
                 <property value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" key="expandedLegendNodes"/>
                 <property value="1,2,3" key="legend/node-order"/>
@@ -15147,47 +15128,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem followPreset="true" outlineWidthM="0.3,mm" opacity="0.9" keepLayerSet="false" zValue="1" itemRotation="0" mapFlags="0" positionOnPage="6.76779,9.35102,mm" background="false" id="" type="65639" excludeFromExports="0" position="6.76779,9.35102,mm" blendMode="0" referencePoint="0" frame="false" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" visibility="1" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" positionLock="true" groupUuid="" frameJoinStyle="miter" mapRotation="0" labelMargin="0,mm" drawCanvasItems="false" size="283.418,180.92,mm" followPresetName="Fencing">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" visibility="1" mapFlags="0" mapRotation="0" followPresetName="Fencing" labelMargin="0,mm" positionOnPage="6.76779,9.35102,mm" drawCanvasItems="false" size="283.418,180.92,mm" positionLock="true" groupUuid="" position="6.76779,9.35102,mm" followPreset="true" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" opacity="0.9" frame="false" zValue="1" frameJoinStyle="miter" background="false" type="65639" keepLayerSet="false" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapRotation" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
                   <Option name="transformer" type="Map">
                     <Option name="d" type="Map">
-                      <Option name="exponent" 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 name="exponent" type="double" value="1"/>
+                      <Option name="maxOutput" type="double" value="360"/>
+                      <Option name="maxValue" type="double" value="0"/>
+                      <Option name="minOutput" type="double" value="0"/>
+                      <Option name="minValue" type="double" value="0"/>
+                      <Option name="nullOutput" type="double" value="0"/>
                     </Option>
-                    <Option name="t" value="0" type="int"/>
+                    <Option name="t" type="int" value="0"/>
                   </Option>
-                  <Option name="type" value="3" type="int"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedRotation" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="field" value="angle" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value="angle"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <Extent xmax="18.40911192436379196" ymax="-33.91548345873710701" ymin="-33.95089278916222497" xmin="18.35364178617763997"/>
         <LayerSet/>
-        <ComposerMapGrid leftAnnotationPosition="1" topAnnotationDirection="0" name="Grid 1" unit="1" gridFrameMargin="0" topFrameDivisions="0" offsetY="0" leftFrameDivisions="0" position="3" annotationPrecision="3" blendMode="0" bottomAnnotationDirection="0" rightAnnotationDisplay="3" frameAnnotationDistance="1" rightAnnotationPosition="1" frameFillColor2="0,0,0,255" showAnnotation="0" gridFramePenThickness="0.5" gridFrameStyle="0" bottomAnnotationDisplay="3" topAnnotationDisplay="3" show="0" gridStyle="0" annotationFontColor="0,0,0,255" crossLength="3" offsetX="0" rightAnnotationDirection="0" intervalY="5" frameFillColor1="255,255,255,255" leftAnnotationDisplay="3" leftAnnotationDirection="0" gridFramePenColor="0,0,0,255" intervalX="5" rightFrameDivisions="0" annotationExpression="" gridFrameWidth="2" bottomAnnotationPosition="1" gridFrameSideFlags="15" annotationFormat="4" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" bottomFrameDivisions="0" topAnnotationPosition="1">
+        <ComposerMapGrid gridFramePenThickness="0.5" annotationFormat="4" rightAnnotationDisplay="3" gridFrameStyle="0" frameFillColor1="255,255,255,255" position="3" gridFrameMargin="0" annotationFontColor="0,0,0,255" annotationExpression="" bottomFrameDivisions="0" name="Grid 1" topFrameDivisions="0" bottomAnnotationDirection="0" gridFrameWidth="2" intervalX="5" frameFillColor2="0,0,0,255" leftAnnotationDirection="0" rightAnnotationPosition="1" annotationPrecision="3" crossLength="3" rightAnnotationDirection="0" unit="1" show="0" topAnnotationDisplay="3" leftAnnotationPosition="1" gridFramePenColor="0,0,0,255" frameAnnotationDistance="1" leftAnnotationDisplay="3" gridStyle="0" blendMode="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" intervalY="5" bottomAnnotationDisplay="3" rightFrameDivisions="0" topAnnotationDirection="0" bottomAnnotationPosition="1" offsetY="0" gridFrameSideFlags="15" topAnnotationPosition="1" leftFrameDivisions="0" offsetX="0" showAnnotation="0">
           <lineStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-              <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+            <symbol name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine">
                 <prop v="square" k="capstyle"/>
                 <prop v="5;2" k="customdash"/>
                 <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -15206,17 +15187,17 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-              <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
+            <symbol name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+              <layer locked="0" pass="0" enabled="1" class="SimpleMarker">
                 <prop v="0" k="angle"/>
                 <prop v="0,0,0,255" k="color"/>
                 <prop v="1" k="horizontal_anchor_point"/>
@@ -15237,9 +15218,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -15268,14 +15249,14 @@ def my_form_open(dialog, layer, feature):
         <property value="0" key="pdfTextFormat"/>
         <property value="true" key="rasterize"/>
       </customproperties>
-      <Atlas coverageLayer="fence_groups_f376bd8f_41c6_452b_8e99_04d721ae7517" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20fencing%20GROUP%20BY%20%22group%22" pageNameExpression="&quot;name&quot;" enabled="1" sortAscending="1" coverageLayerProvider="virtual" coverageLayerName="fence_groups" filterFeatures="0" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" sortKey="group" sortFeatures="1"/>
+      <Atlas sortAscending="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20fencing%20GROUP%20BY%20%22group%22" sortKey="group" filterFeatures="0" enabled="1" coverageLayerProvider="virtual" coverageLayer="fence_groups_f376bd8f_41c6_452b_8e99_04d721ae7517" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;name&quot;" coverageLayerName="fence_groups" sortFeatures="1"/>
     </Layout>
-    <Layout name="Access Roads" worldFileMap="" units="mm" printResolution="192">
-      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
-      <Grid resolution="10" offsetY="0" resUnits="mm" offsetUnits="mm" offsetX="0"/>
+    <Layout name="Access Roads" units="mm" printResolution="192" worldFileMap="">
+      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
+      <Grid offsetY="0" offsetX="0" resolution="10" resUnits="mm" offsetUnits="mm"/>
       <PageCollection>
-        <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-          <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+        <symbol name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill">
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
             <prop v="miter" k="joinstyle"/>
@@ -15289,56 +15270,40 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="0" itemRotation="0" positionOnPage="0,0,mm" background="true" id="" type="65638" excludeFromExports="0" position="0,0,mm" blendMode="0" referencePoint="0" frame="false" uuid="{e7a46ede-6ed1-40d7-9752-ba4364902d22}" visibility="1" templateUuid="{e7a46ede-6ed1-40d7-9752-ba4364902d22}" positionLock="false" groupUuid="" frameJoinStyle="miter" size="297,210,mm">
-          <FrameColor red="0" green="0" alpha="255" blue="0"/>
-          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+        <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{e7a46ede-6ed1-40d7-9752-ba4364902d22}" visibility="1" positionOnPage="0,0,mm" size="297,210,mm" positionLock="false" groupUuid="" position="0,0,mm" templateUuid="{e7a46ede-6ed1-40d7-9752-ba4364902d22}" opacity="1" frame="false" zValue="0" frameJoinStyle="miter" background="true" type="65638" referencePoint="0" itemRotation="0">
+          <FrameColor green="0" blue="0" alpha="255" red="0"/>
+          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
           </LayoutObject>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide page="0" orientation="2" units="mm" position="0"/>
+          <Guide position="0" page="0" units="mm" orientation="2"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="8" marginX="1" itemRotation="0" positionOnPage="8.71559,188.218,mm" background="false" id="" type="65641" excludeFromExports="0" position="8.71559,188.218,mm" blendMode="0" halign="1" referencePoint="0" frame="false" uuid="{01e42ab4-6e28-4fb2-b1a1-06b256ff505b}" valign="64" visibility="1" templateUuid="{01e42ab4-6e28-4fb2-b1a1-06b256ff505b}" positionLock="true" marginY="1" groupUuid="" labelText="ACCESS ROADS FOR RESIDENTS" frameJoinStyle="miter" size="110.769,6.8714,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem position="249.711,156.015,mm" rasterBorder="1" excludeFromExports="0" map_uuid="{6abeaf6e-4f52-413a-a7ff-23ce2850a84c}" id="" positionOnPage="249.711,156.015,mm" positionLock="true" templateUuid="{ef1ab7a2-aa35-40d9-a9c1-feff185d19f4}" outlineWidthM="0.3,mm" titleAlignment="1" fontColor="#000000" groupUuid="" rasterBorderWidth="0" columnSpace="2" wmsLegendHeight="25" symbolWidth="7" wrapChar="" rasterBorderColor="0,0,0,255" resizeToContents="1" type="65642" frameJoinStyle="miter" opacity="1" referencePoint="0" itemRotation="0" legendFilterByAtlas="0" blendMode="0" visibility="1" background="true" uuid="{ef1ab7a2-aa35-40d9-a9c1-feff185d19f4}" symbolAlignment="1" zValue="8" size="34.45,8.3,mm" wmsLegendWidth="50" symbolHeight="4" frame="true" columnCount="1" boxSpace="2" lineSpacing="1" equalColumnWidth="0" title="" splitLayer="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="185" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties/>
-        </LayoutObject>
-        <LabelFont style="Regular" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
-      </LayoutItem>
-      <LayoutItem splitLayer="0" rasterBorderColor="0,0,0,255" position="249.711,156.015,mm" visibility="1" blendMode="0" rasterBorderWidth="0" itemRotation="0" background="true" legendFilterByAtlas="0" size="34.45,8.3,mm" map_uuid="{6abeaf6e-4f52-413a-a7ff-23ce2850a84c}" wmsLegendWidth="50" columnSpace="2" frame="true" symbolAlignment="1" outlineWidthM="0.3,mm" opacity="1" symbolWidth="7" symbolHeight="4" boxSpace="2" resizeToContents="1" rasterBorder="1" id="" wrapChar="" referencePoint="0" equalColumnWidth="0" groupUuid="" columnCount="1" positionLock="true" fontColor="#000000" type="65642" uuid="{ef1ab7a2-aa35-40d9-a9c1-feff185d19f4}" excludeFromExports="0" templateUuid="{ef1ab7a2-aa35-40d9-a9c1-feff185d19f4}" lineSpacing="1" zValue="8" titleAlignment="1" title="" wmsLegendHeight="25" positionOnPage="249.711,156.015,mm" frameJoinStyle="miter">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="185" blue="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
@@ -15356,15 +15321,15 @@ def my_form_open(dialog, layer, feature):
           <style name="symbol" marginTop="2.5" alignment="1">
             <styleFont style="" description="Myriad Pro,9,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style name="symbolLabel" marginLeft="2" marginTop="2" alignment="1">
+          <style name="symbolLabel" marginTop="2" marginLeft="2" alignment="1">
             <styleFont style="Regular" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties/>
-          <layer-tree-group name="Residents Access" checked="Qt::Checked" expanded="1">
+          <layer-tree-group expanded="1" name="Residents Access" checked="Qt::Checked">
             <customproperties/>
-            <layer-tree-layer name="residents_access_roads" checked="Qt::Checked" id="residents_access_roads_a7a1b453_729e_4ac7_bb64_95381b84aa35" expanded="1">
+            <layer-tree-layer expanded="1" id="residents_access_roads_a7a1b453_729e_4ac7_bb64_95381b84aa35" name="residents_access_roads" checked="Qt::Checked">
               <customproperties>
                 <property value="hidden" key="legend/title-style"/>
               </customproperties>
@@ -15373,73 +15338,89 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="6" marginX="1" itemRotation="0" positionOnPage="221.927,188.418,mm" background="false" id="" type="65641" excludeFromExports="0" position="221.927,188.418,mm" blendMode="0" halign="2" referencePoint="0" frame="false" uuid="{8ccb6d0c-ddd6-4cad-aadd-4083b1b576f7}" valign="32" visibility="1" templateUuid="{8ccb6d0c-ddd6-4cad-aadd-4083b1b576f7}" positionLock="true" marginY="1" groupUuid="" labelText="REVISION 1.0" frameJoinStyle="miter" size="27.7839,6.8714,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{01e42ab4-6e28-4fb2-b1a1-06b256ff505b}" htmlState="0" visibility="1" positionOnPage="8.71559,188.218,mm" valign="64" halign="1" size="110.769,6.8714,mm" positionLock="true" groupUuid="" position="8.71559,188.218,mm" templateUuid="{01e42ab4-6e28-4fb2-b1a1-06b256ff505b}" labelText="ACCESS ROADS FOR RESIDENTS" opacity="1" frame="false" zValue="8" marginY="1" frameJoinStyle="miter" background="false" type="65641" marginX="1" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties/>
+        </LayoutObject>
+        <LabelFont style="Regular" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
+      </LayoutItem>
+      <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{8ccb6d0c-ddd6-4cad-aadd-4083b1b576f7}" htmlState="0" visibility="1" positionOnPage="221.927,188.418,mm" valign="32" halign="2" size="27.7839,6.8714,mm" positionLock="true" groupUuid="" position="221.927,188.418,mm" templateUuid="{8ccb6d0c-ddd6-4cad-aadd-4083b1b576f7}" labelText="REVISION 1.0" opacity="1" frame="false" zValue="6" marginY="1" frameJoinStyle="miter" background="false" type="65641" marginX="1" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="5" marginX="1" itemRotation="0" positionOnPage="198.04,195.289,mm" background="false" id="" type="65641" excludeFromExports="0" position="198.04,195.289,mm" blendMode="0" halign="2" referencePoint="0" frame="false" uuid="{3bbaa5f9-89ac-48d3-a353-2300ae2ee77a}" valign="64" visibility="1" templateUuid="{3bbaa5f9-89ac-48d3-a353-2300ae2ee77a}" positionLock="true" marginY="1" groupUuid="" labelText="Sunday, 20 October 2019" frameJoinStyle="miter" size="51.6706,6.60801,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{3bbaa5f9-89ac-48d3-a353-2300ae2ee77a}" htmlState="0" visibility="1" positionOnPage="198.04,195.289,mm" valign="64" halign="2" size="51.6706,6.60801,mm" positionLock="true" groupUuid="" position="198.04,195.289,mm" templateUuid="{3bbaa5f9-89ac-48d3-a353-2300ae2ee77a}" labelText="Sunday, 20 October 2019" opacity="1" frame="false" zValue="5" marginY="1" frameJoinStyle="miter" background="false" type="65641" marginX="1" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem svgBorderColor="0,0,0,255" file="../Gun_Run_Logo_2018.png" svgBorderWidth="0.2" outlineWidthM="0.3,mm" anchorPoint="4" opacity="1" svgFillColor="255,255,255,255" zValue="4" itemRotation="0" northOffset="0" positionOnPage="258.483,187.425,mm" background="false" id="" type="65640" excludeFromExports="0" pictureRotation="0" position="258.483,187.425,mm" blendMode="0" resizeMode="0" referencePoint="0" frame="false" uuid="{2cfcbf86-f98d-4d23-aa32-aeea01173940}" mapUuid="" visibility="1" templateUuid="{2cfcbf86-f98d-4d23-aa32-aeea01173940}" positionLock="true" groupUuid="" frameJoinStyle="miter" pictureWidth="17.3653" northMode="0" size="29.7523,17.4718,mm" pictureHeight="17.4718">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" northMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" svgBorderColor="0,0,0,255" uuid="{2cfcbf86-f98d-4d23-aa32-aeea01173940}" svgBorderWidth="0.2" mapUuid="" resizeMode="0" visibility="1" positionOnPage="258.483,187.425,mm" pictureRotation="0" size="29.7523,17.4718,mm" positionLock="true" groupUuid="" position="258.483,187.425,mm" templateUuid="{2cfcbf86-f98d-4d23-aa32-aeea01173940}" pictureHeight="17.4718" northOffset="0" opacity="1" anchorPoint="4" frame="false" zValue="4" frameJoinStyle="miter" background="false" type="65640" file="../Gun_Run_Logo_2018.png" pictureWidth="17.3653" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" shapeType="1" zValue="3" itemRotation="0" positionOnPage="8.86559,195.239,mm" background="false" id="" type="65643" excludeFromExports="0" position="8.86559,195.239,mm" blendMode="0" referencePoint="0" frame="false" uuid="{7a78f7dc-95f1-4b1c-a72d-cb0ca03341de}" visibility="1" templateUuid="{7a78f7dc-95f1-4b1c-a72d-cb0ca03341de}" positionLock="true" groupUuid="" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" size="240.695,0.1,mm">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{7a78f7dc-95f1-4b1c-a72d-cb0ca03341de}" visibility="1" positionOnPage="8.86559,195.239,mm" size="240.695,0.1,mm" positionLock="true" groupUuid="" position="8.86559,195.239,mm" templateUuid="{7a78f7dc-95f1-4b1c-a72d-cb0ca03341de}" opacity="1" frame="false" zValue="3" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" background="false" shapeType="1" type="65643" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-          <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+        <symbol name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill">
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
             <prop v="miter" k="joinstyle"/>
@@ -15453,54 +15434,54 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem followPreset="true" outlineWidthM="0.3,mm" opacity="1" keepLayerSet="false" zValue="2" itemRotation="0" mapFlags="0" positionOnPage="8.86559,6.09761,mm" background="false" id="" type="65639" excludeFromExports="0" position="8.86559,6.09761,mm" blendMode="0" referencePoint="0" frame="true" uuid="{6abeaf6e-4f52-413a-a7ff-23ce2850a84c}" visibility="1" templateUuid="{6abeaf6e-4f52-413a-a7ff-23ce2850a84c}" positionLock="true" groupUuid="" frameJoinStyle="miter" mapRotation="0" labelMargin="0,mm" drawCanvasItems="false" size="67.7828,163.668,mm" followPresetName="Access Routes">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{6abeaf6e-4f52-413a-a7ff-23ce2850a84c}" visibility="1" mapFlags="0" mapRotation="0" followPresetName="Access Routes" labelMargin="0,mm" positionOnPage="8.86559,6.09761,mm" drawCanvasItems="false" size="67.7828,163.668,mm" positionLock="true" groupUuid="" position="8.86559,6.09761,mm" followPreset="true" templateUuid="{6abeaf6e-4f52-413a-a7ff-23ce2850a84c}" opacity="1" frame="true" zValue="2" frameJoinStyle="miter" background="false" type="65639" keepLayerSet="false" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="type" value="1" type="int"/>
-                  <Option name="val" value="" type="QString"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="type" type="int" value="1"/>
+                  <Option name="val" type="QString" value=""/>
                 </Option>
                 <Option name="dataDefinedMapXMax" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="type" value="1" type="int"/>
-                  <Option name="val" value="" type="QString"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="type" type="int" value="1"/>
+                  <Option name="val" type="QString" value=""/>
                 </Option>
                 <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="type" value="1" type="int"/>
-                  <Option name="val" value="" type="QString"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="type" type="int" value="1"/>
+                  <Option name="val" type="QString" value=""/>
                 </Option>
                 <Option name="dataDefinedMapYMax" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="type" value="1" type="int"/>
-                  <Option name="val" value="" type="QString"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="type" type="int" value="1"/>
+                  <Option name="val" type="QString" value=""/>
                 </Option>
                 <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="type" value="1" type="int"/>
-                  <Option name="val" value="" type="QString"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="type" type="int" value="1"/>
+                  <Option name="val" type="QString" value=""/>
                 </Option>
                 <Option name="dataDefinedOpacity" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="type" value="1" type="int"/>
-                  <Option name="val" value="" type="QString"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="type" type="int" value="1"/>
+                  <Option name="val" type="QString" value=""/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
@@ -15519,10 +15500,10 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid leftAnnotationPosition="1" topAnnotationDirection="0" name="Grid 1" unit="0" gridFrameMargin="0" topFrameDivisions="0" offsetY="0" leftFrameDivisions="0" position="3" annotationPrecision="3" blendMode="0" bottomAnnotationDirection="0" rightAnnotationDisplay="0" frameAnnotationDistance="1" rightAnnotationPosition="1" frameFillColor2="0,0,0,255" showAnnotation="0" gridFramePenThickness="0.5" gridFrameStyle="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" show="0" gridStyle="0" annotationFontColor="0,0,0,255" crossLength="3" offsetX="0" rightAnnotationDirection="0" intervalY="0" frameFillColor1="255,255,255,255" leftAnnotationDisplay="0" leftAnnotationDirection="0" gridFramePenColor="0,0,0,255" intervalX="0" rightFrameDivisions="0" annotationExpression="" gridFrameWidth="2" bottomAnnotationPosition="1" gridFrameSideFlags="15" annotationFormat="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" bottomFrameDivisions="0" topAnnotationPosition="1">
+        <ComposerMapGrid gridFramePenThickness="0.5" annotationFormat="0" rightAnnotationDisplay="0" gridFrameStyle="0" frameFillColor1="255,255,255,255" position="3" gridFrameMargin="0" annotationFontColor="0,0,0,255" annotationExpression="" bottomFrameDivisions="0" name="Grid 1" topFrameDivisions="0" bottomAnnotationDirection="0" gridFrameWidth="2" intervalX="0" frameFillColor2="0,0,0,255" leftAnnotationDirection="0" rightAnnotationPosition="1" annotationPrecision="3" crossLength="3" rightAnnotationDirection="0" unit="0" show="0" topAnnotationDisplay="0" leftAnnotationPosition="1" gridFramePenColor="0,0,0,255" frameAnnotationDistance="1" leftAnnotationDisplay="0" gridStyle="0" blendMode="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" intervalY="0" bottomAnnotationDisplay="0" rightFrameDivisions="0" topAnnotationDirection="0" bottomAnnotationPosition="1" offsetY="0" gridFrameSideFlags="15" topAnnotationPosition="1" leftFrameDivisions="0" offsetX="0" showAnnotation="0">
           <lineStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-              <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+            <symbol name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine">
                 <prop v="square" k="capstyle"/>
                 <prop v="5;2" k="customdash"/>
                 <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -15541,17 +15522,17 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-              <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
+            <symbol name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+              <layer locked="0" pass="0" enabled="1" class="SimpleMarker">
                 <prop v="0" k="angle"/>
                 <prop v="0,0,0,255" k="color"/>
                 <prop v="1" k="horizontal_anchor_point"/>
@@ -15572,9 +15553,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -15585,41 +15566,41 @@ def my_form_open(dialog, layer, feature):
         <AtlasMap atlasDriven="0" margin="0.05" scalingMode="2"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutItem followPreset="true" outlineWidthM="0.3,mm" opacity="1" keepLayerSet="false" zValue="1" itemRotation="0" mapFlags="0" positionOnPage="13.1173,10.4109,mm" background="true" id="" type="65639" excludeFromExports="0" position="13.1173,10.4109,mm" blendMode="0" referencePoint="0" frame="false" uuid="{e6d5cba2-adb8-4057-b9c6-f66d2bf54203}" visibility="1" templateUuid="{e6d5cba2-adb8-4057-b9c6-f66d2bf54203}" positionLock="true" groupUuid="" frameJoinStyle="miter" mapRotation="0" labelMargin="0,mm" drawCanvasItems="false" size="275.118,177.014,mm" followPresetName="Access Routes">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{e6d5cba2-adb8-4057-b9c6-f66d2bf54203}" visibility="1" mapFlags="0" mapRotation="0" followPresetName="Access Routes" labelMargin="0,mm" positionOnPage="13.1173,10.4109,mm" drawCanvasItems="false" size="275.118,177.014,mm" positionLock="true" groupUuid="" position="13.1173,10.4109,mm" followPreset="true" templateUuid="{e6d5cba2-adb8-4057-b9c6-f66d2bf54203}" opacity="1" frame="false" zValue="1" frameJoinStyle="miter" background="true" type="65639" keepLayerSet="false" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '22000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18500'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '8000'&#xa;END" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '22000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18500'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '8000'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '2044839.118'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '2045355.615'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '2048192.807'&#xa;END" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '2044839.118'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '2045355.615'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '2048192.807'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-4018735.754'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-4018312.632'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-4016466.779'&#xa;END" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-4018735.754'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-4018312.632'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-4016466.779'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <Extent xmax="2050675.64756914228200912" ymax="-4015136.43659120844677091" ymin="-4019029.07624835893511772" xmin="2044625.64756297133862972"/>
         <LayerSet/>
-        <ComposerMapGrid leftAnnotationPosition="1" topAnnotationDirection="0" name="Grid 1" unit="0" gridFrameMargin="0" topFrameDivisions="0" offsetY="0" leftFrameDivisions="0" position="3" annotationPrecision="3" blendMode="0" bottomAnnotationDirection="0" rightAnnotationDisplay="0" frameAnnotationDistance="1" rightAnnotationPosition="1" frameFillColor2="0,0,0,255" showAnnotation="0" gridFramePenThickness="0.5" gridFrameStyle="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" show="0" gridStyle="0" annotationFontColor="0,0,0,255" crossLength="3" offsetX="0" rightAnnotationDirection="0" intervalY="0" frameFillColor1="255,255,255,255" leftAnnotationDisplay="0" leftAnnotationDirection="0" gridFramePenColor="0,0,0,255" intervalX="0" rightFrameDivisions="0" annotationExpression="" gridFrameWidth="2" bottomAnnotationPosition="1" gridFrameSideFlags="15" annotationFormat="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" bottomFrameDivisions="0" topAnnotationPosition="1">
+        <ComposerMapGrid gridFramePenThickness="0.5" annotationFormat="0" rightAnnotationDisplay="0" gridFrameStyle="0" frameFillColor1="255,255,255,255" position="3" gridFrameMargin="0" annotationFontColor="0,0,0,255" annotationExpression="" bottomFrameDivisions="0" name="Grid 1" topFrameDivisions="0" bottomAnnotationDirection="0" gridFrameWidth="2" intervalX="0" frameFillColor2="0,0,0,255" leftAnnotationDirection="0" rightAnnotationPosition="1" annotationPrecision="3" crossLength="3" rightAnnotationDirection="0" unit="0" show="0" topAnnotationDisplay="0" leftAnnotationPosition="1" gridFramePenColor="0,0,0,255" frameAnnotationDistance="1" leftAnnotationDisplay="0" gridStyle="0" blendMode="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" intervalY="0" bottomAnnotationDisplay="0" rightFrameDivisions="0" topAnnotationDirection="0" bottomAnnotationPosition="1" offsetY="0" gridFrameSideFlags="15" topAnnotationPosition="1" leftFrameDivisions="0" offsetX="0" showAnnotation="0">
           <lineStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-              <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+            <symbol name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine">
                 <prop v="square" k="capstyle"/>
                 <prop v="5;2" k="customdash"/>
                 <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -15638,17 +15619,17 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-              <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
+            <symbol name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+              <layer locked="0" pass="0" enabled="1" class="SimpleMarker">
                 <prop v="0" k="angle"/>
                 <prop v="0,0,0,255" k="color"/>
                 <prop v="1" k="horizontal_anchor_point"/>
@@ -15669,9 +15650,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -15692,14 +15673,14 @@ def my_form_open(dialog, layer, feature):
         <property value="false" key="imageCropToContents"/>
         <property value="false" key="singleFile"/>
       </customproperties>
-      <Atlas coverageLayer="" pageNameExpression="&quot;type&quot;" enabled="0" filterFeatures="0" hideCoverage="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" sortFeatures="0"/>
+      <Atlas filterFeatures="0" enabled="0" coverageLayer="" hideCoverage="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" pageNameExpression="&quot;type&quot;" sortFeatures="0"/>
     </Layout>
-    <Layout name="Ask Me" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" units="mm" printResolution="192">
-      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
-      <Grid resolution="10" offsetY="0" resUnits="mm" offsetUnits="mm" offsetX="0"/>
+    <Layout name="Ask Me" units="mm" printResolution="192" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
+      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
+      <Grid offsetY="0" offsetX="0" resolution="10" resUnits="mm" offsetUnits="mm"/>
       <PageCollection>
-        <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-          <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+        <symbol name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill">
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
             <prop v="miter" k="joinstyle"/>
@@ -15713,72 +15694,72 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="0" itemRotation="0" positionOnPage="0,0,mm" background="true" id="" type="65638" excludeFromExports="0" position="0,0,mm" blendMode="0" referencePoint="0" frame="false" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" visibility="1" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" positionLock="false" groupUuid="" frameJoinStyle="miter" size="297,210,mm">
-          <FrameColor red="0" green="0" alpha="255" blue="0"/>
-          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+        <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" visibility="1" positionOnPage="0,0,mm" size="297,210,mm" positionLock="false" groupUuid="" position="0,0,mm" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" opacity="1" frame="false" zValue="0" frameJoinStyle="miter" background="true" type="65638" referencePoint="0" itemRotation="0">
+          <FrameColor green="0" blue="0" alpha="255" red="0"/>
+          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
           </LayoutObject>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide page="0" orientation="2" units="mm" position="0"/>
+          <Guide position="0" page="0" units="mm" orientation="2"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="8" marginX="1" itemRotation="0" positionOnPage="7.9389,188.218,mm" background="false" id="" type="65641" excludeFromExports="0" position="7.9389,188.218,mm" blendMode="0" halign="1" referencePoint="0" frame="false" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" valign="64" visibility="1" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" positionLock="true" marginY="1" groupUuid="" labelText="Directions to Start of Race" frameJoinStyle="miter" size="83.9998,7.071,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" htmlState="0" visibility="1" positionOnPage="7.9389,188.218,mm" valign="64" halign="1" size="83.9998,7.071,mm" positionLock="true" groupUuid="" position="7.9389,188.218,mm" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" labelText="Directions to Start of Race" opacity="1" frame="false" zValue="8" marginY="1" frameJoinStyle="miter" background="false" type="65641" marginX="1" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="" description="Myriad Pro,12,-1,5,50,0,0,0,0,0"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="7" marginX="1" itemRotation="0" positionOnPage="7.93888,195.489,mm" background="false" id="" type="65641" excludeFromExports="0" position="7.93888,195.489,mm" blendMode="0" halign="1" referencePoint="0" frame="false" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" valign="32" visibility="1" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" positionLock="true" marginY="1" groupUuid="" labelText="Gun Run" frameJoinStyle="miter" size="48.2923,6.60801,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" htmlState="0" visibility="1" positionOnPage="7.93888,195.489,mm" valign="32" halign="1" size="48.2923,6.60801,mm" positionLock="true" groupUuid="" position="7.93888,195.489,mm" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" labelText="Gun Run" opacity="1" frame="false" zValue="7" marginY="1" frameJoinStyle="miter" background="false" type="65641" marginX="1" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="" description="Myriad Pro,12,-1,5,50,0,0,0,0,0"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem splitLayer="0" rasterBorderColor="0,0,0,255" position="10.096,10.8563,mm" visibility="1" blendMode="0" rasterBorderWidth="0" itemRotation="0" background="true" legendFilterByAtlas="0" size="53.2969,71,mm" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" wmsLegendWidth="50" columnSpace="2" frame="true" symbolAlignment="1" outlineWidthM="0.3,mm" opacity="1" symbolWidth="7" symbolHeight="4" boxSpace="2" resizeToContents="1" rasterBorder="1" id="" wrapChar="" referencePoint="0" equalColumnWidth="0" groupUuid="" columnCount="1" positionLock="true" fontColor="#000000" type="65642" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" excludeFromExports="0" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" lineSpacing="1" zValue="6" titleAlignment="1" title="" wmsLegendHeight="25" positionOnPage="10.096,10.8563,mm" frameJoinStyle="round">
-        <FrameColor red="139" green="139" alpha="255" blue="139"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem position="10.096,10.8563,mm" rasterBorder="1" excludeFromExports="0" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" id="" positionOnPage="10.096,10.8563,mm" positionLock="true" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" outlineWidthM="0.3,mm" titleAlignment="1" fontColor="#000000" groupUuid="" rasterBorderWidth="0" columnSpace="2" wmsLegendHeight="25" symbolWidth="7" wrapChar="" rasterBorderColor="0,0,0,255" resizeToContents="1" type="65642" frameJoinStyle="round" opacity="1" referencePoint="0" itemRotation="0" legendFilterByAtlas="0" blendMode="0" visibility="1" background="true" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" symbolAlignment="1" zValue="6" size="53.2969,71,mm" wmsLegendWidth="50" symbolHeight="4" frame="true" columnCount="1" boxSpace="2" lineSpacing="1" equalColumnWidth="0" title="" splitLayer="0">
+        <FrameColor green="139" blue="139" alpha="255" red="139"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
@@ -15796,17 +15777,17 @@ def my_form_open(dialog, layer, feature):
           <style name="symbol" marginTop="2.5" alignment="1">
             <styleFont style="" description="Myriad Pro,12,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style name="symbolLabel" marginLeft="2" marginTop="2" alignment="1">
+          <style name="symbolLabel" marginTop="2" marginLeft="2" alignment="1">
             <styleFont style="" description="Myriad Pro,12,-1,5,50,0,0,0,0,0"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties/>
-          <layer-tree-group name="Ask Me" checked="Qt::Checked" expanded="1">
+          <layer-tree-group expanded="1" name="Ask Me" checked="Qt::Checked">
             <customproperties>
               <property value="hidden" key="legend/title-style"/>
             </customproperties>
-            <layer-tree-layer name="poi_labels" checked="Qt::Checked" id="poi_labels_59d3855d_466f_419c_8119_94b9ad7c140d" expanded="1">
+            <layer-tree-layer expanded="1" id="poi_labels_59d3855d_466f_419c_8119_94b9ad7c140d" name="poi_labels" checked="Qt::Checked">
               <customproperties>
                 <property value="Start/Finish" key="legend/label-0"/>
                 <property value="Toilets" key="legend/label-1"/>
@@ -15817,7 +15798,7 @@ def my_form_open(dialog, layer, feature):
                 <property value="hidden" key="legend/title-style"/>
               </customproperties>
             </layer-tree-layer>
-            <layer-tree-layer name="directions_to_start" checked="Qt::Checked" id="directions_to_start_cf338b4b_1403_45e8_b11f_47b48dd39657" expanded="1">
+            <layer-tree-layer expanded="1" id="directions_to_start_cf338b4b_1403_45e8_b11f_47b48dd39657" name="directions_to_start" checked="Qt::Checked">
               <customproperties>
                 <property value="To 21KM start (6:30AM)" key="legend/label-0"/>
                 <property value="To 10KM start (7:15AM)" key="legend/label-1"/>
@@ -15829,73 +15810,73 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="5" marginX="1" itemRotation="0" positionOnPage="228.202,188.218,mm" background="false" id="" type="65641" excludeFromExports="0" position="228.202,188.218,mm" blendMode="0" halign="2" referencePoint="0" frame="false" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" valign="32" visibility="1" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" positionLock="true" marginY="1" groupUuid="" labelText="REVISION 1.1" frameJoinStyle="miter" size="27.7839,6.8714,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" htmlState="0" visibility="1" positionOnPage="228.202,188.218,mm" valign="32" halign="2" size="27.7839,6.8714,mm" positionLock="true" groupUuid="" position="228.202,188.218,mm" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" labelText="REVISION 1.1" opacity="1" frame="false" zValue="5" marginY="1" frameJoinStyle="miter" background="false" type="65641" marginX="1" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="4" marginX="1" itemRotation="0" positionOnPage="204.316,195.489,mm" background="false" id="" type="65641" excludeFromExports="0" position="204.316,195.489,mm" blendMode="0" halign="2" referencePoint="0" frame="false" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" valign="64" visibility="1" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" positionLock="true" marginY="1" groupUuid="" labelText="Sunday, 20 October 2019" frameJoinStyle="miter" size="51.6706,6.60801,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" htmlState="0" visibility="1" positionOnPage="204.316,195.489,mm" valign="64" halign="2" size="51.6706,6.60801,mm" positionLock="true" groupUuid="" position="204.316,195.489,mm" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" labelText="Sunday, 20 October 2019" opacity="1" frame="false" zValue="4" marginY="1" frameJoinStyle="miter" background="false" type="65641" marginX="1" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem svgBorderColor="0,0,0,255" file="../Gun_Run_Logo_2018.png" svgBorderWidth="0.2" outlineWidthM="0.3,mm" anchorPoint="4" opacity="1" svgFillColor="255,255,255,255" zValue="3" itemRotation="0" northOffset="0" positionOnPage="258.483,187.425,mm" background="false" id="" type="65640" excludeFromExports="0" pictureRotation="0" position="258.483,187.425,mm" blendMode="0" resizeMode="0" referencePoint="0" frame="false" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" visibility="1" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" positionLock="true" groupUuid="" frameJoinStyle="miter" pictureWidth="17.3653" northMode="0" size="29.7523,17.4718,mm" pictureHeight="17.4718">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" northMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" svgBorderColor="0,0,0,255" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" svgBorderWidth="0.2" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" resizeMode="0" visibility="1" positionOnPage="258.483,187.425,mm" pictureRotation="0" size="29.7523,17.4718,mm" positionLock="true" groupUuid="" position="258.483,187.425,mm" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" pictureHeight="17.4718" northOffset="0" opacity="1" anchorPoint="4" frame="false" zValue="3" frameJoinStyle="miter" background="false" type="65640" file="../Gun_Run_Logo_2018.png" pictureWidth="17.3653" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" shapeType="1" zValue="2" itemRotation="0" positionOnPage="8.08888,195.239,mm" background="false" id="" type="65643" excludeFromExports="0" position="8.08888,195.239,mm" blendMode="0" referencePoint="0" frame="false" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" visibility="1" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" positionLock="true" groupUuid="" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" size="247.747,0.1,mm">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" visibility="1" positionOnPage="8.08888,195.239,mm" size="247.747,0.1,mm" positionLock="true" groupUuid="" position="8.08888,195.239,mm" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" opacity="1" frame="false" zValue="2" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" background="false" shapeType="1" type="65643" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-          <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+        <symbol name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill">
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
             <prop v="miter" k="joinstyle"/>
@@ -15909,49 +15890,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem followPreset="true" outlineWidthM="0.3,mm" opacity="1" keepLayerSet="false" zValue="1" itemRotation="0" mapFlags="0" positionOnPage="7.93888,6.411,mm" background="true" id="" type="65639" excludeFromExports="0" position="7.93888,6.411,mm" blendMode="0" referencePoint="0" frame="false" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" visibility="1" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" positionLock="true" groupUuid="" frameJoinStyle="miter" mapRotation="0" labelMargin="0,mm" drawCanvasItems="false" size="280.297,177.014,mm" followPresetName="Ask Me">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" visibility="1" mapFlags="0" mapRotation="0" followPresetName="Ask Me" labelMargin="0,mm" positionOnPage="7.93888,6.411,mm" drawCanvasItems="false" size="280.297,177.014,mm" positionLock="true" groupUuid="" position="7.93888,6.411,mm" followPreset="true" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" opacity="1" frame="false" zValue="1" frameJoinStyle="miter" background="true" type="65639" keepLayerSet="false" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="type" value="1" type="int"/>
-                  <Option name="val" value="" type="QString"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="type" type="int" value="1"/>
+                  <Option name="val" type="QString" value=""/>
                 </Option>
                 <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="type" value="1" type="int"/>
-                  <Option name="val" value="" type="QString"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="type" type="int" value="1"/>
+                  <Option name="val" type="QString" value=""/>
                 </Option>
                 <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="type" value="1" type="int"/>
-                  <Option name="val" value="" type="QString"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="type" type="int" value="1"/>
+                  <Option name="val" type="QString" value=""/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <Extent xmax="2050144.97328941966407001" ymax="-4015152.22678980929777026" ymin="-4016655.25382941775023937" xmin="2047764.97328699217177927"/>
         <LayerSet/>
-        <ComposerMapGrid leftAnnotationPosition="1" topAnnotationDirection="0" name="Grid 1" unit="0" gridFrameMargin="0" topFrameDivisions="0" offsetY="0" leftFrameDivisions="0" position="3" annotationPrecision="3" blendMode="0" bottomAnnotationDirection="0" rightAnnotationDisplay="0" frameAnnotationDistance="1" rightAnnotationPosition="1" frameFillColor2="0,0,0,255" showAnnotation="0" gridFramePenThickness="0.5" gridFrameStyle="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" show="0" gridStyle="0" annotationFontColor="0,0,0,255" crossLength="3" offsetX="0" rightAnnotationDirection="0" intervalY="0" frameFillColor1="255,255,255,255" leftAnnotationDisplay="0" leftAnnotationDirection="0" gridFramePenColor="0,0,0,255" intervalX="0" rightFrameDivisions="0" annotationExpression="" gridFrameWidth="2" bottomAnnotationPosition="1" gridFrameSideFlags="15" annotationFormat="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" bottomFrameDivisions="0" topAnnotationPosition="1">
+        <ComposerMapGrid gridFramePenThickness="0.5" annotationFormat="0" rightAnnotationDisplay="0" gridFrameStyle="0" frameFillColor1="255,255,255,255" position="3" gridFrameMargin="0" annotationFontColor="0,0,0,255" annotationExpression="" bottomFrameDivisions="0" name="Grid 1" topFrameDivisions="0" bottomAnnotationDirection="0" gridFrameWidth="2" intervalX="0" frameFillColor2="0,0,0,255" leftAnnotationDirection="0" rightAnnotationPosition="1" annotationPrecision="3" crossLength="3" rightAnnotationDirection="0" unit="0" show="0" topAnnotationDisplay="0" leftAnnotationPosition="1" gridFramePenColor="0,0,0,255" frameAnnotationDistance="1" leftAnnotationDisplay="0" gridStyle="0" blendMode="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" intervalY="0" bottomAnnotationDisplay="0" rightFrameDivisions="0" topAnnotationDirection="0" bottomAnnotationPosition="1" offsetY="0" gridFrameSideFlags="15" topAnnotationPosition="1" leftFrameDivisions="0" offsetX="0" showAnnotation="0">
           <lineStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-              <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+            <symbol name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine">
                 <prop v="square" k="capstyle"/>
                 <prop v="5;2" k="customdash"/>
                 <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -15970,17 +15951,17 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-              <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
+            <symbol name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+              <layer locked="0" pass="0" enabled="1" class="SimpleMarker">
                 <prop v="0" k="angle"/>
                 <prop v="0,0,0,255" k="color"/>
                 <prop v="1" k="horizontal_anchor_point"/>
@@ -16001,9 +15982,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -16024,14 +16005,14 @@ def my_form_open(dialog, layer, feature):
         <property value="false" key="imageCropToContents"/>
         <property value="true" key="singleFile"/>
       </customproperties>
-      <Atlas coverageLayer="" pageNameExpression="" enabled="0" filterFeatures="0" hideCoverage="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" sortFeatures="0"/>
+      <Atlas filterFeatures="0" enabled="0" coverageLayer="" hideCoverage="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" pageNameExpression="" sortFeatures="0"/>
     </Layout>
-    <Layout name="Start Directions A3" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" units="mm" printResolution="192">
-      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
-      <Grid resolution="10" offsetY="0" resUnits="mm" offsetUnits="mm" offsetX="0"/>
+    <Layout name="Start Directions A3" units="mm" printResolution="192" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
+      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
+      <Grid offsetY="0" offsetX="0" resolution="10" resUnits="mm" offsetUnits="mm"/>
       <PageCollection>
-        <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-          <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+        <symbol name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill">
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
             <prop v="miter" k="joinstyle"/>
@@ -16045,72 +16026,72 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="0" itemRotation="0" positionOnPage="0,0,mm" background="true" id="" type="65638" excludeFromExports="0" position="0,0,mm" blendMode="0" referencePoint="0" frame="false" uuid="{b28ffb1c-1d0f-4594-8e5b-4e48117a1c41}" visibility="1" templateUuid="{b28ffb1c-1d0f-4594-8e5b-4e48117a1c41}" positionLock="false" groupUuid="" frameJoinStyle="miter" size="420,297,mm">
-          <FrameColor red="0" green="0" alpha="255" blue="0"/>
-          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+        <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{b28ffb1c-1d0f-4594-8e5b-4e48117a1c41}" visibility="1" positionOnPage="0,0,mm" size="420,297,mm" positionLock="false" groupUuid="" position="0,0,mm" templateUuid="{b28ffb1c-1d0f-4594-8e5b-4e48117a1c41}" opacity="1" frame="false" zValue="0" frameJoinStyle="miter" background="true" type="65638" referencePoint="0" itemRotation="0">
+          <FrameColor green="0" blue="0" alpha="255" red="0"/>
+          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
           </LayoutObject>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide page="0" orientation="2" units="mm" position="0"/>
+          <Guide position="0" page="0" units="mm" orientation="2"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="8" marginX="1" itemRotation="0" positionOnPage="5.9389,269.29,mm" background="false" id="" type="65641" excludeFromExports="0" position="5.9389,269.29,mm" blendMode="0" halign="1" referencePoint="0" frame="false" uuid="{e4d6b258-f3b5-461f-8d86-a5f6db979e30}" valign="64" visibility="1" templateUuid="{e4d6b258-f3b5-461f-8d86-a5f6db979e30}" positionLock="true" marginY="1" groupUuid="" labelText="Directions to Start of Race" frameJoinStyle="miter" size="118.017,10.9992,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{e4d6b258-f3b5-461f-8d86-a5f6db979e30}" htmlState="0" visibility="1" positionOnPage="5.9389,269.29,mm" valign="64" halign="1" size="118.017,10.9992,mm" positionLock="true" groupUuid="" position="5.9389,269.29,mm" templateUuid="{e4d6b258-f3b5-461f-8d86-a5f6db979e30}" labelText="Directions to Start of Race" opacity="1" frame="false" zValue="8" marginY="1" frameJoinStyle="miter" background="false" type="65641" marginX="1" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="7" marginX="1" itemRotation="0" positionOnPage="5.93888,280.489,mm" background="false" id="" type="65641" excludeFromExports="0" position="5.93888,280.489,mm" blendMode="0" halign="1" referencePoint="0" frame="false" uuid="{6986ebd7-8029-45cc-88e5-77be3eb365d2}" valign="32" visibility="1" templateUuid="{6986ebd7-8029-45cc-88e5-77be3eb365d2}" positionLock="true" marginY="1" groupUuid="" labelText="Gun Run" frameJoinStyle="miter" size="118.017,9.4078,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{6986ebd7-8029-45cc-88e5-77be3eb365d2}" htmlState="0" visibility="1" positionOnPage="5.93888,280.489,mm" valign="32" halign="1" size="118.017,9.4078,mm" positionLock="true" groupUuid="" position="5.93888,280.489,mm" templateUuid="{6986ebd7-8029-45cc-88e5-77be3eb365d2}" labelText="Gun Run" opacity="1" frame="false" zValue="7" marginY="1" frameJoinStyle="miter" background="false" type="65641" marginX="1" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem splitLayer="0" rasterBorderColor="0,0,0,255" position="10.096,10.8563,mm" visibility="1" blendMode="0" rasterBorderWidth="0" itemRotation="0" background="true" legendFilterByAtlas="0" size="4,4,mm" map_uuid="{71033437-b2de-4b77-9244-4e66d0df0499}" wmsLegendWidth="50" columnSpace="2" frame="true" symbolAlignment="1" outlineWidthM="0.3,mm" opacity="1" symbolWidth="7" symbolHeight="4" boxSpace="2" resizeToContents="1" rasterBorder="1" id="" wrapChar="" referencePoint="0" equalColumnWidth="0" groupUuid="" columnCount="1" positionLock="true" fontColor="#000000" type="65642" uuid="{e5e363a7-db58-46d4-b7a1-7b81c03804fb}" excludeFromExports="0" templateUuid="{e5e363a7-db58-46d4-b7a1-7b81c03804fb}" lineSpacing="1" zValue="6" titleAlignment="1" title="" wmsLegendHeight="25" positionOnPage="10.096,10.8563,mm" frameJoinStyle="round">
-        <FrameColor red="139" green="139" alpha="255" blue="139"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem position="10.096,10.8563,mm" rasterBorder="1" excludeFromExports="0" map_uuid="{71033437-b2de-4b77-9244-4e66d0df0499}" id="" positionOnPage="10.096,10.8563,mm" positionLock="true" templateUuid="{e5e363a7-db58-46d4-b7a1-7b81c03804fb}" outlineWidthM="0.3,mm" titleAlignment="1" fontColor="#000000" groupUuid="" rasterBorderWidth="0" columnSpace="2" wmsLegendHeight="25" symbolWidth="7" wrapChar="" rasterBorderColor="0,0,0,255" resizeToContents="1" type="65642" frameJoinStyle="round" opacity="1" referencePoint="0" itemRotation="0" legendFilterByAtlas="0" blendMode="0" visibility="1" background="true" uuid="{e5e363a7-db58-46d4-b7a1-7b81c03804fb}" symbolAlignment="1" zValue="6" size="4,4,mm" wmsLegendWidth="50" symbolHeight="4" frame="true" columnCount="1" boxSpace="2" lineSpacing="1" equalColumnWidth="0" title="" splitLayer="0">
+        <FrameColor green="139" blue="139" alpha="255" red="139"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
@@ -16128,17 +16109,17 @@ def my_form_open(dialog, layer, feature):
           <style name="symbol" marginTop="2.5" alignment="1">
             <styleFont style="" description="Myriad Pro,12,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style name="symbolLabel" marginLeft="2" marginTop="2" alignment="1">
+          <style name="symbolLabel" marginTop="2" marginLeft="2" alignment="1">
             <styleFont style="Regular" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties/>
-          <layer-tree-group name="Ask Me" checked="Qt::Checked" expanded="1">
+          <layer-tree-group expanded="1" name="Ask Me" checked="Qt::Checked">
             <customproperties>
               <property value="hidden" key="legend/title-style"/>
             </customproperties>
-            <layer-tree-layer name="poi_labels" checked="Qt::Checked" id="poi_labels_59d3855d_466f_419c_8119_94b9ad7c140d" expanded="1">
+            <layer-tree-layer expanded="1" id="poi_labels_59d3855d_466f_419c_8119_94b9ad7c140d" name="poi_labels" checked="Qt::Checked">
               <customproperties>
                 <property value="Start/Finish" key="legend/label-0"/>
                 <property value="Toilets" key="legend/label-1"/>
@@ -16149,7 +16130,7 @@ def my_form_open(dialog, layer, feature):
                 <property value="hidden" key="legend/title-style"/>
               </customproperties>
             </layer-tree-layer>
-            <layer-tree-layer name="directions_to_start" checked="Qt::Checked" id="directions_to_start_cf338b4b_1403_45e8_b11f_47b48dd39657" expanded="1">
+            <layer-tree-layer expanded="1" id="directions_to_start_cf338b4b_1403_45e8_b11f_47b48dd39657" name="directions_to_start" checked="Qt::Checked">
               <customproperties>
                 <property value="To 21KM start (6:30AM)" key="legend/label-0"/>
                 <property value="To 10KM start (7:15AM)" key="legend/label-1"/>
@@ -16161,73 +16142,73 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="5" marginX="1" itemRotation="0" positionOnPage="256.805,269.289,mm" background="false" id="" type="65641" excludeFromExports="0" position="256.805,269.289,mm" blendMode="0" halign="2" referencePoint="0" frame="false" uuid="{7d12afc8-4e59-4401-96ae-4f5aea1830ce}" valign="64" visibility="1" templateUuid="{7d12afc8-4e59-4401-96ae-4f5aea1830ce}" positionLock="true" marginY="1" groupUuid="" labelText="REVISION 1.1" frameJoinStyle="miter" size="96.2813,10.7996,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{7d12afc8-4e59-4401-96ae-4f5aea1830ce}" htmlState="0" visibility="1" positionOnPage="256.805,269.289,mm" valign="64" halign="2" size="96.2813,10.7996,mm" positionLock="true" groupUuid="" position="256.805,269.289,mm" templateUuid="{7d12afc8-4e59-4401-96ae-4f5aea1830ce}" labelText="REVISION 1.1" opacity="1" frame="false" zValue="5" marginY="1" frameJoinStyle="miter" background="false" type="65641" marginX="1" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="4" marginX="1" itemRotation="0" positionOnPage="255.506,280.489,mm" background="false" id="" type="65641" excludeFromExports="0" position="255.506,280.489,mm" blendMode="0" halign="2" referencePoint="0" frame="false" uuid="{7ffa4201-50e6-4f13-be68-e078a01c43b3}" valign="32" visibility="1" templateUuid="{7ffa4201-50e6-4f13-be68-e078a01c43b3}" positionLock="true" marginY="1" groupUuid="" labelText="Sunday, 20 October 2019" frameJoinStyle="miter" size="97.581,9.4078,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{7ffa4201-50e6-4f13-be68-e078a01c43b3}" htmlState="0" visibility="1" positionOnPage="255.506,280.489,mm" valign="32" halign="2" size="97.581,9.4078,mm" positionLock="true" groupUuid="" position="255.506,280.489,mm" templateUuid="{7ffa4201-50e6-4f13-be68-e078a01c43b3}" labelText="Sunday, 20 October 2019" opacity="1" frame="false" zValue="4" marginY="1" frameJoinStyle="miter" background="false" type="65641" marginX="1" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem svgBorderColor="0,0,0,255" file="../Gun_Run_Logo_2018.png" svgBorderWidth="0.2" outlineWidthM="0.3,mm" anchorPoint="4" opacity="1" svgFillColor="255,255,255,255" zValue="3" itemRotation="0" northOffset="0" positionOnPage="353.087,250.116,mm" background="false" id="" type="65640" excludeFromExports="0" pictureRotation="0" position="353.087,250.116,mm" blendMode="0" resizeMode="0" referencePoint="0" frame="false" uuid="{9ef5a762-1225-474d-b116-683f60bd1766}" mapUuid="{71033437-b2de-4b77-9244-4e66d0df0499}" visibility="1" templateUuid="{9ef5a762-1225-474d-b116-683f60bd1766}" positionLock="true" groupUuid="" frameJoinStyle="miter" pictureWidth="39.538" northMode="0" size="61.2291,39.7806,mm" pictureHeight="39.7806">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" northMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" svgBorderColor="0,0,0,255" uuid="{9ef5a762-1225-474d-b116-683f60bd1766}" svgBorderWidth="0.2" mapUuid="{71033437-b2de-4b77-9244-4e66d0df0499}" resizeMode="0" visibility="1" positionOnPage="353.087,250.116,mm" pictureRotation="0" size="61.2291,39.7806,mm" positionLock="true" groupUuid="" position="353.087,250.116,mm" templateUuid="{9ef5a762-1225-474d-b116-683f60bd1766}" pictureHeight="39.7806" northOffset="0" opacity="1" anchorPoint="4" frame="false" zValue="3" frameJoinStyle="miter" background="false" type="65640" file="../Gun_Run_Logo_2018.png" pictureWidth="39.538" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" shapeType="1" zValue="2" itemRotation="0" positionOnPage="6.08888,280.239,mm" background="false" id="" type="65643" excludeFromExports="0" position="6.08888,280.239,mm" blendMode="0" referencePoint="0" frame="false" uuid="{ded294de-fab0-48aa-a4e5-192ef54c6706}" visibility="1" templateUuid="{ded294de-fab0-48aa-a4e5-192ef54c6706}" positionLock="true" groupUuid="" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" size="346.848,0.1,mm">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{ded294de-fab0-48aa-a4e5-192ef54c6706}" visibility="1" positionOnPage="6.08888,280.239,mm" size="346.848,0.1,mm" positionLock="true" groupUuid="" position="6.08888,280.239,mm" templateUuid="{ded294de-fab0-48aa-a4e5-192ef54c6706}" opacity="1" frame="false" zValue="2" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" background="false" shapeType="1" type="65643" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-          <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+        <symbol name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill">
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
             <prop v="miter" k="joinstyle"/>
@@ -16241,49 +16222,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem followPreset="true" outlineWidthM="0.3,mm" opacity="1" keepLayerSet="false" zValue="1" itemRotation="0" mapFlags="0" positionOnPage="7.93888,6.411,mm" background="true" id="" type="65639" excludeFromExports="0" position="7.93888,6.411,mm" blendMode="0" referencePoint="0" frame="false" uuid="{71033437-b2de-4b77-9244-4e66d0df0499}" visibility="1" templateUuid="{71033437-b2de-4b77-9244-4e66d0df0499}" positionLock="true" groupUuid="" frameJoinStyle="miter" mapRotation="0" labelMargin="0,mm" drawCanvasItems="false" size="405.296,262.879,mm" followPresetName="Ask Me">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{71033437-b2de-4b77-9244-4e66d0df0499}" visibility="1" mapFlags="0" mapRotation="0" followPresetName="Ask Me" labelMargin="0,mm" positionOnPage="7.93888,6.411,mm" drawCanvasItems="false" size="405.296,262.879,mm" positionLock="true" groupUuid="" position="7.93888,6.411,mm" followPreset="true" templateUuid="{71033437-b2de-4b77-9244-4e66d0df0499}" opacity="1" frame="false" zValue="1" frameJoinStyle="miter" background="true" type="65639" keepLayerSet="false" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="type" value="1" type="int"/>
-                  <Option name="val" value="" type="QString"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="type" type="int" value="1"/>
+                  <Option name="val" type="QString" value=""/>
                 </Option>
                 <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="type" value="1" type="int"/>
-                  <Option name="val" value="" type="QString"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="type" type="int" value="1"/>
+                  <Option name="val" type="QString" value=""/>
                 </Option>
                 <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="type" value="1" type="int"/>
-                  <Option name="val" value="" type="QString"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="type" type="int" value="1"/>
+                  <Option name="val" type="QString" value=""/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <Extent xmax="2050314.75178649788722396" ymax="-4015143.42099291039630771" ymin="-4016719.54043723130598664" xmin="2047884.75178401917219162"/>
         <LayerSet/>
-        <ComposerMapGrid leftAnnotationPosition="1" topAnnotationDirection="0" name="Grid 1" unit="0" gridFrameMargin="0" topFrameDivisions="0" offsetY="0" leftFrameDivisions="0" position="3" annotationPrecision="3" blendMode="0" bottomAnnotationDirection="0" rightAnnotationDisplay="0" frameAnnotationDistance="1" rightAnnotationPosition="1" frameFillColor2="0,0,0,255" showAnnotation="0" gridFramePenThickness="0.5" gridFrameStyle="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" show="0" gridStyle="0" annotationFontColor="0,0,0,255" crossLength="3" offsetX="0" rightAnnotationDirection="0" intervalY="0" frameFillColor1="255,255,255,255" leftAnnotationDisplay="0" leftAnnotationDirection="0" gridFramePenColor="0,0,0,255" intervalX="0" rightFrameDivisions="0" annotationExpression="" gridFrameWidth="2" bottomAnnotationPosition="1" gridFrameSideFlags="15" annotationFormat="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" bottomFrameDivisions="0" topAnnotationPosition="1">
+        <ComposerMapGrid gridFramePenThickness="0.5" annotationFormat="0" rightAnnotationDisplay="0" gridFrameStyle="0" frameFillColor1="255,255,255,255" position="3" gridFrameMargin="0" annotationFontColor="0,0,0,255" annotationExpression="" bottomFrameDivisions="0" name="Grid 1" topFrameDivisions="0" bottomAnnotationDirection="0" gridFrameWidth="2" intervalX="0" frameFillColor2="0,0,0,255" leftAnnotationDirection="0" rightAnnotationPosition="1" annotationPrecision="3" crossLength="3" rightAnnotationDirection="0" unit="0" show="0" topAnnotationDisplay="0" leftAnnotationPosition="1" gridFramePenColor="0,0,0,255" frameAnnotationDistance="1" leftAnnotationDisplay="0" gridStyle="0" blendMode="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" intervalY="0" bottomAnnotationDisplay="0" rightFrameDivisions="0" topAnnotationDirection="0" bottomAnnotationPosition="1" offsetY="0" gridFrameSideFlags="15" topAnnotationPosition="1" leftFrameDivisions="0" offsetX="0" showAnnotation="0">
           <lineStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-              <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+            <symbol name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine">
                 <prop v="square" k="capstyle"/>
                 <prop v="5;2" k="customdash"/>
                 <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -16302,17 +16283,17 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-              <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
+            <symbol name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+              <layer locked="0" pass="0" enabled="1" class="SimpleMarker">
                 <prop v="0" k="angle"/>
                 <prop v="0,0,0,255" k="color"/>
                 <prop v="1" k="horizontal_anchor_point"/>
@@ -16333,9 +16314,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -16358,14 +16339,14 @@ def my_form_open(dialog, layer, feature):
         <property value="false" key="rasterize"/>
         <property value="true" key="singleFile"/>
       </customproperties>
-      <Atlas coverageLayer="" pageNameExpression="" enabled="0" filterFeatures="0" hideCoverage="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" sortFeatures="0"/>
+      <Atlas filterFeatures="0" enabled="0" coverageLayer="" hideCoverage="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" pageNameExpression="" sortFeatures="0"/>
     </Layout>
-    <Layout name="All Routes" worldFileMap="" units="mm" printResolution="144">
-      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
-      <Grid resolution="10" offsetY="0" resUnits="mm" offsetUnits="mm" offsetX="0"/>
+    <Layout name="All Routes" units="mm" printResolution="144" worldFileMap="">
+      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
+      <Grid offsetY="0" offsetX="0" resolution="10" resUnits="mm" offsetUnits="mm"/>
       <PageCollection>
-        <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-          <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+        <symbol name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill">
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
             <prop v="miter" k="joinstyle"/>
@@ -16379,98 +16360,98 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="0" itemRotation="0" positionOnPage="0,0,mm" background="true" id="" type="65638" excludeFromExports="0" position="0,0,mm" blendMode="0" referencePoint="0" frame="false" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" visibility="1" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" positionLock="false" groupUuid="" frameJoinStyle="miter" size="297,210,mm">
-          <FrameColor red="0" green="0" alpha="255" blue="0"/>
-          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+        <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" visibility="1" positionOnPage="0,0,mm" size="297,210,mm" positionLock="false" groupUuid="" position="0,0,mm" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" opacity="1" frame="false" zValue="0" frameJoinStyle="miter" background="true" type="65638" referencePoint="0" itemRotation="0">
+          <FrameColor green="0" blue="0" alpha="255" red="0"/>
+          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
           </LayoutObject>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide page="0" orientation="2" units="mm" position="0"/>
+          <Guide position="0" page="0" units="mm" orientation="2"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="6" marginX="1" itemRotation="0" positionOnPage="204.225,191.81,mm" background="false" id="" type="65641" excludeFromExports="0" position="204.225,191.81,mm" blendMode="0" halign="2" referencePoint="0" frame="false" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" valign="64" visibility="1" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" positionLock="true" marginY="1" groupUuid="" labelText="REVISION 1.6" frameJoinStyle="miter" size="57.4836,6.8714,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" htmlState="0" visibility="1" positionOnPage="204.225,191.81,mm" valign="64" halign="2" size="57.4836,6.8714,mm" positionLock="true" groupUuid="" position="204.225,191.81,mm" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" labelText="REVISION 1.6" opacity="1" frame="false" zValue="6" marginY="1" frameJoinStyle="miter" background="false" type="65641" marginX="1" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" zValue="5" marginX="1" itemRotation="0" positionOnPage="210.038,199.082,mm" background="false" id="" type="65641" excludeFromExports="0" position="210.038,199.082,mm" blendMode="0" halign="2" referencePoint="0" frame="false" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" valign="64" visibility="1" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" positionLock="true" marginY="1" groupUuid="" labelText="Sunday, 20 October 2019" frameJoinStyle="miter" size="51.6706,6.60801,mm" htmlState="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" htmlState="0" visibility="1" positionOnPage="210.038,199.082,mm" valign="64" halign="2" size="51.6706,6.60801,mm" positionLock="true" groupUuid="" position="210.038,199.082,mm" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" labelText="Sunday, 20 October 2019" opacity="1" frame="false" zValue="5" marginY="1" frameJoinStyle="miter" background="false" type="65641" marginX="1" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor red="0" green="0" alpha="255" blue="0"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" svgBorderWidth="0.2" outlineWidthM="0.3,mm" anchorPoint="4" opacity="1" svgFillColor="255,255,255,255" zValue="4" itemRotation="0" northOffset="0" positionOnPage="262.196,188.218,mm" background="false" id="" type="65640" excludeFromExports="0" pictureRotation="0" position="262.196,188.218,mm" blendMode="0" resizeMode="0" referencePoint="0" frame="false" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" visibility="1" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" positionLock="true" groupUuid="" frameJoinStyle="miter" pictureWidth="29.7523" northMode="0" size="29.7523,17.4718,mm" pictureHeight="17.4074">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" northMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" svgBorderColor="0,0,0,255" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" svgBorderWidth="0.2" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" resizeMode="0" visibility="1" positionOnPage="262.196,188.218,mm" pictureRotation="0" size="29.7523,17.4718,mm" positionLock="true" groupUuid="" position="262.196,188.218,mm" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" pictureHeight="17.4074" northOffset="0" opacity="1" anchorPoint="4" frame="false" zValue="4" frameJoinStyle="miter" background="false" type="65640" file="../Gun_Run_Logo.png" pictureWidth="29.7523" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" opacity="1" shapeType="1" zValue="3" itemRotation="0" positionOnPage="9.59946,198.832,mm" background="false" id="" type="65643" excludeFromExports="0" position="9.59946,198.832,mm" blendMode="0" referencePoint="0" frame="false" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" visibility="1" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" positionLock="true" groupUuid="" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" size="251.959,0.1,mm">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" visibility="1" positionOnPage="9.59946,198.832,mm" size="251.959,0.1,mm" positionLock="true" groupUuid="" position="9.59946,198.832,mm" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" opacity="1" frame="false" zValue="3" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" background="false" shapeType="1" type="65643" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="fill">
-          <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+        <symbol name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill">
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
             <prop v="miter" k="joinstyle"/>
@@ -16484,64 +16465,64 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem followPreset="false" outlineWidthM="0.3,mm" opacity="1" keepLayerSet="false" zValue="2" itemRotation="0" mapFlags="0" positionOnPage="5.86559,4.09761,mm" background="true" id="" type="65639" excludeFromExports="0" position="5.86559,4.09761,mm" blendMode="0" referencePoint="0" frame="true" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" visibility="1" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" positionLock="true" groupUuid="" frameJoinStyle="miter" mapRotation="0" labelMargin="0,mm" drawCanvasItems="false" size="67.7828,166.874,mm" followPresetName="Routes">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" id="" outlineWidthM="0.3,mm" excludeFromExports="0" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" visibility="1" mapFlags="0" mapRotation="0" followPresetName="Routes" labelMargin="0,mm" positionOnPage="5.86559,4.09761,mm" drawCanvasItems="false" size="67.7828,166.874,mm" positionLock="true" groupUuid="" position="5.86559,4.09761,mm" followPreset="false" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" opacity="1" frame="true" zValue="2" frameJoinStyle="miter" background="true" type="65639" keepLayerSet="false" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedMapXMax" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedMapYMax" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedOpacity" type="Map">
-                  <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 name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <Extent xmax="18.38563681624126289" ymax="-33.91513741583252539" ymin="-33.94652930000000168" xmin="18.37288570000000121"/>
         <LayerSet/>
-        <ComposerMapGrid leftAnnotationPosition="1" topAnnotationDirection="0" name="Grid 1" unit="0" gridFrameMargin="0" topFrameDivisions="0" offsetY="0" leftFrameDivisions="0" position="3" annotationPrecision="3" blendMode="0" bottomAnnotationDirection="0" rightAnnotationDisplay="0" frameAnnotationDistance="1" rightAnnotationPosition="1" frameFillColor2="0,0,0,255" showAnnotation="0" gridFramePenThickness="0.5" gridFrameStyle="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" show="0" gridStyle="0" annotationFontColor="0,0,0,255" crossLength="3" offsetX="0" rightAnnotationDirection="0" intervalY="0" frameFillColor1="255,255,255,255" leftAnnotationDisplay="0" leftAnnotationDirection="0" gridFramePenColor="0,0,0,255" intervalX="0" rightFrameDivisions="0" annotationExpression="" gridFrameWidth="2" bottomAnnotationPosition="1" gridFrameSideFlags="15" annotationFormat="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" bottomFrameDivisions="0" topAnnotationPosition="1">
+        <ComposerMapGrid gridFramePenThickness="0.5" annotationFormat="0" rightAnnotationDisplay="0" gridFrameStyle="0" frameFillColor1="255,255,255,255" position="3" gridFrameMargin="0" annotationFontColor="0,0,0,255" annotationExpression="" bottomFrameDivisions="0" name="Grid 1" topFrameDivisions="0" bottomAnnotationDirection="0" gridFrameWidth="2" intervalX="0" frameFillColor2="0,0,0,255" leftAnnotationDirection="0" rightAnnotationPosition="1" annotationPrecision="3" crossLength="3" rightAnnotationDirection="0" unit="0" show="0" topAnnotationDisplay="0" leftAnnotationPosition="1" gridFramePenColor="0,0,0,255" frameAnnotationDistance="1" leftAnnotationDisplay="0" gridStyle="0" blendMode="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" intervalY="0" bottomAnnotationDisplay="0" rightFrameDivisions="0" topAnnotationDirection="0" bottomAnnotationPosition="1" offsetY="0" gridFrameSideFlags="15" topAnnotationPosition="1" leftFrameDivisions="0" offsetX="0" showAnnotation="0">
           <lineStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-              <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+            <symbol name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine">
                 <prop v="square" k="capstyle"/>
                 <prop v="5;2" k="customdash"/>
                 <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -16560,17 +16541,17 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-              <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
+            <symbol name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+              <layer locked="0" pass="0" enabled="1" class="SimpleMarker">
                 <prop v="0" k="angle"/>
                 <prop v="0,0,0,255" k="color"/>
                 <prop v="1" k="horizontal_anchor_point"/>
@@ -16591,9 +16572,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -16604,41 +16585,41 @@ def my_form_open(dialog, layer, feature):
         <AtlasMap atlasDriven="0" margin="0.05" scalingMode="2"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutItem followPreset="false" outlineWidthM="0.15,mm" opacity="1" keepLayerSet="false" zValue="1" itemRotation="0" mapFlags="0" positionOnPage="9.44946,9.08557,mm" background="true" id="" type="65639" excludeFromExports="0" position="9.44946,9.08557,mm" blendMode="0" referencePoint="0" frame="true" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" visibility="1" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" positionLock="true" groupUuid="" frameJoinStyle="round" mapRotation="0" labelMargin="0,mm" drawCanvasItems="false" size="282.012,182.649,mm" followPresetName="Routes">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem blendMode="0" id="" outlineWidthM="0.15,mm" excludeFromExports="0" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" visibility="1" mapFlags="0" mapRotation="0" followPresetName="Routes" labelMargin="0,mm" positionOnPage="9.44946,9.08557,mm" drawCanvasItems="false" size="282.012,182.649,mm" positionLock="true" groupUuid="" position="9.44946,9.08557,mm" followPreset="false" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" opacity="1" frame="true" zValue="1" frameJoinStyle="round" background="true" type="65639" keepLayerSet="false" referencePoint="0" itemRotation="0">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '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 name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.368'&#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 name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.368'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.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 name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <Extent xmax="18.42103445111282056" ymax="-33.89565141814492932" ymin="-33.92999999999999972" xmin="18.36799999999999855"/>
         <LayerSet/>
-        <ComposerMapGrid leftAnnotationPosition="1" topAnnotationDirection="0" name="Grid 1" unit="0" gridFrameMargin="0" topFrameDivisions="0" offsetY="0" leftFrameDivisions="0" position="3" annotationPrecision="3" blendMode="0" bottomAnnotationDirection="0" rightAnnotationDisplay="0" frameAnnotationDistance="1" rightAnnotationPosition="1" frameFillColor2="0,0,0,255" showAnnotation="0" gridFramePenThickness="0.5" gridFrameStyle="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" show="0" gridStyle="0" annotationFontColor="0,0,0,255" crossLength="3" offsetX="0" rightAnnotationDirection="0" intervalY="0" frameFillColor1="255,255,255,255" leftAnnotationDisplay="0" leftAnnotationDirection="0" gridFramePenColor="0,0,0,255" intervalX="0" rightFrameDivisions="0" annotationExpression="" gridFrameWidth="2" bottomAnnotationPosition="1" gridFrameSideFlags="15" annotationFormat="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" bottomFrameDivisions="0" topAnnotationPosition="1">
+        <ComposerMapGrid gridFramePenThickness="0.5" annotationFormat="0" rightAnnotationDisplay="0" gridFrameStyle="0" frameFillColor1="255,255,255,255" position="3" gridFrameMargin="0" annotationFontColor="0,0,0,255" annotationExpression="" bottomFrameDivisions="0" name="Grid 1" topFrameDivisions="0" bottomAnnotationDirection="0" gridFrameWidth="2" intervalX="0" frameFillColor2="0,0,0,255" leftAnnotationDirection="0" rightAnnotationPosition="1" annotationPrecision="3" crossLength="3" rightAnnotationDirection="0" unit="0" show="0" topAnnotationDisplay="0" leftAnnotationPosition="1" gridFramePenColor="0,0,0,255" frameAnnotationDistance="1" leftAnnotationDisplay="0" gridStyle="0" blendMode="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" intervalY="0" bottomAnnotationDisplay="0" rightFrameDivisions="0" topAnnotationDirection="0" bottomAnnotationPosition="1" offsetY="0" gridFrameSideFlags="15" topAnnotationPosition="1" leftFrameDivisions="0" offsetX="0" showAnnotation="0">
           <lineStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="line">
-              <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+            <symbol name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine">
                 <prop v="square" k="capstyle"/>
                 <prop v="5;2" k="customdash"/>
                 <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -16657,17 +16638,17 @@ def my_form_open(dialog, layer, feature):
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" alpha="1" force_rhr="0" clip_to_extent="1" type="marker">
-              <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
+            <symbol name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0">
+              <layer locked="0" pass="0" enabled="1" class="SimpleMarker">
                 <prop v="0" k="angle"/>
                 <prop v="0,0,0,255" k="color"/>
                 <prop v="1" k="horizontal_anchor_point"/>
@@ -16688,9 +16669,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -16715,7 +16696,7 @@ def my_form_open(dialog, layer, feature):
         <property value="0" key="pdfTextFormat"/>
         <property value="true" key="singleFile"/>
       </customproperties>
-      <Atlas coverageLayer="all_routes20170907054841602" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/all_routes.shp" pageNameExpression="&quot;Distance&quot;" enabled="1" sortAscending="0" coverageLayerProvider="ogr" coverageLayerName="all_routes" filterFeatures="1" hideCoverage="0" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortKey="length_m" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21)' )" sortFeatures="1"/>
+      <Atlas sortAscending="0" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/all_routes.shp" sortKey="length_m" filterFeatures="1" enabled="1" coverageLayerProvider="ogr" coverageLayer="all_routes20170907054841602" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21)' )" hideCoverage="0" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" pageNameExpression="&quot;Distance&quot;" coverageLayerName="all_routes" sortFeatures="1"/>
     </Layout>
   </Layouts>
 </qgis>
diff --git a/GIS Base Map/Routes/20191002 - Gun Run 2019 - Routes - 10KM rev 1.72.png b/GIS Base Map/Routes/20191002 - Gun Run 2019 - Routes - 10KM rev 1.72.png
new file mode 100644
index 0000000..fb58812
--- /dev/null
+++ b/GIS Base Map/Routes/20191002 - Gun Run 2019 - Routes - 10KM rev 1.72.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b8e6661dd83ebd4bdbe10349fab0bb1d6ac8b72b07781445a264d9bbd9168d76
+size 635790
diff --git a/GIS Base Map/Routes/20191002 - Gun Run 2019 - Routes - 21KM rev 1.7.png b/GIS Base Map/Routes/20191002 - Gun Run 2019 - Routes - 21KM rev 1.7.png
deleted file mode 100644
index a3550c7..0000000
--- a/GIS Base Map/Routes/20191002 - Gun Run 2019 - Routes - 21KM rev 1.7.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a085ee46ad605f6657b0866d1ff5201e5f04b0a4252d1be001704c4395bb836e
-size 1364166
diff --git a/GIS Base Map/Routes/20191002 - Gun Run 2019 - Routes - 21KM rev 1.72.png b/GIS Base Map/Routes/20191002 - Gun Run 2019 - Routes - 21KM rev 1.72.png
new file mode 100644
index 0000000..39cb431
--- /dev/null
+++ b/GIS Base Map/Routes/20191002 - Gun Run 2019 - Routes - 21KM rev 1.72.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2826c0449f6f79d152ca82ae0b052ecf96ccd7f7ceb505b039aa74ef17b2ea0f
+size 848290
diff --git a/GIS Base Map/Routes/20191002 - Gun Run 2019 - Routes - 5KM rev 1.72.png b/GIS Base Map/Routes/20191002 - Gun Run 2019 - Routes - 5KM rev 1.72.png
new file mode 100644
index 0000000..3737d33
--- /dev/null
+++ b/GIS Base Map/Routes/20191002 - Gun Run 2019 - Routes - 5KM rev 1.72.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6cfdbd64e83d94b4006fc29861d1ceb6f1d0681b59cdc4a81203135364a7f81e
+size 726621
diff --git a/GIS Base Map/Routes/20191002 - Gun Run 2019 - Routes rev 1.72.pdf b/GIS Base Map/Routes/20191002 - Gun Run 2019 - Routes rev 1.72.pdf
new file mode 100644
index 0000000..3460df8
--- /dev/null
+++ b/GIS Base Map/Routes/20191002 - Gun Run 2019 - Routes rev 1.72.pdf	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:106cf9415a6d109f7017ec7919779e65251a249681e4fadf5d02eb8179eef874
+size 2876758
diff --git a/GIS Base Map/proposed_routes.dbf b/GIS Base Map/proposed_routes.dbf
index c8f09a1..dd92bec 100644
Binary files a/GIS Base Map/proposed_routes.dbf and b/GIS Base Map/proposed_routes.dbf differ
diff --git a/GIS Base Map/proposed_routes.shp b/GIS Base Map/proposed_routes.shp
index 45e6a60..a1730fa 100644
Binary files a/GIS Base Map/proposed_routes.shp and b/GIS Base Map/proposed_routes.shp differ
diff --git a/GIS Base Map/proposed_routes.shx b/GIS Base Map/proposed_routes.shx
index 03d6c2e..46b8101 100644
Binary files a/GIS Base Map/proposed_routes.shx and b/GIS Base Map/proposed_routes.shx differ