From 741d6d27524361a229a61abb1b8dd69e6fae994b Mon Sep 17 00:00:00 2001
From: tim <tim@treehouse.org.za>
Date: Mon, 8 Oct 2018 22:56:45 +0200
Subject: [PATCH] Update Ask Me map.

---
 ...181008 - Gun Run 2018 - Ask Me rev 1.1.pdf |    3 +
 ...181008 - Gun Run 2018 - Ask Me rev 1.1.png |    3 +
 GIS base files and routes/Gun Run.qgs         | 7041 ++++++++---------
 GIS base files and routes/Gun Run.qgs~        | 7041 ++++++++---------
 ...001 - Gun Run 2018 - Residents Access.pdf} |    0
 ...001 - Gun Run 2018 - Residents Access.png} |    0
 .../directions_to_start.dbf                   |  Bin 0 -> 245 bytes
 .../directions_to_start.prj                   |    1 +
 .../directions_to_start.qpj                   |    1 +
 .../directions_to_start.shp                   |  Bin 0 -> 1776 bytes
 .../directions_to_start.shx                   |  Bin 0 -> 156 bytes
 GIS base files and routes/poi_labels.dbf      |  Bin 0 -> 3239 bytes
 GIS base files and routes/poi_labels.prj      |    1 +
 GIS base files and routes/poi_labels.qpj      |    1 +
 GIS base files and routes/poi_labels.shp      |  Bin 0 -> 576 bytes
 GIS base files and routes/poi_labels.shx      |  Bin 0 -> 236 bytes
 gym-bag.svg => images/gym-bag.svg             |    2 +-
 road_closure.svg => images/road_closure.svg   |    0
 18 files changed, 7025 insertions(+), 7069 deletions(-)
 create mode 100644 GIS base files and routes/Ask Me/20181008 - Gun Run 2018 - Ask Me rev 1.1.pdf
 create mode 100644 GIS base files and routes/Ask Me/20181008 - Gun Run 2018 - Ask Me rev 1.1.png
 rename GIS base files and routes/Residents/{Gun Run 2018 - Residents Access.pdf => 20181001 - Gun Run 2018 - Residents Access.pdf} (100%)
 rename GIS base files and routes/Residents/{Gun Run 2018 - Residents Access.png => 20181001 - Gun Run 2018 - Residents Access.png} (100%)
 create mode 100644 GIS base files and routes/directions_to_start.dbf
 create mode 100644 GIS base files and routes/directions_to_start.prj
 create mode 100644 GIS base files and routes/directions_to_start.qpj
 create mode 100644 GIS base files and routes/directions_to_start.shp
 create mode 100644 GIS base files and routes/directions_to_start.shx
 create mode 100644 GIS base files and routes/poi_labels.dbf
 create mode 100644 GIS base files and routes/poi_labels.prj
 create mode 100644 GIS base files and routes/poi_labels.qpj
 create mode 100644 GIS base files and routes/poi_labels.shp
 create mode 100644 GIS base files and routes/poi_labels.shx
 rename gym-bag.svg => images/gym-bag.svg (96%)
 rename road_closure.svg => images/road_closure.svg (100%)

diff --git a/GIS base files and routes/Ask Me/20181008 - Gun Run 2018 - Ask Me rev 1.1.pdf b/GIS base files and routes/Ask Me/20181008 - Gun Run 2018 - Ask Me rev 1.1.pdf
new file mode 100644
index 0000000..916d8ad
--- /dev/null
+++ b/GIS base files and routes/Ask Me/20181008 - Gun Run 2018 - Ask Me rev 1.1.pdf	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:db042a6432859d76e35713bdc5ded49d1b2746953c44375d6efd788fb45592ce
+size 2005152
diff --git a/GIS base files and routes/Ask Me/20181008 - Gun Run 2018 - Ask Me rev 1.1.png b/GIS base files and routes/Ask Me/20181008 - Gun Run 2018 - Ask Me rev 1.1.png
new file mode 100644
index 0000000..fa2804a
--- /dev/null
+++ b/GIS base files and routes/Ask Me/20181008 - Gun Run 2018 - Ask Me rev 1.1.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:45a2bacba7ca0af4132dc0222dab26637c2f688209a6f206dcd00b004466c9a2
+size 1011498
diff --git a/GIS base files and routes/Gun Run.qgs b/GIS base files and routes/Gun Run.qgs
index f8d242f..77ba206 100644
--- a/GIS base files and routes/Gun Run.qgs	
+++ b/GIS base files and routes/Gun Run.qgs	
@@ -1,5 +1,5 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis version="3.2.3-Bonn" projectname="Gun Run">
+<qgis projectname="Gun Run" version="3.2.3-Bonn">
   <homePath path=""/>
   <title>Gun Run</title>
   <autotransaction active="0"/>
@@ -19,126 +19,126 @@
   </projectCrs>
   <layer-tree-group>
     <customproperties/>
-    <layer-tree-group name="Marshals" expanded="1" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" name="Marshals" expanded="1">
       <customproperties/>
-      <layer-tree-layer name="marshal_positions" source="./marshal_positions.shp" providerKey="ogr" expanded="1" checked="Qt::Checked" id="marshal_positions20160930121322287">
+      <layer-tree-layer id="marshal_positions20160930121322287" checked="Qt::Checked" source="./marshal_positions.shp" providerKey="ogr" name="marshal_positions" expanded="1">
         <customproperties>
           <property key="expandedLegendNodes"/>
-          <property value="1" key="showFeatureCount"/>
+          <property key="showFeatureCount" value="1"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="extra_security" source="./extra_security.shp" providerKey="ogr" expanded="1" checked="Qt::Checked" id="extra_security20170921130834191">
+      <layer-tree-layer id="extra_security20170921130834191" checked="Qt::Checked" source="./extra_security.shp" providerKey="ogr" name="extra_security" expanded="1">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="marshals_by_position" source="file:///home/tim/Documents/GunRunMaps/GIS%20base%20files%20and%20routes/marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" providerKey="delimitedtext" expanded="1" checked="Qt::Unchecked" id="marshals_by_position20161003112326575">
+      <layer-tree-layer id="marshals_by_position20161003112326575" checked="Qt::Unchecked" source="file:///home/tim/Documents/Projects/2018/Gun%20Run/Maps/GIS%20base%20files%20and%20routes/marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" providerKey="delimitedtext" name="marshals_by_position" expanded="1">
         <customproperties/>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Fencing and Cones" expanded="1" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" name="Fencing and Cones" expanded="1">
       <customproperties/>
-      <layer-tree-layer name="fencing" source="./fencing.shp" providerKey="ogr" expanded="1" checked="Qt::Unchecked" id="fencing_504d8fa2_bdeb_4951_b151_966d5d257666">
+      <layer-tree-layer id="fencing_504d8fa2_bdeb_4951_b151_966d5d257666" checked="Qt::Unchecked" source="./fencing.shp" providerKey="ogr" name="fencing" expanded="1">
         <customproperties>
-          <property value="{6f66f64e-a034-49f3-a480-0837e467ccae}" key="expandedLegendNodes"/>
-          <property value="0" key="showFeatureCount"/>
+          <property key="expandedLegendNodes" value="{6f66f64e-a034-49f3-a480-0837e467ccae}"/>
+          <property key="showFeatureCount" value="0"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="fence_groups" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20fencing%20GROUP%20BY%20%22group%22&amp;geometry=geometry:3:0" providerKey="virtual" expanded="1" checked="Qt::Unchecked" id="fence_groups_b08dad12_5ae6_4ba8_b737_e74b37bd274c">
+      <layer-tree-layer id="fence_groups_b08dad12_5ae6_4ba8_b737_e74b37bd274c" checked="Qt::Unchecked" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20fencing%20GROUP%20BY%20%22group%22&amp;geometry=geometry:3:0" providerKey="virtual" name="fence_groups" expanded="1">
         <customproperties/>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Routes" expanded="1" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" name="Routes" expanded="1">
       <customproperties/>
-      <layer-tree-group name="Markers" expanded="1" checked="Qt::Checked">
+      <layer-tree-group checked="Qt::Checked" name="Markers" expanded="1">
         <customproperties/>
-        <layer-tree-layer name="route_markers" 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={398ffcc6-a2bd-4f79-ba19-25286f57e9d3}" providerKey="memory" expanded="1" checked="Qt::Checked" id="route_markers_a5e14af7_58c2_4a9e_8e4a_d8d9a41d2bb6">
+        <layer-tree-layer id="route_markers_a5e14af7_58c2_4a9e_8e4a_d8d9a41d2bb6" checked="Qt::Checked" 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={ccad2081-c52c-4b2f-9125-1eae975a686e}" providerKey="memory" name="route_markers" expanded="1">
           <customproperties>
-            <property value="1" key="showFeatureCount"/>
+            <property key="showFeatureCount" value="1"/>
           </customproperties>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-layer name="all_routes" source="./all_routes.shp" providerKey="ogr" expanded="1" checked="Qt::Checked" id="all_routes20170907054841602">
+      <layer-tree-layer id="all_routes20170907054841602" checked="Qt::Checked" source="./all_routes.shp" providerKey="ogr" name="all_routes" expanded="1">
         <customproperties>
-          <property value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" key="expandedLegendNodes"/>
-          <property value="1" key="overview"/>
-          <property value="0" key="showFeatureCount"/>
+          <property key="expandedLegendNodes" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
+          <property key="overview" value="1"/>
+          <property key="showFeatureCount" value="0"/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Feeding Stations" expanded="1" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" name="Feeding Stations" expanded="1">
       <customproperties/>
-      <layer-tree-layer name="water_tables" source="./water_tables.shp" providerKey="ogr" expanded="1" checked="Qt::Checked" id="water_tables20170921142016467">
+      <layer-tree-layer id="water_tables20170921142016467" checked="Qt::Checked" source="./water_tables.shp" providerKey="ogr" name="water_tables" expanded="1">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Ask Me" expanded="1" checked="Qt::Checked">
+    <layer-tree-group checked="Qt::Checked" name="Ask Me" expanded="1">
       <customproperties/>
-      <layer-tree-layer name="poi_labels" source="../../../poi_labels.shp" providerKey="ogr" expanded="1" checked="Qt::Checked" id="poi_labels_59d3855d_466f_419c_8119_94b9ad7c140d">
+      <layer-tree-layer id="poi_labels_59d3855d_466f_419c_8119_94b9ad7c140d" checked="Qt::Checked" source="./poi_labels.shp" providerKey="ogr" name="poi_labels" expanded="1">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-layer name="directions_to_start" source="../../../directions_to_start.shp" providerKey="ogr" expanded="1" checked="Qt::Checked" id="directions_to_start_cf338b4b_1403_45e8_b11f_47b48dd39657">
+      <layer-tree-layer id="directions_to_start_cf338b4b_1403_45e8_b11f_47b48dd39657" checked="Qt::Checked" source="./directions_to_start.shp" providerKey="ogr" name="directions_to_start" expanded="1">
         <customproperties>
-          <property value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" key="expandedLegendNodes"/>
+          <property key="expandedLegendNodes" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="OSM data" expanded="1" checked="Qt::Checked">
+    <layer-tree-group checked="Qt::Checked" name="OSM data" expanded="1">
       <customproperties/>
-      <layer-tree-layer name="osm_roads" source="./osm_roads.shp" providerKey="ogr" expanded="0" checked="Qt::Checked" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18">
+      <layer-tree-layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" checked="Qt::Checked" source="./osm_roads.shp" providerKey="ogr" name="osm_roads" expanded="0">
         <customproperties>
           <property key="expandedLegendNodes"/>
-          <property value="1" key="showFeatureCount"/>
+          <property key="showFeatureCount" value="1"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="osm_places" source="./osm_places.shp" providerKey="ogr" expanded="1" checked="Qt::Checked" id="osm_places20160930221519937">
+      <layer-tree-layer id="osm_places20160930221519937" checked="Qt::Checked" source="./osm_places.shp" providerKey="ogr" name="osm_places" expanded="1">
         <customproperties>
           <property key="expandedLegendNodes"/>
-          <property value="1" key="overview"/>
-          <property value="1" key="showFeatureCount"/>
+          <property key="overview" value="1"/>
+          <property key="showFeatureCount" value="1"/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Marshal pages" expanded="1" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" name="Marshal pages" expanded="1">
       <customproperties/>
-      <layer-tree-layer name="marshal overviews.shp" source="./marshal overviews.shp" providerKey="ogr" expanded="1" checked="Qt::Unchecked" id="marshal_overviews_shp20160930210331241">
+      <layer-tree-layer id="marshal_overviews_shp20160930210331241" checked="Qt::Unchecked" source="./marshal overviews.shp" providerKey="ogr" name="marshal overviews.shp" expanded="1">
         <customproperties/>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Residents Access" expanded="1" checked="Qt::Checked">
+    <layer-tree-group checked="Qt::Checked" name="Residents Access" expanded="1">
       <customproperties/>
-      <layer-tree-layer name="residents_access_roads" source="./residents_access_roads.shp" providerKey="ogr" expanded="1" checked="Qt::Unchecked" id="residents_access_roads_a7a1b453_729e_4ac7_bb64_95381b84aa35">
+      <layer-tree-layer id="residents_access_roads_a7a1b453_729e_4ac7_bb64_95381b84aa35" checked="Qt::Unchecked" source="./residents_access_roads.shp" providerKey="ogr" name="residents_access_roads" expanded="1">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="residents_access" source="./residents_access.shp" providerKey="ogr" expanded="1" checked="Qt::Unchecked" id="residents_access_12d1da3e_b4fe_4986_b6af_fb68f68c5a89">
+      <layer-tree-layer id="residents_access_12d1da3e_b4fe_4986_b6af_fb68f68c5a89" checked="Qt::Unchecked" source="./residents_access.shp" providerKey="ogr" name="residents_access" expanded="1">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Start and Finish pages" expanded="1" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" name="Start and Finish pages" expanded="1">
       <customproperties/>
     </layer-tree-group>
-    <layer-tree-group name="Elevation" expanded="0" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" name="Elevation" expanded="0">
       <customproperties/>
-      <layer-tree-layer name="capetownelevation-1m" source="./capetownelevation-1m.shp" providerKey="ogr" expanded="1" checked="Qt::Unchecked" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1">
+      <layer-tree-layer id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" checked="Qt::Unchecked" source="./capetownelevation-1m.shp" providerKey="ogr" name="capetownelevation-1m" expanded="1">
         <customproperties>
-          <property value="1" key="showFeatureCount"/>
+          <property key="showFeatureCount" value="1"/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Map" expanded="1" checked="Qt::Checked">
+    <layer-tree-group checked="Qt::Checked" name="Map" expanded="1">
       <customproperties/>
-      <layer-tree-layer name="Outlines" 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" expanded="0" checked="Qt::Checked" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d">
+      <layer-tree-layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" 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" providerKey="wms" name="Outlines" expanded="0">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="GDAL-City of Cape Town 2015 Aerial" source="./GDAL-City of Cape Town 2015 Aerial.xml" providerKey="gdal" expanded="1" checked="Qt::Unchecked" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970">
+      <layer-tree-layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" checked="Qt::Unchecked" source="./GDAL-City of Cape Town 2015 Aerial.xml" providerKey="gdal" name="GDAL-City of Cape Town 2015 Aerial" expanded="1">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
@@ -164,33 +164,33 @@
       <item>poi_labels_59d3855d_466f_419c_8119_94b9ad7c140d</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings unit="1" type="1" intersection-snapping="0" mode="3" enabled="0" tolerance="10">
+  <snapping-settings mode="3" type="1" enabled="0" tolerance="10" unit="1" intersection-snapping="0">
     <individual-layer-settings>
-      <layer-setting type="1" units="1" id="directions_to_start_cf338b4b_1403_45e8_b11f_47b48dd39657" enabled="0" tolerance="12"/>
-      <layer-setting type="1" units="1" id="residents_access_12d1da3e_b4fe_4986_b6af_fb68f68c5a89" enabled="0" tolerance="12"/>
-      <layer-setting type="1" units="1" id="poi_labels_59d3855d_466f_419c_8119_94b9ad7c140d" enabled="0" tolerance="12"/>
-      <layer-setting type="1" units="1" id="residents_access_roads_a7a1b453_729e_4ac7_bb64_95381b84aa35" enabled="0" tolerance="12"/>
-      <layer-setting type="2" units="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" enabled="1" tolerance="20"/>
-      <layer-setting type="2" units="2" id="water_tables20170921142016467" enabled="0" tolerance="0"/>
-      <layer-setting type="2" units="1" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" enabled="0" tolerance="12"/>
-      <layer-setting type="2" units="2" id="marshal_positions20160930121322287" enabled="0" tolerance="0"/>
-      <layer-setting type="2" units="2" id="all_routes20170907054841602" enabled="0" tolerance="0"/>
-      <layer-setting type="2" units="2" id="extra_security20170921130834191" enabled="0" tolerance="0"/>
-      <layer-setting type="2" units="1" id="fencing_504d8fa2_bdeb_4951_b151_966d5d257666" enabled="0" tolerance="12"/>
-      <layer-setting type="2" units="2" id="marshal_overviews_shp20160930210331241" enabled="0" tolerance="0"/>
-      <layer-setting type="2" units="2" id="osm_places20160930221519937" enabled="0" tolerance="0"/>
-      <layer-setting type="2" units="1" id="route_markers_a5e14af7_58c2_4a9e_8e4a_d8d9a41d2bb6" enabled="0" tolerance="12"/>
-      <layer-setting type="1" units="1" id="fence_groups_b08dad12_5ae6_4ba8_b737_e74b37bd274c" enabled="0" tolerance="12"/>
+      <layer-setting id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" type="2" enabled="0" tolerance="12" units="1"/>
+      <layer-setting id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" type="2" enabled="1" tolerance="20" units="1"/>
+      <layer-setting id="osm_places20160930221519937" type="2" enabled="0" tolerance="0" units="2"/>
+      <layer-setting id="fence_groups_b08dad12_5ae6_4ba8_b737_e74b37bd274c" type="1" enabled="0" tolerance="12" units="1"/>
+      <layer-setting id="residents_access_12d1da3e_b4fe_4986_b6af_fb68f68c5a89" type="1" enabled="0" tolerance="12" units="1"/>
+      <layer-setting id="residents_access_roads_a7a1b453_729e_4ac7_bb64_95381b84aa35" type="1" enabled="0" tolerance="12" units="1"/>
+      <layer-setting id="marshal_positions20160930121322287" type="2" enabled="0" tolerance="0" units="2"/>
+      <layer-setting id="poi_labels_59d3855d_466f_419c_8119_94b9ad7c140d" type="1" enabled="0" tolerance="12" units="1"/>
+      <layer-setting id="marshal_overviews_shp20160930210331241" type="2" enabled="0" tolerance="0" units="2"/>
+      <layer-setting id="fencing_504d8fa2_bdeb_4951_b151_966d5d257666" type="2" enabled="0" tolerance="12" units="1"/>
+      <layer-setting id="directions_to_start_cf338b4b_1403_45e8_b11f_47b48dd39657" type="1" enabled="0" tolerance="12" units="1"/>
+      <layer-setting id="water_tables20170921142016467" type="2" enabled="0" tolerance="0" units="2"/>
+      <layer-setting id="route_markers_a5e14af7_58c2_4a9e_8e4a_d8d9a41d2bb6" type="2" enabled="0" tolerance="12" units="1"/>
+      <layer-setting id="all_routes20170907054841602" type="2" enabled="0" tolerance="0" units="2"/>
+      <layer-setting id="extra_security20170921130834191" type="2" enabled="0" tolerance="0" units="2"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
-  <mapcanvas name="theMapCanvas" annotationsVisible="1">
+  <mapcanvas annotationsVisible="1" name="theMapCanvas">
     <units>meters</units>
     <extent>
-      <xmin>2049878.85097376676276326</xmin>
-      <ymin>-4015736.72967215161770582</ymin>
-      <xmax>2049934.92197273438796401</xmax>
-      <ymax>-4015705.33556932490319014</ymax>
+      <xmin>2049153.38593701319769025</xmin>
+      <ymin>-4016183.04424226796254516</ymin>
+      <xmax>2050349.56724830390885472</xmax>
+      <ymax>-4015513.30338196223601699</ymax>
     </extent>
     <rotation>0</rotation>
     <destinationsrs>
@@ -208,116 +208,116 @@
     <rendermaptile>0</rendermaptile>
   </mapcanvas>
   <legend updateDrawingOrder="true">
-    <legendgroup name="Marshals" open="true" checked="Qt::Unchecked">
-      <legendlayer name="marshal_positions" open="true" drawingOrder="-1" showFeatureCount="1" checked="Qt::Checked">
+    <legendgroup checked="Qt::Unchecked" open="true" name="Marshals">
+      <legendlayer showFeatureCount="1" checked="Qt::Checked" drawingOrder="-1" open="true" name="marshal_positions">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="marshal_positions20160930121322287"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="marshal_positions20160930121322287"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="extra_security" open="true" drawingOrder="-1" showFeatureCount="0" checked="Qt::Checked">
+      <legendlayer showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" open="true" name="extra_security">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="extra_security20170921130834191"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="extra_security20170921130834191"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="marshals_by_position" open="true" drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked">
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" open="true" name="marshals_by_position">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="marshals_by_position20161003112326575"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="marshals_by_position20161003112326575"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Fencing and Cones" open="true" checked="Qt::Unchecked">
-      <legendlayer name="fencing" open="true" drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked">
+    <legendgroup checked="Qt::Unchecked" open="true" name="Fencing and Cones">
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" open="true" name="fencing">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="fencing_504d8fa2_bdeb_4951_b151_966d5d257666"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="fencing_504d8fa2_bdeb_4951_b151_966d5d257666"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="fence_groups" open="true" drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked">
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" open="true" name="fence_groups">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="fence_groups_b08dad12_5ae6_4ba8_b737_e74b37bd274c"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="fence_groups_b08dad12_5ae6_4ba8_b737_e74b37bd274c"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Routes" open="true" checked="Qt::Unchecked">
-      <legendgroup name="Markers" open="true" checked="Qt::Checked">
-        <legendlayer name="route_markers" open="true" drawingOrder="-1" showFeatureCount="1" checked="Qt::Checked">
+    <legendgroup checked="Qt::Unchecked" open="true" name="Routes">
+      <legendgroup checked="Qt::Checked" open="true" name="Markers">
+        <legendlayer showFeatureCount="1" checked="Qt::Checked" drawingOrder="-1" open="true" name="route_markers">
           <filegroup hidden="false" open="true">
-            <legendlayerfile isInOverview="0" visible="0" layerid="route_markers_a5e14af7_58c2_4a9e_8e4a_d8d9a41d2bb6"/>
+            <legendlayerfile visible="0" isInOverview="0" layerid="route_markers_a5e14af7_58c2_4a9e_8e4a_d8d9a41d2bb6"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendlayer name="all_routes" open="true" drawingOrder="-1" showFeatureCount="0" checked="Qt::Checked">
+      <legendlayer showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" open="true" name="all_routes">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="1" visible="0" layerid="all_routes20170907054841602"/>
+          <legendlayerfile visible="0" isInOverview="1" layerid="all_routes20170907054841602"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Feeding Stations" open="true" checked="Qt::Unchecked">
-      <legendlayer name="water_tables" open="true" drawingOrder="-1" showFeatureCount="0" checked="Qt::Checked">
+    <legendgroup checked="Qt::Unchecked" open="true" name="Feeding Stations">
+      <legendlayer showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" open="true" name="water_tables">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="water_tables20170921142016467"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="water_tables20170921142016467"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Ask Me" open="true" checked="Qt::Checked">
-      <legendlayer name="poi_labels" open="true" drawingOrder="-1" showFeatureCount="0" checked="Qt::Checked">
+    <legendgroup checked="Qt::Checked" open="true" name="Ask Me">
+      <legendlayer showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" open="true" name="poi_labels">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="1" layerid="poi_labels_59d3855d_466f_419c_8119_94b9ad7c140d"/>
+          <legendlayerfile visible="1" isInOverview="0" layerid="poi_labels_59d3855d_466f_419c_8119_94b9ad7c140d"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="directions_to_start" open="true" drawingOrder="-1" showFeatureCount="0" checked="Qt::Checked">
+      <legendlayer showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" open="true" name="directions_to_start">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="1" layerid="directions_to_start_cf338b4b_1403_45e8_b11f_47b48dd39657"/>
+          <legendlayerfile visible="1" isInOverview="0" layerid="directions_to_start_cf338b4b_1403_45e8_b11f_47b48dd39657"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="OSM data" open="true" checked="Qt::Checked">
-      <legendlayer name="osm_roads" open="false" drawingOrder="-1" showFeatureCount="1" checked="Qt::Checked">
+    <legendgroup checked="Qt::Checked" open="true" name="OSM data">
+      <legendlayer showFeatureCount="1" checked="Qt::Checked" drawingOrder="-1" open="false" name="osm_roads">
         <filegroup hidden="false" open="false">
-          <legendlayerfile isInOverview="0" visible="1" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+          <legendlayerfile visible="1" isInOverview="0" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="osm_places" open="true" drawingOrder="-1" showFeatureCount="1" checked="Qt::Checked">
+      <legendlayer showFeatureCount="1" checked="Qt::Checked" drawingOrder="-1" open="true" name="osm_places">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="1" visible="1" layerid="osm_places20160930221519937"/>
+          <legendlayerfile visible="1" isInOverview="1" layerid="osm_places20160930221519937"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Marshal pages" open="true" checked="Qt::Unchecked">
-      <legendlayer name="marshal overviews.shp" open="true" drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked">
+    <legendgroup checked="Qt::Unchecked" open="true" name="Marshal pages">
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" open="true" name="marshal overviews.shp">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="marshal_overviews_shp20160930210331241"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="marshal_overviews_shp20160930210331241"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Residents Access" open="true" checked="Qt::Checked">
-      <legendlayer name="residents_access_roads" open="true" drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked">
+    <legendgroup checked="Qt::Checked" open="true" name="Residents Access">
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" open="true" name="residents_access_roads">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="residents_access_roads_a7a1b453_729e_4ac7_bb64_95381b84aa35"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="residents_access_roads_a7a1b453_729e_4ac7_bb64_95381b84aa35"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="residents_access" open="true" drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked">
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" open="true" name="residents_access">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="residents_access_12d1da3e_b4fe_4986_b6af_fb68f68c5a89"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="residents_access_12d1da3e_b4fe_4986_b6af_fb68f68c5a89"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Start and Finish pages" open="true" checked="Qt::Unchecked"/>
-    <legendgroup name="Elevation" open="false" checked="Qt::Unchecked">
-      <legendlayer name="capetownelevation-1m" open="true" drawingOrder="-1" showFeatureCount="1" checked="Qt::Unchecked">
+    <legendgroup checked="Qt::Unchecked" open="true" name="Start and Finish pages"/>
+    <legendgroup checked="Qt::Unchecked" open="false" name="Elevation">
+      <legendlayer showFeatureCount="1" checked="Qt::Unchecked" drawingOrder="-1" open="true" name="capetownelevation-1m">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Map" open="true" checked="Qt::Checked">
-      <legendlayer name="Outlines" open="false" drawingOrder="-1" showFeatureCount="0" checked="Qt::Checked">
+    <legendgroup checked="Qt::Checked" open="true" name="Map">
+      <legendlayer showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" open="false" name="Outlines">
         <filegroup hidden="false" open="false">
-          <legendlayerfile isInOverview="0" visible="1" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+          <legendlayerfile visible="1" isInOverview="0" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="GDAL-City of Cape Town 2015 Aerial" open="true" drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked">
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" open="true" name="GDAL-City of Cape Town 2015 Aerial">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
@@ -325,7 +325,7 @@
   <mapViewDocks/>
   <mapViewDocks3D/>
   <projectlayers>
-    <maplayer maxScale="100000" refreshOnNotifyMessage="" type="raster" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" autoRefreshTime="0" minScale="1e+8">
+    <maplayer autoRefreshEnabled="0" refreshOnNotifyMessage="" type="raster" autoRefreshTime="0" minScale="1e+8" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" maxScale="100000">
       <extent>
         <xmin>-20037508.33999999985098839</xmin>
         <ymin>-20037508.33999999985098839</ymin>
@@ -378,11 +378,11 @@
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxz="0" minx="0" dimensions="2" maxx="0" crs="" maxy="0" miny="0" minz="0"/>
+          <spatial maxz="0" maxx="0" minx="0" crs="" miny="0" maxy="0" dimensions="2" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -392,22 +392,22 @@
         </extent>
       </resourceMetadata>
       <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>
       <provider>gdal</provider>
       <noData>
-        <noDataList bandNo="1" useSrcNoData="0"/>
-        <noDataList bandNo="2" useSrcNoData="0"/>
-        <noDataList bandNo="3" useSrcNoData="0"/>
+        <noDataList useSrcNoData="0" bandNo="1"/>
+        <noDataList useSrcNoData="0" bandNo="2"/>
+        <noDataList useSrcNoData="0" bandNo="3"/>
       </noData>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
       </map-layer-style-manager>
       <pipe>
-        <rasterrenderer alphaBand="-1" blueBand="3" type="multibandcolor" opacity="1" redBand="1" greenBand="2">
+        <rasterrenderer type="multibandcolor" alphaBand="-1" greenBand="2" blueBand="3" opacity="0.75" redBand="1">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -418,13 +418,13 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast contrast="0" brightness="0"/>
-        <huesaturation colorizeOn="0" colorizeStrength="100" colorizeBlue="128" saturation="0" grayscaleMode="0" colorizeRed="255" colorizeGreen="128"/>
+        <brightnesscontrast brightness="0" contrast="0"/>
+        <huesaturation colorizeGreen="128" colorizeBlue="128" colorizeRed="255" colorizeOn="0" grayscaleMode="0" colorizeStrength="100" saturation="0"/>
         <rasterresampler maxOversampling="2"/>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer maxScale="0" refreshOnNotifyMessage="" type="raster" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" autoRefreshTime="0" minScale="1e+8">
+    <maplayer autoRefreshEnabled="0" refreshOnNotifyMessage="" type="raster" autoRefreshTime="0" minScale="1e+8" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" maxScale="0">
       <extent>
         <xmin>-20037508.34278924390673637</xmin>
         <ymin>-20037508.62692910060286522</ymin>
@@ -481,7 +481,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxz="0" minx="0" dimensions="2" maxx="0" crs="" maxy="0" miny="0" minz="0"/>
+          <spatial maxz="0" maxx="0" minx="0" crs="" miny="0" maxy="0" dimensions="2" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -491,20 +491,20 @@
         </extent>
       </resourceMetadata>
       <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>
       <provider>wms</provider>
       <noData>
-        <noDataList bandNo="1" useSrcNoData="0"/>
+        <noDataList useSrcNoData="0" bandNo="1"/>
       </noData>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
       </map-layer-style-manager>
       <pipe>
-        <rasterrenderer alphaBand="-1" type="singlebandcolordata" band="1" opacity="1">
+        <rasterrenderer type="singlebandcolordata" alphaBand="-1" band="1" opacity="0.75">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -515,13 +515,13 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast contrast="0" brightness="0"/>
-        <huesaturation colorizeOn="0" colorizeStrength="100" colorizeBlue="128" saturation="0" grayscaleMode="0" colorizeRed="255" colorizeGreen="128"/>
+        <brightnesscontrast brightness="0" contrast="0"/>
+        <huesaturation colorizeGreen="128" colorizeBlue="128" colorizeRed="255" colorizeOn="0" grayscaleMode="0" colorizeStrength="100" saturation="0"/>
         <rasterresampler maxOversampling="2"/>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer maxScale="100000" refreshOnNotifyMessage="" geometry="Line" simplifyLocal="1" simplifyDrawingHints="0" type="vector" simplifyMaxScale="1" simplifyAlgorithm="0" labelsEnabled="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshEnabled="0" autoRefreshTime="0" minScale="1e+8" readOnly="0">
+    <maplayer autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" simplifyLocal="1" autoRefreshTime="0" readOnly="0" geometry="Line" labelsEnabled="0" minScale="1e+8" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" maxScale="100000" simplifyMaxScale="1" simplifyAlgorithm="0" simplifyDrawingHints="0">
       <extent>
         <xmin>18.37527226735897301</xmin>
         <ymin>-33.94586066151139647</ymin>
@@ -578,7 +578,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxz="0" minx="0" dimensions="2" maxx="0" crs="" maxy="0" miny="0" minz="0"/>
+          <spatial maxz="0" maxx="0" minx="0" crs="" miny="0" maxy="0" dimensions="2" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -597,17 +597,17 @@
         <map-layer-style name="default"/>
       </map-layer-style-manager>
       <auxiliaryLayer/>
-      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 symbollevels="0" type="RuleRenderer" enableorderby="0" forceraster="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule description="Only show when active in Atlas" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone|spac|constr)' )" key="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" symbol="0" label="Active">
-            <rule description="Only show when active in Atlas" filter="&quot;Distance&quot; = '21KM'" key="{13a555f1-0140-4584-9ca0-a5c3268249fa}" symbol="1" label="21KM"/>
-            <rule description="Only show when active in Atlas" filter="&quot;Distance&quot; = '10KM'" key="{3047fdca-b9ef-4659-af1a-dbbd7cd48473}" symbol="2" label="10KM"/>
-            <rule description="Only show when active in Atlas" filter="&quot;Distance&quot; = '5KM'" key="{915c5fda-fe09-44ca-bed3-6346c6df4966}" symbol="3" label="5KM"/>
+          <rule label="Active" description="Only show when active in Atlas" symbol="0" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone|spac|constr)' )" key="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}">
+            <rule label="21KM" description="Only show when active in Atlas" symbol="1" filter="&quot;Distance&quot; = '21KM'" key="{13a555f1-0140-4584-9ca0-a5c3268249fa}"/>
+            <rule label="10KM" description="Only show when active in Atlas" symbol="2" filter="&quot;Distance&quot; = '10KM'" key="{3047fdca-b9ef-4659-af1a-dbbd7cd48473}"/>
+            <rule label="5KM" description="Only show when active in Atlas" symbol="3" filter="&quot;Distance&quot; = '5KM'" key="{915c5fda-fe09-44ca-bed3-6346c6df4966}"/>
           </rule>
         </rules>
         <symbols>
-          <symbol name="0" type="line" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="MarkerLine" pass="0" enabled="1">
+          <symbol type="line" clip_to_extent="1" name="0" alpha="1">
+            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
               <prop v="1000" k="interval"/>
               <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
               <prop v="MapUnit" k="interval_unit"/>
@@ -621,13 +621,13 @@
               <prop v="1" k="rotate"/>
               <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" type="marker" alpha="1" clip_to_extent="1">
-                <layer locked="0" class="FilledMarker" pass="0" enabled="1">
+              <symbol type="marker" clip_to_extent="1" name="@0@0" alpha="1">
+                <layer class="FilledMarker" enabled="1" pass="0" locked="0">
                   <prop v="0" k="angle"/>
                   <prop v="0,0,0,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -642,13 +642,13 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <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" type="fill" alpha="1" clip_to_extent="1">
-                    <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+                  <symbol type="fill" clip_to_extent="1" name="@@0@0@0" alpha="1">
+                    <layer class="SimpleFill" enabled="1" pass="0" 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="bevel" k="joinstyle"/>
@@ -662,9 +662,9 @@
                       <prop v="solid" k="style"/>
                       <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>
@@ -672,7 +672,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -690,15 +690,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 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" type="line" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="MarkerLine" pass="0" enabled="1">
+          <symbol type="line" clip_to_extent="1" name="1" alpha="1">
+            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
               <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"/>
@@ -712,24 +712,24 @@
               <prop v="1" k="rotate"/>
               <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="CASE &#xa;WHEN attribute( @atlas_feature , 'type' ) = 'marshal' THEN '200,0' &#xa;WHEN regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr)' ) THEN  @map_scale * '.04' &#xa;ELSE '500,0'&#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="interval">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="CASE &#xa;WHEN attribute( @atlas_feature , 'type' ) = 'marshal' THEN '200,0' &#xa;WHEN regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr)' ) THEN  @map_scale * '.04' &#xa;ELSE '500,0'&#xa;END"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="CASE &#xa;WHEN attribute( @atlas_feature , 'type' ) = 'marshal' THEN '100,0' &#xa;WHEN regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr)' ) THEN  @map_scale * '.02' &#xa;ELSE '250,0'&#xa;END" 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="CASE &#xa;WHEN attribute( @atlas_feature , 'type' ) = 'marshal' THEN '100,0' &#xa;WHEN regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr)' ) THEN  @map_scale * '.02' &#xa;ELSE '250,0'&#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>
-              <symbol name="@1@0" type="marker" alpha="1" clip_to_extent="1">
-                <layer locked="0" class="FilledMarker" pass="0" enabled="1">
+              <symbol type="marker" clip_to_extent="1" name="@1@0" alpha="1">
+                <layer class="FilledMarker" enabled="1" pass="0" locked="0">
                   <prop v="0" k="angle"/>
                   <prop v="210,32,39,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -744,13 +744,13 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <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" type="fill" alpha="1" clip_to_extent="1">
-                    <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+                  <symbol type="fill" clip_to_extent="1" name="@@1@0@0" alpha="1">
+                    <layer class="SimpleFill" enabled="1" pass="0" 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"/>
@@ -764,9 +764,9 @@
                       <prop v="solid" k="style"/>
                       <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>
@@ -774,7 +774,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -792,13 +792,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 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 locked="0" class="MarkerLine" pass="0" enabled="1">
+            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
               <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"/>
@@ -812,13 +812,13 @@
               <prop v="1" k="rotate"/>
               <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" type="marker" alpha="1" clip_to_extent="1">
-                <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
+              <symbol type="marker" clip_to_extent="1" name="@1@2" alpha="1">
+                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
                   <prop v="0" k="angle"/>
                   <prop v="210,32,39,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -839,15 +839,15 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <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 locked="0" class="MarkerLine" pass="0" enabled="1">
+            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
               <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"/>
@@ -861,13 +861,13 @@
               <prop v="1" k="rotate"/>
               <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" type="marker" alpha="1" clip_to_extent="1">
-                <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
+              <symbol type="marker" clip_to_extent="1" name="@1@3" alpha="1">
+                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
                   <prop v="0" k="angle"/>
                   <prop v="210,32,39,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -888,17 +888,17 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <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" type="line" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="MarkerLine" pass="0" enabled="1">
+          <symbol type="line" clip_to_extent="1" name="2" alpha="1">
+            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
               <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"/>
@@ -912,24 +912,24 @@
               <prop v="1" k="rotate"/>
               <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="CASE &#xa;WHEN attribute( @atlas_feature , 'type' ) = 'marshal' THEN '200,0' &#xa;WHEN regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr)' ) THEN  @map_scale * '.04' &#xa;ELSE '500,0'&#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="interval">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="CASE &#xa;WHEN attribute( @atlas_feature , 'type' ) = 'marshal' THEN '200,0' &#xa;WHEN regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr)' ) THEN  @map_scale * '.04' &#xa;ELSE '500,0'&#xa;END"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="CASE &#xa;WHEN attribute( @atlas_feature , 'type' ) = 'marshal' THEN '100,0' &#xa;WHEN regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr)' ) THEN  @map_scale * '.02' &#xa;ELSE '250,0'&#xa;END" 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="CASE &#xa;WHEN attribute( @atlas_feature , 'type' ) = 'marshal' THEN '100,0' &#xa;WHEN regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr)' ) THEN  @map_scale * '.02' &#xa;ELSE '250,0'&#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>
-              <symbol name="@2@0" type="marker" alpha="1" clip_to_extent="1">
-                <layer locked="0" class="FilledMarker" pass="0" enabled="1">
+              <symbol type="marker" clip_to_extent="1" name="@2@0" alpha="1">
+                <layer class="FilledMarker" enabled="1" pass="0" locked="0">
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -944,13 +944,13 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <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" type="fill" alpha="1" clip_to_extent="1">
-                    <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+                  <symbol type="fill" clip_to_extent="1" name="@@2@0@0" alpha="1">
+                    <layer class="SimpleFill" enabled="1" pass="0" 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"/>
@@ -964,9 +964,9 @@
                       <prop v="solid" k="style"/>
                       <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>
@@ -974,7 +974,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -992,13 +992,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 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 locked="0" class="MarkerLine" pass="0" enabled="1">
+            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
               <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"/>
@@ -1012,13 +1012,13 @@
               <prop v="1" k="rotate"/>
               <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" type="marker" alpha="1" clip_to_extent="1">
-                <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
+              <symbol type="marker" clip_to_extent="1" name="@2@2" alpha="1">
+                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -1039,15 +1039,15 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <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 locked="0" class="MarkerLine" pass="0" enabled="1">
+            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
               <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"/>
@@ -1061,13 +1061,13 @@
               <prop v="1" k="rotate"/>
               <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" type="marker" alpha="1" clip_to_extent="1">
-                <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
+              <symbol type="marker" clip_to_extent="1" name="@2@3" alpha="1">
+                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -1088,17 +1088,17 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <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" type="line" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="MarkerLine" pass="0" enabled="1">
+          <symbol type="line" clip_to_extent="1" name="3" alpha="1">
+            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
               <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"/>
@@ -1112,24 +1112,24 @@
               <prop v="1" k="rotate"/>
               <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="CASE &#xa;WHEN attribute( @atlas_feature , 'type' ) = 'marshal' THEN '200,0' &#xa;WHEN regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr)' ) THEN  @map_scale * '.04' &#xa;ELSE '500,0'&#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="interval">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="CASE &#xa;WHEN attribute( @atlas_feature , 'type' ) = 'marshal' THEN '200,0' &#xa;WHEN regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr)' ) THEN  @map_scale * '.04' &#xa;ELSE '500,0'&#xa;END"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="CASE &#xa;WHEN attribute( @atlas_feature , 'type' ) = 'marshal' THEN '100,0' &#xa;WHEN regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr)' ) THEN  @map_scale * '.02' &#xa;ELSE '250,0'&#xa;END" 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="CASE &#xa;WHEN attribute( @atlas_feature , 'type' ) = 'marshal' THEN '100,0' &#xa;WHEN regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr)' ) THEN  @map_scale * '.02' &#xa;ELSE '250,0'&#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>
-              <symbol name="@3@0" type="marker" alpha="1" clip_to_extent="1">
-                <layer locked="0" class="FilledMarker" pass="0" enabled="1">
+              <symbol type="marker" clip_to_extent="1" name="@3@0" alpha="1">
+                <layer class="FilledMarker" enabled="1" pass="0" locked="0">
                   <prop v="0" k="angle"/>
                   <prop v="145,211,55,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -1144,13 +1144,13 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <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" type="fill" alpha="1" clip_to_extent="1">
-                    <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+                  <symbol type="fill" clip_to_extent="1" name="@@3@0@0" alpha="1">
+                    <layer class="SimpleFill" enabled="1" pass="0" 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"/>
@@ -1164,9 +1164,9 @@
                       <prop v="solid" k="style"/>
                       <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>
@@ -1174,7 +1174,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" pass="0" enabled="1">
+            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
               <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"/>
@@ -1188,13 +1188,13 @@
               <prop v="1" k="rotate"/>
               <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" type="marker" alpha="1" clip_to_extent="1">
-                <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
+              <symbol type="marker" clip_to_extent="1" name="@3@1" alpha="1">
+                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
                   <prop v="0" k="angle"/>
                   <prop v="145,211,55,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -1215,15 +1215,15 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <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 locked="0" class="MarkerLine" pass="0" enabled="1">
+            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
               <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"/>
@@ -1237,13 +1237,13 @@
               <prop v="1" k="rotate"/>
               <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" type="marker" alpha="1" clip_to_extent="1">
-                <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
+              <symbol type="marker" clip_to_extent="1" name="@3@2" alpha="1">
+                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
                   <prop v="0" k="angle"/>
                   <prop v="145,211,55,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -1264,15 +1264,15 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <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 locked="0" class="SimpleLine" pass="0" enabled="1">
+            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -1290,9 +1290,9 @@
               <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 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>
@@ -1303,26 +1303,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 height="15" lineSizeType="MM" opacity="1" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" backgroundAlpha="255" maxScaleDenominator="1e+8" diagramOrientation="Up" width="15" scaleDependency="Area" minimumSize="0" backgroundColor="#ffffff" enabled="0" barWidth="5" penColor="#000000" minScaleDenominator="100000" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penAlpha="255" penWidth="0" sizeType="MM">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" rotationOffset="270" penColor="#000000" backgroundAlpha="255" opacity="1" minScaleDenominator="100000" lineSizeType="MM" diagramOrientation="Up" barWidth="5" maxScaleDenominator="1e+8" minimumSize="0" width="15" height="15" scaleBasedVisibility="0" labelPlacementMethod="XHeight" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundColor="#ffffff">
           <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" field="" label=""/>
+          <attribute label="" color="#000000" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="2" obstacle="0" zIndex="0" placement="2" showAll="1" priority="0">
+      <DiagramLayerSettings priority="0" dist="0" zIndex="0" showAll="1" linePlacementFlags="2" obstacle="0" placement="2">
         <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>
@@ -1331,8 +1331,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>
@@ -1341,8 +1341,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>
@@ -1351,8 +1351,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>
@@ -1361,8 +1361,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>
@@ -1371,8 +1371,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>
@@ -1381,8 +1381,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>
@@ -1391,8 +1391,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>
@@ -1401,8 +1401,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>
@@ -1411,8 +1411,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>
@@ -1421,79 +1421,79 @@
           <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 name="" index="0" field="Name"/>
-        <alias name="" index="1" field="descriptio"/>
-        <alias name="" index="2" field="timestamp"/>
-        <alias name="" index="3" field="begin"/>
-        <alias name="" index="4" field="end"/>
-        <alias name="" index="5" field="Distance"/>
-        <alias name="" index="6" field="RouteLen"/>
-        <alias name="" index="7" field="length_m"/>
-        <alias name="" index="8" field="length_km"/>
-        <alias name="" index="9" field="Source"/>
+        <alias field="Name" index="0" name=""/>
+        <alias field="descriptio" index="1" name=""/>
+        <alias field="timestamp" index="2" name=""/>
+        <alias field="begin" index="3" name=""/>
+        <alias field="end" index="4" name=""/>
+        <alias field="Distance" index="5" name=""/>
+        <alias field="RouteLen" index="6" name=""/>
+        <alias field="length_m" index="7" name=""/>
+        <alias field="length_km" index="8" name=""/>
+        <alias field="Source" index="9" name=""/>
       </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 field="Name" expression="" applyOnUpdate="0"/>
+        <default field="descriptio" expression="" applyOnUpdate="0"/>
+        <default field="timestamp" expression="" applyOnUpdate="0"/>
+        <default field="begin" expression="" applyOnUpdate="0"/>
+        <default field="end" expression="" applyOnUpdate="0"/>
+        <default field="Distance" expression="" applyOnUpdate="0"/>
+        <default field="RouteLen" expression="" applyOnUpdate="0"/>
+        <default field="length_m" expression="" applyOnUpdate="0"/>
+        <default field="length_km" expression="" applyOnUpdate="0"/>
+        <default field="Source" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="Name" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="descriptio" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="timestamp" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="begin" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="end" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="Distance" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="RouteLen" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="length_m" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="length_km" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="Source" notnull_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="Name" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="descriptio" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="timestamp" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="begin" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="end" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="Distance" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="RouteLen" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="length_m" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="length_km" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="Source" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="Name"/>
-        <constraint exp="" desc="" field="descriptio"/>
-        <constraint exp="" desc="" field="timestamp"/>
-        <constraint exp="" desc="" field="begin"/>
-        <constraint exp="" desc="" field="end"/>
-        <constraint exp="" desc="" field="Distance"/>
-        <constraint exp="" desc="" field="RouteLen"/>
-        <constraint exp="" desc="" field="length_m"/>
-        <constraint exp="" desc="" field="length_km"/>
-        <constraint exp="" desc="" 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>
       <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;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;Name&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <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="-1"/>
-          <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"/>
+          <column type="field" hidden="0" name="Name" width="-1"/>
+          <column type="field" hidden="0" name="descriptio" width="-1"/>
+          <column type="field" hidden="0" name="timestamp" width="-1"/>
+          <column type="field" hidden="0" name="begin" width="-1"/>
+          <column type="field" hidden="0" name="end" width="-1"/>
+          <column type="field" hidden="0" name="Distance" width="-1"/>
+          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" hidden="0" name="RouteLen" width="-1"/>
+          <column type="field" hidden="0" name="length_m" width="-1"/>
+          <column type="field" hidden="0" name="length_km" width="-1"/>
+          <column type="field" hidden="0" name="Source" width="-1"/>
         </columns>
       </attributetableconfig>
       <editform tolerant="1">.</editform>
@@ -1520,28 +1520,28 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="Distance" editable="1"/>
-        <field name="Name" editable="1"/>
-        <field name="RouteLen" editable="1"/>
-        <field name="Source" editable="1"/>
-        <field name="begin" editable="1"/>
-        <field name="descriptio" editable="1"/>
-        <field name="end" editable="1"/>
-        <field name="length_km" editable="1"/>
-        <field name="length_m" editable="1"/>
-        <field name="timestamp" editable="1"/>
+        <field editable="1" name="Distance"/>
+        <field editable="1" name="Name"/>
+        <field editable="1" name="RouteLen"/>
+        <field editable="1" name="Source"/>
+        <field editable="1" name="begin"/>
+        <field editable="1" name="descriptio"/>
+        <field editable="1" name="end"/>
+        <field editable="1" name="length_km"/>
+        <field editable="1" name="length_m"/>
+        <field editable="1" name="timestamp"/>
       </editable>
       <labelOnTop>
-        <field name="Distance" labelOnTop="0"/>
-        <field name="Name" labelOnTop="0"/>
-        <field name="RouteLen" labelOnTop="0"/>
-        <field name="Source" labelOnTop="0"/>
-        <field name="begin" labelOnTop="0"/>
-        <field name="descriptio" labelOnTop="0"/>
-        <field name="end" labelOnTop="0"/>
-        <field name="length_km" labelOnTop="0"/>
-        <field name="length_m" labelOnTop="0"/>
-        <field name="timestamp" labelOnTop="0"/>
+        <field labelOnTop="0" name="Distance"/>
+        <field labelOnTop="0" name="Name"/>
+        <field labelOnTop="0" name="RouteLen"/>
+        <field labelOnTop="0" name="Source"/>
+        <field labelOnTop="0" name="begin"/>
+        <field labelOnTop="0" name="descriptio"/>
+        <field labelOnTop="0" name="end"/>
+        <field labelOnTop="0" name="length_km"/>
+        <field labelOnTop="0" name="length_m"/>
+        <field labelOnTop="0" name="timestamp"/>
       </labelOnTop>
       <widgets/>
       <conditionalstyles>
@@ -1552,7 +1552,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" refreshOnNotifyMessage="" geometry="Line" simplifyLocal="1" simplifyDrawingHints="1" type="vector" simplifyMaxScale="1" simplifyAlgorithm="0" labelsEnabled="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshEnabled="0" autoRefreshTime="0" minScale="1e+8" readOnly="0">
+    <maplayer autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" simplifyLocal="1" autoRefreshTime="0" readOnly="0" geometry="Line" labelsEnabled="0" minScale="1e+8" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" maxScale="0" simplifyMaxScale="1" simplifyAlgorithm="0" simplifyDrawingHints="1">
       <extent>
         <xmin>17.99958333333333371</xmin>
         <ymin>-34.00041666666666629</ymin>
@@ -1611,10 +1611,10 @@ def my_form_open(dialog, layer, feature):
         <map-layer-style name="default"/>
       </map-layer-style-manager>
       <auxiliaryLayer/>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 symbollevels="0" type="singleSymbol" enableorderby="0" forceraster="0">
         <symbols>
-          <symbol name="0" type="line" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+          <symbol type="line" clip_to_extent="1" name="0" alpha="1">
+            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -1632,9 +1632,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 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>
@@ -1671,31 +1671,31 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="ID"/>
-        <alias name="" index="1" field="height"/>
-        <alias name="" index="2" field="elevation"/>
+        <alias field="ID" index="0" name=""/>
+        <alias field="height" index="1" name=""/>
+        <alias field="elevation" index="2" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="ID"/>
-        <default expression="" applyOnUpdate="0" field="height"/>
-        <default expression="" applyOnUpdate="0" field="elevation"/>
+        <default field="ID" expression="" applyOnUpdate="0"/>
+        <default field="height" expression="" applyOnUpdate="0"/>
+        <default field="elevation" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="ID" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="height" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="elevation" notnull_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="ID" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="height" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="elevation" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="ID"/>
-        <constraint exp="" desc="" field="height"/>
-        <constraint exp="" desc="" field="elevation"/>
+        <constraint desc="" field="ID" exp=""/>
+        <constraint desc="" field="height" exp=""/>
+        <constraint desc="" field="elevation" exp=""/>
       </constraintExpressions>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <editform tolerant="1"></editform>
@@ -1716,15 +1716,15 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="100000" refreshOnNotifyMessage="" geometry="Line" simplifyLocal="1" simplifyDrawingHints="0" type="vector" simplifyMaxScale="1" simplifyAlgorithm="0" labelsEnabled="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshEnabled="0" autoRefreshTime="0" minScale="1e+8" readOnly="0">
+    <maplayer autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" simplifyLocal="1" autoRefreshTime="0" readOnly="0" geometry="Line" labelsEnabled="0" minScale="1e+8" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" maxScale="100000" simplifyMaxScale="1" simplifyAlgorithm="0" simplifyDrawingHints="0">
       <extent>
         <xmin>2049179.2943323424551636</xmin>
-        <ymin>-4016190.97196918446570635</ymin>
-        <xmax>2050080.14731159014627337</xmax>
+        <ymin>-4016491.81700840592384338</ymin>
+        <xmax>2050085.35016213171184063</xmax>
         <ymax>-4015316.96170271467417479</ymax>
       </extent>
       <id>directions_to_start_cf338b4b_1403_45e8_b11f_47b48dd39657</id>
-      <datasource>../../../directions_to_start.shp</datasource>
+      <datasource>./directions_to_start.shp</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -1773,7 +1773,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxz="0" minx="0" dimensions="2" maxx="0" crs="" maxy="0" miny="0" minz="0"/>
+          <spatial maxz="0" maxx="0" minx="0" crs="" miny="0" maxy="0" dimensions="2" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -1792,96 +1792,69 @@ def my_form_open(dialog, layer, feature):
         <map-layer-style name="default"/>
       </map-layer-style-manager>
       <auxiliaryLayer/>
-      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 symbollevels="0" type="RuleRenderer" enableorderby="0" forceraster="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule description="Only show when active in Atlas" filter="&quot;distance&quot; = '21KM'" key="{85adf11b-f941-44b6-8847-c828ab845cdc}" symbol="0" label="21KM"/>
-          <rule description="Only show when active in Atlas" filter="&quot;distance&quot; = '10KM'" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" symbol="1" label="10KM"/>
-          <rule description="Only show when active in Atlas" filter="&quot;distance&quot; = '5KM'" key="{cf733f0f-ab72-441e-b213-841aa39c1671}" symbol="2" label="5KM"/>
+          <rule label="21KM" description="Only show when active in Atlas" symbol="0" filter="&quot;distance&quot; = '21KM'" key="{85adf11b-f941-44b6-8847-c828ab845cdc}"/>
+          <rule label="10KM" description="Only show when active in Atlas" symbol="1" filter="&quot;distance&quot; = '10KM'" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}"/>
+          <rule label="5KM" description="Only show when active in Atlas" symbol="2" filter="&quot;distance&quot; = '5KM'" key="{cf733f0f-ab72-441e-b213-841aa39c1671}"/>
         </rules>
         <symbols>
-          <symbol name="0" type="line" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="MarkerLine" pass="0" enabled="1">
-              <prop v="500" k="interval"/>
+          <symbol type="line" clip_to_extent="1" name="0" alpha="1">
+            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
+              <prop v="3" k="interval"/>
               <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MapUnit" k="interval_unit"/>
+              <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="MapUnit" k="offset_along_line_unit"/>
+              <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="1" k="rotate"/>
               <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>
-                    <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>
-                  </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@0@0" type="marker" alpha="1" clip_to_extent="1">
-                <layer locked="0" class="FilledMarker" pass="0" enabled="1">
+              <symbol type="marker" clip_to_extent="1" name="@0@0" alpha="1">
+                <layer class="SimpleMarker" enabled="1" pass="0" 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="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
+                  <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"/>
                   <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" type="fill" alpha="1" clip_to_extent="1">
-                    <layer locked="0" class="SimpleFill" pass="0" enabled="1">
-                      <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="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
-                          <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
-                        </Option>
-                      </data_defined_properties>
-                    </layer>
-                  </symbol>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" pass="0" enabled="1">
-              <prop v="500" k="interval"/>
+            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
+              <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="250" k="offset_along_line"/>
+              <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"/>
@@ -1890,24 +1863,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="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="CASE &#xa;WHEN attribute( @atlas_feature , 'type' ) = 'marshal' THEN '200,0' &#xa;WHEN regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr)' ) THEN  @map_scale * '.04' &#xa;ELSE '500,0'&#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="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="true" type="bool"/>
-                      <Option name="expression" value="CASE &#xa;WHEN attribute( @atlas_feature , 'type' ) = 'marshal' THEN '100,0' &#xa;WHEN regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr)' ) THEN  @map_scale * '.02' &#xa;ELSE '250,0'&#xa;END" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <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" type="marker" alpha="1" clip_to_extent="1">
-                <layer locked="0" class="FilledMarker" pass="0" enabled="1">
+              <symbol type="marker" clip_to_extent="1" name="@0@1" alpha="1">
+                <layer class="FilledMarker" enabled="1" pass="0" locked="0">
                   <prop v="0" k="angle"/>
                   <prop v="210,32,39,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -1916,19 +1889,19 @@ def my_form_open(dialog, layer, feature):
                   <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="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"/>
                   <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" type="fill" alpha="1" clip_to_extent="1">
-                    <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+                  <symbol type="fill" clip_to_extent="1" name="@@0@1@0" alpha="1">
+                    <layer class="SimpleFill" enabled="1" pass="0" 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"/>
@@ -1936,15 +1909,15 @@ def my_form_open(dialog, layer, feature):
                       <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="no" k="outline_style"/>
                       <prop v="0" k="outline_width"/>
                       <prop v="MM" k="outline_width_unit"/>
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option 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>
@@ -1952,16 +1925,16 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
+            <layer class="SimpleLine" enabled="1" pass="0" 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="bevel" k="joinstyle"/>
+              <prop v="miter" 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="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"/>
@@ -1970,83 +1943,83 @@ def my_form_open(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 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" type="line" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="MarkerLine" pass="0" enabled="1">
+          <symbol type="line" clip_to_extent="1" name="1" alpha="1">
+            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
               <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="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="MapUnit" k="offset_along_line_unit"/>
+              <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="MM" k="offset_unit"/>
               <prop v="lastvertex" k="placement"/>
               <prop v="1" k="rotate"/>
               <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" type="marker" alpha="1" clip_to_extent="1">
-                <layer locked="0" class="FilledMarker" pass="0" enabled="1">
+              <symbol type="marker" clip_to_extent="1" name="@1@0" alpha="1">
+                <layer class="FilledMarker" enabled="1" pass="0" 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="MM" k="offset_unit"/>
                   <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
+                  <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"/>
                   <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" type="fill" alpha="1" clip_to_extent="1">
-                    <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+                  <symbol type="fill" clip_to_extent="1" name="@@1@0@0" alpha="1">
+                    <layer class="SimpleFill" enabled="1" pass="0" 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="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="26,0,201,0" k="outline_color"/>
+                      <prop v="103,34,144,255" k="outline_color"/>
                       <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
+                      <prop v="0.5" k="outline_width"/>
                       <prop v="MM" k="outline_width_unit"/>
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option 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>
@@ -2054,59 +2027,59 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" pass="0" enabled="1">
-              <prop v="500" k="interval"/>
+            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
+              <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="MM" k="interval_unit"/>
               <prop v="0" k="offset"/>
-              <prop v="250" k="offset_along_line"/>
+              <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="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="MM" k="offset_unit"/>
               <prop v="interval" k="placement"/>
               <prop v="1" k="rotate"/>
               <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="CASE &#xa;WHEN attribute( @atlas_feature , 'type' ) = 'marshal' THEN '200,0' &#xa;WHEN regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr)' ) THEN  @map_scale * '.04' &#xa;ELSE '500,0'&#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="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="true" type="bool"/>
-                      <Option name="expression" value="CASE &#xa;WHEN attribute( @atlas_feature , 'type' ) = 'marshal' THEN '100,0' &#xa;WHEN regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr)' ) THEN  @map_scale * '.02' &#xa;ELSE '250,0'&#xa;END" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <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" type="marker" alpha="1" clip_to_extent="1">
-                <layer locked="0" class="FilledMarker" pass="0" enabled="1">
+              <symbol type="marker" clip_to_extent="1" name="@1@1" alpha="1">
+                <layer class="FilledMarker" enabled="1" pass="0" 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="MM" k="offset_unit"/>
                   <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
+                  <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"/>
                   <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" type="fill" alpha="1" clip_to_extent="1">
-                    <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+                  <symbol type="fill" clip_to_extent="1" name="@@1@1@0" alpha="1">
+                    <layer class="SimpleFill" enabled="1" pass="0" 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"/>
@@ -2114,15 +2087,15 @@ def my_form_open(dialog, layer, feature):
                       <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="no" k="outline_style"/>
                       <prop v="0" k="outline_width"/>
                       <prop v="MM" k="outline_width_unit"/>
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option 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>
@@ -2130,33 +2103,33 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
+            <layer class="SimpleLine" enabled="1" pass="0" 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="MM" k="customdash_unit"/>
               <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
+              <prop v="miter" 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="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="MM" k="offset_unit"/>
               <prop v="0" k="use_custom_dash"/>
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option 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" type="line" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="MarkerLine" pass="0" enabled="1">
+          <symbol type="line" clip_to_extent="1" name="2" alpha="1">
+            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
               <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"/>
@@ -2170,61 +2143,61 @@ 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="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" type="marker" alpha="1" clip_to_extent="1">
-                <layer locked="0" class="FilledMarker" pass="0" enabled="1">
+              <symbol type="marker" clip_to_extent="1" name="@2@0" alpha="1">
+                <layer class="FilledMarker" enabled="1" pass="0" locked="0">
                   <prop v="0" k="angle"/>
-                  <prop v="145,211,55,255" k="color"/>
+                  <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="2" k="size"/>
+                  <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"/>
                   <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" type="fill" alpha="1" clip_to_extent="1">
-                    <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+                  <symbol type="fill" clip_to_extent="1" name="@@2@0@0" alpha="1">
+                    <layer class="SimpleFill" enabled="1" pass="0" 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="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="26,0,201,0" k="outline_color"/>
+                      <prop v="69,100,25,255" k="outline_color"/>
                       <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
+                      <prop v="0.5" k="outline_width"/>
                       <prop v="MM" k="outline_width_unit"/>
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option 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>
@@ -2232,12 +2205,12 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" pass="0" enabled="1">
-              <prop v="500" k="interval"/>
+            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
+              <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="250" k="offset_along_line"/>
+              <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"/>
@@ -2246,61 +2219,61 @@ 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="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="CASE &#xa;WHEN attribute( @atlas_feature , 'type' ) = 'marshal' THEN '200,0' &#xa;WHEN regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr)' ) THEN  @map_scale * '.04' &#xa;ELSE '500,0'&#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="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="true" type="bool"/>
-                      <Option name="expression" value="CASE &#xa;WHEN attribute( @atlas_feature , 'type' ) = 'marshal' THEN '100,0' &#xa;WHEN regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr)' ) THEN  @map_scale * '.02' &#xa;ELSE '250,0'&#xa;END" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <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" type="marker" alpha="1" clip_to_extent="1">
-                <layer locked="0" class="FilledMarker" pass="0" enabled="1">
+              <symbol type="marker" clip_to_extent="1" name="@2@1" alpha="1">
+                <layer class="FilledMarker" enabled="1" pass="0" locked="0">
                   <prop v="0" k="angle"/>
-                  <prop v="145,211,55,255" k="color"/>
+                  <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="2" k="size"/>
+                  <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"/>
                   <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" type="fill" alpha="1" clip_to_extent="1">
-                    <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+                  <symbol type="fill" clip_to_extent="1" name="@@2@1@0" alpha="1">
+                    <layer class="SimpleFill" enabled="1" pass="0" 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="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="solid" k="outline_style"/>
+                      <prop v="no" k="outline_style"/>
                       <prop v="0" k="outline_width"/>
                       <prop v="MM" k="outline_width_unit"/>
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option 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>
@@ -2308,16 +2281,16 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
+            <layer class="SimpleLine" enabled="1" pass="0" 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="bevel" k="joinstyle"/>
-              <prop v="145,211,55,255" k="line_color"/>
+              <prop v="miter" k="joinstyle"/>
+              <prop v="69,100,25,255" k="line_color"/>
               <prop v="solid" k="line_style"/>
-              <prop v="0.5" k="line_width"/>
+              <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"/>
@@ -2326,9 +2299,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 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>
@@ -2339,26 +2312,26 @@ def my_form_open(dialog, layer, feature):
         </orderby>
       </renderer-v2>
       <customproperties>
-        <property value="id" 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 height="15" lineSizeType="MM" opacity="1" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" backgroundAlpha="255" maxScaleDenominator="1e+8" diagramOrientation="Up" width="15" scaleDependency="Area" minimumSize="0" backgroundColor="#ffffff" enabled="0" barWidth="5" penColor="#000000" minScaleDenominator="100000" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penAlpha="255" penWidth="0" sizeType="MM">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" rotationOffset="270" penColor="#000000" backgroundAlpha="255" opacity="1" minScaleDenominator="100000" lineSizeType="MM" diagramOrientation="Up" barWidth="5" maxScaleDenominator="1e+8" minimumSize="0" width="15" height="15" scaleBasedVisibility="0" labelPlacementMethod="XHeight" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundColor="#ffffff">
           <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" field="" label=""/>
+          <attribute label="" color="#000000" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="2" obstacle="0" zIndex="0" placement="2" showAll="1" priority="0">
+      <DiagramLayerSettings priority="0" dist="0" zIndex="0" showAll="1" linePlacementFlags="2" obstacle="0" placement="2">
         <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>
@@ -2374,39 +2347,39 @@ 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 name="" index="0" field="id"/>
-        <alias name="" index="1" field="Distance"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="Distance" index="1" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="Distance"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="Distance" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="id" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="Distance" notnull_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="Distance" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="Distance"/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="Distance" exp=""/>
       </constraintExpressions>
       <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;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;Distance&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <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"/>
+          <column type="field" hidden="0" name="Distance" width="-1"/>
+          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" hidden="0" name="id" width="-1"/>
         </columns>
       </attributetableconfig>
       <editform tolerant="1">.</editform>
@@ -2433,30 +2406,30 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="Distance" editable="1"/>
-        <field name="Name" editable="1"/>
-        <field name="RouteLen" editable="1"/>
-        <field name="Source" editable="1"/>
-        <field name="begin" editable="1"/>
-        <field name="descriptio" editable="1"/>
-        <field name="end" editable="1"/>
-        <field name="id" editable="1"/>
-        <field name="length_km" editable="1"/>
-        <field name="length_m" editable="1"/>
-        <field name="timestamp" editable="1"/>
+        <field editable="1" name="Distance"/>
+        <field editable="1" name="Name"/>
+        <field editable="1" name="RouteLen"/>
+        <field editable="1" name="Source"/>
+        <field editable="1" name="begin"/>
+        <field editable="1" name="descriptio"/>
+        <field editable="1" name="end"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="length_km"/>
+        <field editable="1" name="length_m"/>
+        <field editable="1" name="timestamp"/>
       </editable>
       <labelOnTop>
-        <field name="Distance" labelOnTop="0"/>
-        <field name="Name" labelOnTop="0"/>
-        <field name="RouteLen" labelOnTop="0"/>
-        <field name="Source" labelOnTop="0"/>
-        <field name="begin" labelOnTop="0"/>
-        <field name="descriptio" labelOnTop="0"/>
-        <field name="end" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="length_km" labelOnTop="0"/>
-        <field name="length_m" labelOnTop="0"/>
-        <field name="timestamp" labelOnTop="0"/>
+        <field labelOnTop="0" name="Distance"/>
+        <field labelOnTop="0" name="Name"/>
+        <field labelOnTop="0" name="RouteLen"/>
+        <field labelOnTop="0" name="Source"/>
+        <field labelOnTop="0" name="begin"/>
+        <field labelOnTop="0" name="descriptio"/>
+        <field labelOnTop="0" name="end"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="length_km"/>
+        <field labelOnTop="0" name="length_m"/>
+        <field labelOnTop="0" name="timestamp"/>
       </labelOnTop>
       <widgets/>
       <conditionalstyles>
@@ -2467,7 +2440,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="100000" refreshOnNotifyMessage="" geometry="Point" simplifyLocal="1" simplifyDrawingHints="0" type="vector" simplifyMaxScale="1" simplifyAlgorithm="0" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshEnabled="0" autoRefreshTime="0" minScale="1e+8" readOnly="0">
+    <maplayer autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" simplifyLocal="1" autoRefreshTime="0" readOnly="0" geometry="Point" labelsEnabled="1" minScale="1e+8" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" maxScale="100000" simplifyMaxScale="1" simplifyAlgorithm="0" simplifyDrawingHints="0">
       <extent>
         <xmin>18.38517016505928936</xmin>
         <ymin>-33.91987011678683217</ymin>
@@ -2526,10 +2499,10 @@ def my_form_open(dialog, layer, feature):
         <map-layer-style name="default"/>
       </map-layer-style-manager>
       <auxiliaryLayer/>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 symbollevels="0" type="singleSymbol" enableorderby="0" forceraster="0">
         <symbols>
-          <symbol name="0" type="marker" alpha="0.796078" clip_to_extent="1">
-            <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
+          <symbol type="marker" clip_to_extent="1" name="0" alpha="0.796078">
+            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
               <prop v="0" k="angle"/>
               <prop v="227,0,185,255" k="color"/>
               <prop v="1" k="horizontal_anchor_point"/>
@@ -2550,15 +2523,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="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>
@@ -2571,87 +2544,87 @@ def my_form_open(dialog, layer, feature):
         <rules key="{de1ff1b5-a53a-4841-835f-57785b684a9d}">
           <rule description="Show in marshal maps" filter="'marshal' = attribute( $atlasfeature , 'type' )" key="{9ea624c1-7179-4746-8777-84b8008475a1}">
             <settings>
-              <text-style fontWordSpacing="0" useSubstitutions="0" fontCapitals="0" isExpression="0" fontSizeUnit="Point" fontUnderline="0" previewBkgrdColor="#ffffff" fontFamily="Myriad Pro" fontSize="8" multilineHeight="1" fontItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fieldName="position" textColor="0,0,0,255" textOpacity="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0" fontStrikeout="0" fontWeight="63">
-                <text-buffer bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="0" bufferDraw="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeType="3" shapeSizeUnit="MM" shapeDraw="1" shapeJoinStyle="64" shapeOpacity="1" shapeSVGFile="" shapeOffsetUnit="MM" shapeSizeY="0.2" shapeRotation="0" shapeSizeX="0.2" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeOffsetY="0" shapeRadiiUnit="MM" shapeBorderWidth="0.4" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="8" fontCapitals="0" fontSizeUnit="Point" useSubstitutions="0" isExpression="0" fontItalic="0" fontStrikeout="0" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" fieldName="position" textOpacity="1" textColor="0,0,0,255" fontWeight="63" fontUnderline="0" multilineHeight="1" namedStyle="Semibold" fontLetterSpacing="0" fontWordSpacing="0" blendMode="0">
+                <text-buffer bufferNoFill="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <background shapeOffsetUnit="MM" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiY="0" shapeType="3" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeSizeX="0.2" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.4" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.2" shapeDraw="1" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiUnit="MM" shapeOpacity="1"/>
+                <shadow shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.7" shadowOffsetAngle="135" shadowRadius="1.5" shadowBlendMode="6" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100"/>
                 <substitutions/>
               </text-style>
-              <text-format decimals="3" addDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="0" wrapChar="" placeDirectionSymbol="0" plussign="0" formatNumbers="0"/>
-              <placement placementFlags="10" offsetType="0" centroidWhole="0" repeatDistanceUnits="MM" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" dist="0" yOffset="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="8" placement="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" xOffset="0" fitInPolygonOnly="0" centroidInside="0" maxCurvedCharAngleOut="-20" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" rotationAngle="0"/>
-              <rendering fontLimitPixelSize="0" labelPerPart="0" obstacle="1" zIndex="0" obstacleFactor="1" displayAll="1" maxNumLabels="2000" fontMaxPixelSize="10000" upsidedownLabels="0" limitNumLabels="0" scaleMin="1" minFeatureSize="0" drawLabels="1" mergeLines="0" scaleVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" decimals="3"/>
+              <placement quadOffset="4" offsetType="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="8" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceUnits="MM" offsetUnits="MapUnit" centroidWhole="0" maxCurvedCharAngleIn="20" centroidInside="0" xOffset="0" placement="1" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" yOffset="0" dist="0" distUnits="MM" repeatDistance="0"/>
+              <rendering displayAll="1" fontLimitPixelSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" labelPerPart="0" obstacle="1" scaleMin="1" limitNumLabels="0" maxNumLabels="2000" obstacleType="0" drawLabels="1" upsidedownLabels="0" fontMinPixelSize="3" minFeatureSize="0" scaleMax="10000000" scaleVisibility="0" zIndex="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="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 description="Show in marshal overview" filter="'marshal plan' = attribute( $atlasfeature , 'type' )" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}">
             <settings>
-              <text-style fontWordSpacing="0" useSubstitutions="0" fontCapitals="0" isExpression="0" fontSizeUnit="Point" fontUnderline="0" previewBkgrdColor="#ffffff" fontFamily="Myriad Pro" fontSize="4" multilineHeight="1" fontItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fieldName="position" textColor="227,0,185,255" textOpacity="0.9" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0" fontStrikeout="0" fontWeight="63">
-                <text-buffer bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="0" bufferDraw="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeType="3" shapeSizeUnit="MM" shapeDraw="1" shapeJoinStyle="64" shapeOpacity="0.5" shapeSVGFile="" shapeOffsetUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeOffsetY="0" shapeRadiiUnit="MM" shapeBorderWidth="0.1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="4" fontCapitals="0" fontSizeUnit="Point" useSubstitutions="0" isExpression="0" fontItalic="0" fontStrikeout="0" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" fieldName="position" textOpacity="0.9" textColor="227,0,185,255" fontWeight="63" fontUnderline="0" multilineHeight="1" namedStyle="Semibold" fontLetterSpacing="0" fontWordSpacing="0" blendMode="0">
+                <text-buffer bufferNoFill="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <background shapeOffsetUnit="MM" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiY="0" shapeType="3" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeSizeX="0" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.1" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeDraw="1" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiUnit="MM" shapeOpacity="0.5"/>
+                <shadow shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.7" shadowOffsetAngle="135" shadowRadius="1.5" shadowBlendMode="6" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100"/>
                 <substitutions/>
               </text-style>
-              <text-format decimals="3" addDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="0" wrapChar="" placeDirectionSymbol="0" plussign="0" formatNumbers="0"/>
-              <placement placementFlags="10" offsetType="0" centroidWhole="0" repeatDistanceUnits="MM" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" dist="1" yOffset="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="10" placement="6" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" xOffset="0" fitInPolygonOnly="0" centroidInside="0" maxCurvedCharAngleOut="-20" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" rotationAngle="0"/>
-              <rendering fontLimitPixelSize="0" labelPerPart="0" obstacle="0" zIndex="2" obstacleFactor="1" displayAll="1" maxNumLabels="2000" fontMaxPixelSize="10000" upsidedownLabels="0" limitNumLabels="0" scaleMin="1" minFeatureSize="0" drawLabels="1" mergeLines="0" scaleVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" decimals="3"/>
+              <placement quadOffset="4" offsetType="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="10" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceUnits="MM" offsetUnits="MapUnit" centroidWhole="0" maxCurvedCharAngleIn="20" centroidInside="0" xOffset="0" placement="6" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" yOffset="0" dist="1" distUnits="MM" repeatDistance="0"/>
+              <rendering displayAll="1" fontLimitPixelSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" labelPerPart="0" obstacle="0" scaleMin="1" limitNumLabels="0" maxNumLabels="2000" obstacleType="0" drawLabels="1" upsidedownLabels="0" fontMinPixelSize="3" minFeatureSize="0" scaleMax="10000000" scaleVisibility="0" zIndex="2"/>
               <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>
@@ -2659,160 +2632,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 height="15" lineSizeType="MM" opacity="1" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" backgroundAlpha="255" maxScaleDenominator="1e+8" diagramOrientation="Up" width="15" scaleDependency="Area" minimumSize="0" backgroundColor="#ffffff" enabled="0" barWidth="5" penColor="#000000" minScaleDenominator="100000" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penAlpha="255" penWidth="0" sizeType="MM">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" rotationOffset="270" penColor="#000000" backgroundAlpha="255" opacity="1" minScaleDenominator="100000" lineSizeType="MM" diagramOrientation="Up" barWidth="5" maxScaleDenominator="1e+8" minimumSize="0" width="15" height="15" scaleBasedVisibility="0" labelPlacementMethod="XHeight" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundColor="#ffffff">
           <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" field="" label=""/>
+          <attribute label="" color="#000000" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="10" obstacle="0" zIndex="0" placement="0" showAll="1" priority="0">
+      <DiagramLayerSettings priority="0" dist="0" zIndex="0" showAll="1" linePlacementFlags="10" obstacle="0" placement="0">
         <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>
@@ -2821,8 +2794,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>
@@ -2831,8 +2804,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>
@@ -2841,44 +2814,44 @@ 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 name="" index="0" field="id"/>
-        <alias name="" index="1" field="position"/>
-        <alias name="" index="2" field="type"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="position" index="1" name=""/>
+        <alias field="type" index="2" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="position"/>
-        <default expression="" applyOnUpdate="0" field="type"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="position" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="id" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="position" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="type" notnull_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="position" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="position"/>
-        <constraint exp="" desc="" field="type"/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="position" exp=""/>
+        <constraint desc="" field="type" exp=""/>
       </constraintExpressions>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;position&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;position&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <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 type="field" hidden="0" name="id" width="-1"/>
+          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" hidden="0" name="position" width="-1"/>
+          <column type="field" hidden="0" name="type" width="-1"/>
         </columns>
       </attributetableconfig>
       <editform tolerant="1">.</editform>
@@ -2952,7 +2925,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer maxScale="0" refreshOnNotifyMessage="" geometry="Polygon" simplifyLocal="1" simplifyDrawingHints="1" type="vector" simplifyMaxScale="1" simplifyAlgorithm="0" labelsEnabled="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshEnabled="0" autoRefreshTime="0" minScale="1e+8" readOnly="0">
+    <maplayer autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" simplifyLocal="1" autoRefreshTime="0" readOnly="0" geometry="Polygon" labelsEnabled="0" minScale="1e+8" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" maxScale="0" simplifyMaxScale="1" simplifyAlgorithm="0" simplifyDrawingHints="1">
       <extent>
         <xmin>2045688.58425209275446832</xmin>
         <ymin>-4021531.2146315616555512</ymin>
@@ -3009,7 +2982,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxz="0" minx="0" dimensions="2" maxx="0" crs="" maxy="0" miny="0" minz="0"/>
+          <spatial maxz="0" maxx="0" minx="0" crs="" miny="0" maxy="0" dimensions="2" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -3030,10 +3003,10 @@ def my_form_open(dialog, layer, feature):
         <map-layer-style name="default"/>
       </map-layer-style-manager>
       <auxiliaryLayer/>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 symbollevels="0" type="singleSymbol" enableorderby="0" forceraster="0">
         <symbols>
-          <symbol name="0" type="fill" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+          <symbol type="fill" clip_to_extent="1" name="0" alpha="1">
+            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="77,175,74,255" k="color"/>
               <prop v="bevel" k="joinstyle"/>
@@ -3047,9 +3020,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 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>
@@ -3059,26 +3032,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 height="15" lineSizeType="MM" opacity="1" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" backgroundAlpha="255" maxScaleDenominator="1e+8" diagramOrientation="Up" width="15" scaleDependency="Area" minimumSize="0" backgroundColor="#ffffff" enabled="0" barWidth="5" penColor="#000000" minScaleDenominator="0" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penAlpha="255" penWidth="0" sizeType="MM">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" rotationOffset="270" penColor="#000000" backgroundAlpha="255" opacity="1" minScaleDenominator="0" lineSizeType="MM" diagramOrientation="Up" barWidth="5" maxScaleDenominator="1e+8" minimumSize="0" width="15" height="15" scaleBasedVisibility="0" labelPlacementMethod="XHeight" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundColor="#ffffff">
           <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" field="" label=""/>
+          <attribute label="" color="#000000" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="18" obstacle="0" zIndex="0" placement="1" showAll="1" priority="0">
+      <DiagramLayerSettings priority="0" dist="0" zIndex="0" showAll="1" linePlacementFlags="18" obstacle="0" placement="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>
@@ -3134,56 +3107,56 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="group"/>
-        <alias name="" index="2" field="comment"/>
-        <alias name="" index="3" field="moveable"/>
-        <alias name="" index="4" field="type"/>
-        <alias name="" index="5" field="name"/>
-        <alias name="" index="6" field="hidden"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="group" index="1" name=""/>
+        <alias field="comment" index="2" name=""/>
+        <alias field="moveable" index="3" name=""/>
+        <alias field="type" index="4" name=""/>
+        <alias field="name" index="5" name=""/>
+        <alias field="hidden" index="6" name=""/>
       </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 field="id" expression="" applyOnUpdate="0"/>
+        <default field="group" expression="" applyOnUpdate="0"/>
+        <default field="comment" expression="" applyOnUpdate="0"/>
+        <default field="moveable" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="name" expression="" applyOnUpdate="0"/>
+        <default field="hidden" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="id" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="group" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="comment" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="moveable" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="type" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="name" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="hidden" notnull_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="group" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="comment" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="moveable" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="hidden" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="group"/>
-        <constraint exp="" desc="" field="comment"/>
-        <constraint exp="" desc="" field="moveable"/>
-        <constraint exp="" desc="" field="type"/>
-        <constraint exp="" desc="" field="name"/>
-        <constraint exp="" desc="" 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>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;group&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;group&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <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"/>
+          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" hidden="0" name="group" width="-1"/>
+          <column type="field" hidden="0" name="name" width="-1"/>
+          <column type="field" hidden="0" name="id" width="-1"/>
+          <column type="field" hidden="0" name="comment" width="-1"/>
+          <column type="field" hidden="0" name="moveable" width="-1"/>
+          <column type="field" hidden="0" name="type" width="-1"/>
+          <column type="field" hidden="0" name="hidden" width="-1"/>
         </columns>
       </attributetableconfig>
       <editform tolerant="1"></editform>
@@ -3210,20 +3183,20 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="comment" editable="1"/>
-        <field name="group" editable="1"/>
-        <field name="id" editable="1"/>
-        <field name="moveable" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="1" name="comment"/>
+        <field editable="1" name="group"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="moveable"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field name="comment" labelOnTop="0"/>
-        <field name="group" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="moveable" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="comment"/>
+        <field labelOnTop="0" name="group"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="moveable"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <widgets/>
       <conditionalstyles>
@@ -3234,7 +3207,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" refreshOnNotifyMessage="" geometry="Line" simplifyLocal="1" simplifyDrawingHints="1" type="vector" simplifyMaxScale="1" simplifyAlgorithm="0" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshEnabled="0" autoRefreshTime="0" minScale="1e+8" readOnly="0">
+    <maplayer autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" simplifyLocal="1" autoRefreshTime="0" readOnly="0" geometry="Line" labelsEnabled="1" minScale="1e+8" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" maxScale="0" simplifyMaxScale="1" simplifyAlgorithm="0" simplifyDrawingHints="1">
       <extent>
         <xmin>2045688.58425209275446832</xmin>
         <ymin>-4021531.2146315616555512</ymin>
@@ -3291,7 +3264,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxz="0" minx="0" dimensions="2" maxx="0" crs="" maxy="0" miny="0" minz="0"/>
+          <spatial maxz="0" maxx="0" minx="0" crs="" miny="0" maxy="0" dimensions="2" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -3310,17 +3283,17 @@ def my_form_open(dialog, layer, feature):
         <map-layer-style name="default"/>
       </map-layer-style-manager>
       <auxiliaryLayer/>
-      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="1" enableorderby="0">
+      <renderer-v2 symbollevels="1" type="RuleRenderer" enableorderby="0" forceraster="0">
         <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-          <rule filter="regexp_match(&quot;type&quot;, '^cone')" key="{b3b38ee9-c245-4839-b078-3b966a2a5c4e}" symbol="0" label="Cones"/>
-          <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1'" key="{9da1c54c-0ca9-4db9-a722-ce3f53ccd358}" symbol="1" label="Moveable fences"/>
-          <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1'" key="{bb4463e8-e33a-4475-878c-fd2d7b636418}" symbol="2" label="Fixed fences"/>
-          <rule filter="regexp_match(&quot;type&quot;, '^constr')" key="{bb4463e8-e33a-4475-878c-fd2d7b636418}" symbol="3" label="Construction"/>
-          <rule filter="is_layer_visible( 'fencing' )" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" symbol="4" label="Visible" checkstate="0"/>
+          <rule label="Cones" symbol="0" filter="regexp_match(&quot;type&quot;, '^cone')" key="{b3b38ee9-c245-4839-b078-3b966a2a5c4e}"/>
+          <rule label="Moveable fences" symbol="1" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1'" key="{9da1c54c-0ca9-4db9-a722-ce3f53ccd358}"/>
+          <rule label="Fixed fences" symbol="2" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1'" key="{bb4463e8-e33a-4475-878c-fd2d7b636418}"/>
+          <rule label="Construction" symbol="3" filter="regexp_match(&quot;type&quot;, '^constr')" key="{bb4463e8-e33a-4475-878c-fd2d7b636418}"/>
+          <rule checkstate="0" label="Visible" symbol="4" filter="is_layer_visible( 'fencing' )" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}"/>
         </rules>
         <symbols>
-          <symbol name="0" type="line" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+          <symbol type="line" clip_to_extent="1" name="0" alpha="1">
+            <layer class="SimpleLine" enabled="1" pass="0" 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"/>
@@ -3338,21 +3311,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="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" type="line" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+          <symbol type="line" clip_to_extent="1" name="1" alpha="1">
+            <layer class="SimpleLine" enabled="1" pass="0" 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"/>
@@ -3370,21 +3343,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="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" type="line" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+          <symbol type="line" clip_to_extent="1" name="2" alpha="1">
+            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -3402,21 +3375,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="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" type="line" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+          <symbol type="line" clip_to_extent="1" name="3" alpha="1">
+            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -3434,21 +3407,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="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" type="line" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+          <symbol type="line" clip_to_extent="1" name="4" alpha="1">
+            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -3466,9 +3439,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 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>
@@ -3479,40 +3452,40 @@ def my_form_open(dialog, layer, feature):
         <rules key="">
           <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="">
             <settings>
-              <text-style fontWordSpacing="0" useSubstitutions="0" fontCapitals="0" isExpression="0" fontSizeUnit="Point" fontUnderline="0" previewBkgrdColor="#ffffff" fontFamily="Myriad Pro" fontSize="11" multilineHeight="1" fontItalic="0" namedStyle="Regular" fontLetterSpacing="0" fieldName="comment" textColor="0,0,0,255" textOpacity="0.8" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0" fontStrikeout="0" fontWeight="50">
-                <text-buffer bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeType="0" shapeSizeUnit="MM" shapeDraw="1" shapeJoinStyle="128" shapeOpacity="0.6" shapeSVGFile="" shapeOffsetUnit="MM" shapeSizeY="1" shapeRotation="0" shapeSizeX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeRadiiX="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="255,0,0,255" shapeOffsetY="0" shapeRadiiUnit="MM" shapeBorderWidth="0.6" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="11" fontCapitals="0" fontSizeUnit="Point" useSubstitutions="0" isExpression="0" fontItalic="0" fontStrikeout="0" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" fieldName="comment" textOpacity="0.8" textColor="0,0,0,255" fontWeight="50" fontUnderline="0" multilineHeight="1" namedStyle="Regular" fontLetterSpacing="0" fontWordSpacing="0" blendMode="0">
+                <text-buffer bufferNoFill="1" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <background shapeOffsetUnit="MM" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="128" shapeRadiiY="1" shapeType="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeSizeX="1" shapeBorderColor="255,0,0,255" shapeBorderWidth="0.6" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeDraw="1" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiUnit="MM" shapeOpacity="0.6"/>
+                <shadow shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.7" shadowOffsetAngle="135" shadowRadius="1.5" shadowBlendMode="6" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100"/>
                 <substitutions/>
               </text-style>
-              <text-format decimals="3" addDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="4294967295" wrapChar="" placeDirectionSymbol="0" plussign="0" formatNumbers="0"/>
-              <placement placementFlags="2" offsetType="0" centroidWhole="0" repeatDistanceUnits="MM" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" dist="5" yOffset="0" offsetUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="5" placement="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" xOffset="0" fitInPolygonOnly="0" centroidInside="0" maxCurvedCharAngleOut="-25" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" rotationAngle="0"/>
-              <rendering fontLimitPixelSize="0" labelPerPart="1" obstacle="1" zIndex="0" obstacleFactor="1" displayAll="1" maxNumLabels="2000" fontMaxPixelSize="10000" upsidedownLabels="0" limitNumLabels="0" scaleMin="0" minFeatureSize="0" drawLabels="1" mergeLines="1" scaleVisibility="0" obstacleType="0" scaleMax="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="4294967295" decimals="3"/>
+              <placement quadOffset="4" offsetType="0" placementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="5" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceUnits="MM" offsetUnits="MM" centroidWhole="0" maxCurvedCharAngleIn="25" centroidInside="0" xOffset="0" placement="2" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" yOffset="0" dist="5" distUnits="MM" repeatDistance="0"/>
+              <rendering displayAll="1" fontLimitPixelSize="0" fontMaxPixelSize="10000" mergeLines="1" obstacleFactor="1" labelPerPart="1" obstacle="1" scaleMin="0" limitNumLabels="0" maxNumLabels="2000" obstacleType="0" drawLabels="1" upsidedownLabels="0" fontMinPixelSize="3" minFeatureSize="0" scaleMax="0" scaleVisibility="0" zIndex="0"/>
               <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="">
             <settings>
-              <text-style fontWordSpacing="0" useSubstitutions="0" fontCapitals="0" isExpression="1" fontSizeUnit="Point" fontUnderline="0" previewBkgrdColor="#ffffff" fontFamily="Myriad Pro" fontSize="11" multilineHeight="1" fontItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fieldName="round( $length, 0) || 'm'" textColor="0,0,0,255" textOpacity="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0" fontStrikeout="0" fontWeight="63">
-                <text-buffer bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeType="0" shapeSizeUnit="MM" shapeDraw="0" shapeJoinStyle="64" shapeOpacity="1" shapeSVGFile="" shapeOffsetUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetY="0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="11" fontCapitals="0" fontSizeUnit="Point" useSubstitutions="0" isExpression="1" fontItalic="0" fontStrikeout="0" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" fieldName="round( $length, 0) || 'm'" textOpacity="1" textColor="0,0,0,255" fontWeight="63" fontUnderline="0" multilineHeight="1" namedStyle="Semibold" fontLetterSpacing="0" fontWordSpacing="0" blendMode="0">
+                <text-buffer bufferNoFill="1" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <background shapeOffsetUnit="MM" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiY="0" shapeType="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeDraw="0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiUnit="MM" shapeOpacity="1"/>
+                <shadow shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.7" shadowOffsetAngle="135" shadowRadius="1.5" shadowBlendMode="6" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100"/>
                 <substitutions/>
               </text-style>
-              <text-format decimals="3" addDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="4294967295" wrapChar="" placeDirectionSymbol="0" plussign="0" formatNumbers="0"/>
-              <placement placementFlags="14" offsetType="0" centroidWhole="0" repeatDistanceUnits="MM" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" dist="1" yOffset="0" offsetUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="5" placement="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" xOffset="0" fitInPolygonOnly="0" centroidInside="0" maxCurvedCharAngleOut="-25" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" rotationAngle="0"/>
-              <rendering fontLimitPixelSize="0" labelPerPart="0" obstacle="1" zIndex="0" obstacleFactor="1" displayAll="0" maxNumLabels="2000" fontMaxPixelSize="10000" upsidedownLabels="0" limitNumLabels="0" scaleMin="0" minFeatureSize="0" drawLabels="1" mergeLines="0" scaleVisibility="0" obstacleType="0" scaleMax="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="4294967295" decimals="3"/>
+              <placement quadOffset="4" offsetType="0" placementFlags="14" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="5" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceUnits="MM" offsetUnits="MM" centroidWhole="0" maxCurvedCharAngleIn="25" centroidInside="0" xOffset="0" placement="2" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" yOffset="0" dist="1" distUnits="MM" repeatDistance="0"/>
+              <rendering displayAll="0" fontLimitPixelSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" labelPerPart="0" obstacle="1" scaleMin="0" limitNumLabels="0" maxNumLabels="2000" obstacleType="0" drawLabels="1" upsidedownLabels="0" fontMinPixelSize="3" minFeatureSize="0" scaleMax="0" scaleVisibility="0" zIndex="0"/>
               <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>
@@ -3520,26 +3493,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 height="15" lineSizeType="MM" opacity="1" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" backgroundAlpha="255" maxScaleDenominator="1e+8" diagramOrientation="Up" width="15" scaleDependency="Area" minimumSize="0" backgroundColor="#ffffff" enabled="0" barWidth="5" penColor="#000000" minScaleDenominator="0" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penAlpha="255" penWidth="0" sizeType="MM">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" rotationOffset="270" penColor="#000000" backgroundAlpha="255" opacity="1" minScaleDenominator="0" lineSizeType="MM" diagramOrientation="Up" barWidth="5" maxScaleDenominator="1e+8" minimumSize="0" width="15" height="15" scaleBasedVisibility="0" labelPlacementMethod="XHeight" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundColor="#ffffff">
           <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" field="" label=""/>
+          <attribute label="" color="#000000" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="18" obstacle="0" zIndex="0" placement="2" showAll="1" priority="0">
+      <DiagramLayerSettings priority="0" dist="0" zIndex="0" showAll="1" linePlacementFlags="18" obstacle="0" placement="2">
         <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>
@@ -3595,56 +3568,56 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="group"/>
-        <alias name="" index="2" field="comment"/>
-        <alias name="" index="3" field="moveable"/>
-        <alias name="" index="4" field="type"/>
-        <alias name="" index="5" field="name"/>
-        <alias name="" index="6" field="hidden"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="group" index="1" name=""/>
+        <alias field="comment" index="2" name=""/>
+        <alias field="moveable" index="3" name=""/>
+        <alias field="type" index="4" name=""/>
+        <alias field="name" index="5" name=""/>
+        <alias field="hidden" index="6" name=""/>
       </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 field="id" expression="" applyOnUpdate="0"/>
+        <default field="group" expression="" applyOnUpdate="0"/>
+        <default field="comment" expression="" applyOnUpdate="0"/>
+        <default field="moveable" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="name" expression="" applyOnUpdate="0"/>
+        <default field="hidden" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="id" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="group" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="comment" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="moveable" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="type" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="name" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="hidden" notnull_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="group" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="comment" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="moveable" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="hidden" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="group"/>
-        <constraint exp="" desc="" field="comment"/>
-        <constraint exp="" desc="" field="moveable"/>
-        <constraint exp="" desc="" field="type"/>
-        <constraint exp="" desc="" field="name"/>
-        <constraint exp="" desc="" 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>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;group&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;group&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <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="566"/>
-          <column name="hidden" hidden="0" type="field" width="-1"/>
+          <column type="field" hidden="0" name="id" width="-1"/>
+          <column type="field" hidden="0" name="group" width="-1"/>
+          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" hidden="0" name="comment" width="223"/>
+          <column type="field" hidden="0" name="moveable" width="-1"/>
+          <column type="field" hidden="0" name="type" width="-1"/>
+          <column type="field" hidden="0" name="name" width="566"/>
+          <column type="field" hidden="0" name="hidden" width="-1"/>
         </columns>
       </attributetableconfig>
       <editform tolerant="1"></editform>
@@ -3671,22 +3644,22 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <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"/>
+        <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"/>
       </editable>
       <labelOnTop>
-        <field name="comment" labelOnTop="0"/>
-        <field name="group" labelOnTop="0"/>
-        <field name="hidden" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="moveable" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="comment"/>
+        <field labelOnTop="0" name="group"/>
+        <field labelOnTop="0" name="hidden"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="moveable"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <widgets/>
       <conditionalstyles>
@@ -3697,7 +3670,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="100000" refreshOnNotifyMessage="" geometry="Polygon" simplifyLocal="1" simplifyDrawingHints="1" type="vector" simplifyMaxScale="1" simplifyAlgorithm="0" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshEnabled="0" autoRefreshTime="0" minScale="1e+8" readOnly="0">
+    <maplayer autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" simplifyLocal="1" autoRefreshTime="0" readOnly="0" geometry="Polygon" labelsEnabled="1" minScale="1e+8" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" maxScale="100000" simplifyMaxScale="1" simplifyAlgorithm="0" simplifyDrawingHints="1">
       <extent>
         <xmin>2044855.29280688124708831</xmin>
         <ymin>-4021659.23377959709614515</ymin>
@@ -3756,10 +3729,10 @@ def my_form_open(dialog, layer, feature):
         <map-layer-style name="default"/>
       </map-layer-style-manager>
       <auxiliaryLayer/>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 symbollevels="0" type="singleSymbol" enableorderby="0" forceraster="0">
         <symbols>
-          <symbol name="0" type="fill" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+          <symbol type="fill" clip_to_extent="1" name="0" alpha="1">
+            <layer class="SimpleFill" enabled="1" pass="0" 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"/>
@@ -3773,9 +3746,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 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>
@@ -3785,32 +3758,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 height="15" lineSizeType="MM" opacity="1" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" backgroundAlpha="255" maxScaleDenominator="1e+8" diagramOrientation="Up" width="15" scaleDependency="Area" minimumSize="0" backgroundColor="#ffffff" enabled="0" barWidth="5" penColor="#000000" minScaleDenominator="100000" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penAlpha="255" penWidth="0" sizeType="MM">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" rotationOffset="270" penColor="#000000" backgroundAlpha="255" opacity="1" minScaleDenominator="100000" lineSizeType="MM" diagramOrientation="Up" barWidth="5" maxScaleDenominator="1e+8" minimumSize="0" width="15" height="15" scaleBasedVisibility="0" labelPlacementMethod="XHeight" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundColor="#ffffff">
           <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" field="" label=""/>
+          <attribute label="" color="#000000" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="10" obstacle="0" zIndex="0" placement="0" showAll="1" priority="0">
+      <DiagramLayerSettings priority="0" dist="0" zIndex="0" showAll="1" linePlacementFlags="10" obstacle="0" placement="0">
         <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>
@@ -3819,8 +3792,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>
@@ -3829,8 +3802,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>
@@ -3839,44 +3812,44 @@ 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 name="" index="0" field="id"/>
-        <alias name="" index="1" field="type"/>
-        <alias name="" index="2" field="page"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="type" index="1" name=""/>
+        <alias field="page" index="2" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="type"/>
-        <default expression="" applyOnUpdate="0" field="page"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="page" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="id" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="type" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="page" notnull_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="page" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="type"/>
-        <constraint exp="" desc="" field="page"/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="page" exp=""/>
       </constraintExpressions>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <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"/>
+          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" hidden="0" name="id" width="-1"/>
+          <column type="field" hidden="0" name="type" width="-1"/>
+          <column type="field" hidden="0" name="page" width="-1"/>
         </columns>
       </attributetableconfig>
       <editform tolerant="1">.</editform>
@@ -3913,7 +3886,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="100000" refreshOnNotifyMessage="" geometry="Point" simplifyLocal="1" simplifyDrawingHints="0" type="vector" simplifyMaxScale="1" simplifyAlgorithm="0" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshEnabled="0" autoRefreshTime="0" minScale="1e+8" readOnly="0">
+    <maplayer autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" simplifyLocal="1" autoRefreshTime="0" readOnly="0" geometry="Point" labelsEnabled="1" minScale="1e+8" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" maxScale="100000" simplifyMaxScale="1" simplifyAlgorithm="0" simplifyDrawingHints="0">
       <extent>
         <xmin>2045521.3311831213068217</xmin>
         <ymin>-4021544.00370020139962435</ymin>
@@ -3970,7 +3943,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxz="0" minx="0" dimensions="2" maxx="0" crs="" maxy="0" miny="0" minz="0"/>
+          <spatial maxz="0" maxx="0" minx="0" crs="" miny="0" maxy="0" dimensions="2" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -3981,7 +3954,7 @@ def my_form_open(dialog, layer, feature):
       </resourceMetadata>
       <provider encoding="UTF-8">ogr</provider>
       <vectorjoins>
-        <join cascadedDelete="0" joinLayerId="marshals_by_position20161003112326575" customPrefix="csv_" hasCustomPrefix="1" targetFieldName="position" memoryCache="1" upsertOnEdit="0" editable="0" joinFieldName="position" dynamicForm="0">
+        <join editable="0" customPrefix="csv_" hasCustomPrefix="1" dynamicForm="0" targetFieldName="position" upsertOnEdit="0" joinLayerId="marshals_by_position20161003112326575" joinFieldName="position" cascadedDelete="0" memoryCache="1">
           <joinFieldsSubset>
             <field name="position"/>
             <field name="name"/>
@@ -4007,14 +3980,14 @@ def my_form_open(dialog, layer, feature):
         <map-layer-style name="default"/>
       </map-layer-style-manager>
       <auxiliaryLayer/>
-      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 symbollevels="0" type="RuleRenderer" enableorderby="0" forceraster="0">
         <rules key="{436a5e05-3485-477a-80b7-cf4d12d6dcec}">
-          <rule description="Show in marshal overview" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" key="{308d81eb-cefa-4627-8afb-3baa8363f863}" symbol="0" label="Show in marshal overview"/>
-          <rule description="Show in marshal overview" filter="'marshal' = attribute( @atlas_feature , 'type' )" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" symbol="1" label="Show in marshal maps"/>
+          <rule label="Show in marshal overview" description="Show in marshal overview" symbol="0" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" key="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
+          <rule label="Show in marshal maps" description="Show in marshal overview" symbol="1" filter="'marshal' = attribute( @atlas_feature , 'type' )" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
         </rules>
         <symbols>
-          <symbol name="0" type="marker" alpha="0.792157" clip_to_extent="1">
-            <layer locked="0" class="SimpleMarker" pass="1" enabled="1">
+          <symbol type="marker" clip_to_extent="1" name="0" alpha="0.792157">
+            <layer class="SimpleMarker" enabled="1" pass="1" locked="0">
               <prop v="0" k="angle"/>
               <prop v="0,0,0,255" k="color"/>
               <prop v="1" k="horizontal_anchor_point"/>
@@ -4035,15 +4008,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 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" type="marker" alpha="0.0470588" clip_to_extent="1">
-            <layer locked="0" class="SimpleMarker" pass="1" enabled="1">
+          <symbol type="marker" clip_to_extent="1" name="1" alpha="0.0470588">
+            <layer class="SimpleMarker" enabled="1" pass="1" locked="0">
               <prop v="0" k="angle"/>
               <prop v="0,0,0,255" k="color"/>
               <prop v="1" k="horizontal_anchor_point"/>
@@ -4064,9 +4037,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 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>
@@ -4077,97 +4050,97 @@ def my_form_open(dialog, layer, feature):
         <rules key="">
           <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions)" filter="'marshal' = attribute( @atlas_feature , 'type' )" key="">
             <settings>
-              <text-style fontWordSpacing="0" useSubstitutions="0" fontCapitals="0" isExpression="0" fontSizeUnit="Point" fontUnderline="0" previewBkgrdColor="#ffffff" fontFamily="Myriad Pro" fontSize="6" multilineHeight="1" fontItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fieldName="position" textColor="0,0,0,255" textOpacity="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0" fontStrikeout="0" fontWeight="63">
-                <text-buffer bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="0" bufferDraw="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeType="3" shapeSizeUnit="MM" shapeDraw="1" shapeJoinStyle="64" shapeOpacity="1" shapeSVGFile="" shapeOffsetUnit="MM" shapeSizeY="0.2" shapeRotation="0" shapeSizeX="0.2" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeOffsetY="0" shapeRadiiUnit="MM" shapeBorderWidth="0.4" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="6" fontCapitals="0" fontSizeUnit="Point" useSubstitutions="0" isExpression="0" fontItalic="0" fontStrikeout="0" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" fieldName="position" textOpacity="1" textColor="0,0,0,255" fontWeight="63" fontUnderline="0" multilineHeight="1" namedStyle="Semibold" fontLetterSpacing="0" fontWordSpacing="0" blendMode="0">
+                <text-buffer bufferNoFill="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <background shapeOffsetUnit="MM" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiY="0" shapeType="3" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeSizeX="0.2" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.4" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.2" shapeDraw="1" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiUnit="MM" shapeOpacity="1"/>
+                <shadow shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.7" shadowOffsetAngle="135" shadowRadius="1.5" shadowBlendMode="6" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100"/>
                 <substitutions/>
               </text-style>
-              <text-format decimals="3" addDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="0" wrapChar="" placeDirectionSymbol="0" plussign="0" formatNumbers="0"/>
-              <placement placementFlags="10" offsetType="0" centroidWhole="0" repeatDistanceUnits="MM" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" dist="0" yOffset="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="8" placement="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" xOffset="0" fitInPolygonOnly="0" centroidInside="0" maxCurvedCharAngleOut="-20" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" rotationAngle="0"/>
-              <rendering fontLimitPixelSize="0" labelPerPart="0" obstacle="1" zIndex="0" obstacleFactor="1" displayAll="1" maxNumLabels="2000" fontMaxPixelSize="10000" upsidedownLabels="0" limitNumLabels="0" scaleMin="1" minFeatureSize="0" drawLabels="1" mergeLines="0" scaleVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" decimals="3"/>
+              <placement quadOffset="4" offsetType="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="8" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceUnits="MM" offsetUnits="MapUnit" centroidWhole="0" maxCurvedCharAngleIn="20" centroidInside="0" xOffset="0" placement="1" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" yOffset="0" dist="0" distUnits="MM" repeatDistance="0"/>
+              <rendering displayAll="1" fontLimitPixelSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" labelPerPart="0" obstacle="1" scaleMin="1" limitNumLabels="0" maxNumLabels="2000" obstacleType="0" drawLabels="1" upsidedownLabels="0" fontMinPixelSize="3" minFeatureSize="0" scaleMax="10000000" scaleVisibility="0" zIndex="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="FontOpacity" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 20))" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="FontOpacity">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 20))"/>
+                      <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="true" type="bool"/>
-                      <Option name="expression" value="if ( @atlas_featureid = $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 ( @atlas_featureid = $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 ( @atlas_featureid = $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 ( @atlas_featureid = $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 ( @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, 20, 60))" 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, 20, 60))"/>
+                      <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 ( $atlasfeatureid = $id, 10, -1 )" 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, -1 )"/>
+                      <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 description="Show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" key="">
             <settings>
-              <text-style fontWordSpacing="0" useSubstitutions="0" fontCapitals="0" isExpression="0" fontSizeUnit="Point" fontUnderline="0" previewBkgrdColor="#ffffff" fontFamily="Myriad Pro" fontSize="6" multilineHeight="1" fontItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fieldName="position" textColor="0,0,0,255" textOpacity="0.9" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0" fontStrikeout="0" fontWeight="63">
-                <text-buffer bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="0" bufferDraw="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeType="3" shapeSizeUnit="MM" shapeDraw="1" shapeJoinStyle="64" shapeOpacity="0.5" shapeSVGFile="" shapeOffsetUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeOffsetY="0" shapeRadiiUnit="MM" shapeBorderWidth="0.1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="6" fontCapitals="0" fontSizeUnit="Point" useSubstitutions="0" isExpression="0" fontItalic="0" fontStrikeout="0" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" fieldName="position" textOpacity="0.9" textColor="0,0,0,255" fontWeight="63" fontUnderline="0" multilineHeight="1" namedStyle="Semibold" fontLetterSpacing="0" fontWordSpacing="0" blendMode="0">
+                <text-buffer bufferNoFill="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <background shapeOffsetUnit="MM" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiY="0" shapeType="3" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeSizeX="0" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.1" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeDraw="1" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiUnit="MM" shapeOpacity="0.5"/>
+                <shadow shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.7" shadowOffsetAngle="135" shadowRadius="1.5" shadowBlendMode="6" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100"/>
                 <substitutions/>
               </text-style>
-              <text-format decimals="3" addDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="0" wrapChar="" placeDirectionSymbol="0" plussign="0" formatNumbers="0"/>
-              <placement placementFlags="10" offsetType="0" centroidWhole="0" repeatDistanceUnits="MM" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" dist="1" yOffset="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="10" placement="6" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" xOffset="0" fitInPolygonOnly="0" centroidInside="0" maxCurvedCharAngleOut="-20" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" rotationAngle="0"/>
-              <rendering fontLimitPixelSize="0" labelPerPart="0" obstacle="0" zIndex="2" obstacleFactor="1" displayAll="1" maxNumLabels="2000" fontMaxPixelSize="10000" upsidedownLabels="0" limitNumLabels="0" scaleMin="1" minFeatureSize="0" drawLabels="1" mergeLines="0" scaleVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" decimals="3"/>
+              <placement quadOffset="4" offsetType="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="10" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceUnits="MM" offsetUnits="MapUnit" centroidWhole="0" maxCurvedCharAngleIn="20" centroidInside="0" xOffset="0" placement="6" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" yOffset="0" dist="1" distUnits="MM" repeatDistance="0"/>
+              <rendering displayAll="1" fontLimitPixelSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" labelPerPart="0" obstacle="0" scaleMin="1" limitNumLabels="0" maxNumLabels="2000" obstacleType="0" drawLabels="1" upsidedownLabels="0" fontMinPixelSize="3" minFeatureSize="0" scaleMax="10000000" scaleVisibility="0" zIndex="2"/>
               <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 ( @atlas_featureid = $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 ( @atlas_featureid = $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 ( @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="false"/>
+                      <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="Size" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="expression" value="if ( @atlas_featureid = $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 ( @atlas_featureid = $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>
@@ -4184,160 +4157,160 @@ def my_form_open(dialog, layer, feature):
           <value>COALESCE( "id", '&lt;NULL>' )</value>
           <value>COALESCE( "id", '&lt;NULL>' )</value>
         </property>
-        <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 height="15" lineSizeType="MM" opacity="1" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" backgroundAlpha="255" maxScaleDenominator="1e+8" diagramOrientation="Up" width="15" scaleDependency="Area" minimumSize="0" backgroundColor="#ffffff" enabled="0" barWidth="5" penColor="#000000" minScaleDenominator="100000" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penAlpha="255" penWidth="0" sizeType="MM">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" rotationOffset="270" penColor="#000000" backgroundAlpha="255" opacity="1" minScaleDenominator="100000" lineSizeType="MM" diagramOrientation="Up" barWidth="5" maxScaleDenominator="1e+8" minimumSize="0" width="15" height="15" scaleBasedVisibility="0" labelPlacementMethod="XHeight" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundColor="#ffffff">
           <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" field="" label=""/>
+          <attribute label="" color="#000000" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="2" obstacle="0" zIndex="0" placement="0" showAll="1" priority="0">
+      <DiagramLayerSettings priority="0" dist="0" zIndex="0" showAll="1" linePlacementFlags="2" obstacle="0" placement="0">
         <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>
@@ -4346,8 +4319,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>
@@ -4356,8 +4329,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>
@@ -4366,8 +4339,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>
@@ -4376,8 +4349,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>
@@ -4386,8 +4359,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>
@@ -4396,8 +4369,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>
@@ -4406,8 +4379,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>
@@ -4416,8 +4389,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>
@@ -4426,8 +4399,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>
@@ -4436,8 +4409,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>
@@ -4446,8 +4419,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>
@@ -4456,8 +4429,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>
@@ -4466,8 +4439,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>
@@ -4476,8 +4449,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>
@@ -4486,8 +4459,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>
@@ -4496,8 +4469,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>
@@ -4506,8 +4479,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>
@@ -4516,8 +4489,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>
@@ -4526,124 +4499,124 @@ 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 name="" index="0" field="id"/>
-        <alias name="" index="1" field="position"/>
-        <alias name="" index="2" field="type"/>
-        <alias name="" index="3" field="notes"/>
-        <alias name="" index="4" field="oldpositio"/>
-        <alias name="" index="5" field="xyposition"/>
-        <alias name="" index="6" field="csv_position"/>
-        <alias name="" index="7" field="csv_name"/>
-        <alias name="" index="8" field="csv_club"/>
-        <alias name="" index="9" field="csv_phone"/>
-        <alias name="" index="10" field="csv_email"/>
-        <alias name="" index="11" field="csv_captain"/>
-        <alias name="" index="12" field="csv_captain_number"/>
-        <alias name="" index="13" field="csv_races"/>
-        <alias name="" index="14" field="csv_first_runner"/>
-        <alias name="" index="15" field="csv_last_runner"/>
-        <alias name="" index="16" field="csv_21_distance"/>
-        <alias name="" index="17" field="csv_10_distance"/>
-        <alias name="" index="18" field="csv_instructions"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="position" index="1" name=""/>
+        <alias field="type" index="2" name=""/>
+        <alias field="notes" index="3" name=""/>
+        <alias field="oldpositio" index="4" name=""/>
+        <alias field="xyposition" index="5" name=""/>
+        <alias field="csv_position" index="6" name=""/>
+        <alias field="csv_name" index="7" name=""/>
+        <alias field="csv_club" index="8" name=""/>
+        <alias field="csv_phone" index="9" name=""/>
+        <alias field="csv_email" index="10" name=""/>
+        <alias field="csv_captain" index="11" name=""/>
+        <alias field="csv_captain_number" index="12" name=""/>
+        <alias field="csv_races" index="13" name=""/>
+        <alias field="csv_first_runner" index="14" name=""/>
+        <alias field="csv_last_runner" index="15" name=""/>
+        <alias field="csv_21_distance" index="16" name=""/>
+        <alias field="csv_10_distance" index="17" name=""/>
+        <alias field="csv_instructions" index="18" name=""/>
       </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_position"/>
-        <default expression="" applyOnUpdate="0" field="csv_name"/>
-        <default expression="" applyOnUpdate="0" field="csv_club"/>
-        <default expression="" applyOnUpdate="0" field="csv_phone"/>
-        <default expression="" applyOnUpdate="0" field="csv_email"/>
-        <default expression="" applyOnUpdate="0" field="csv_captain"/>
-        <default expression="" applyOnUpdate="0" field="csv_captain_number"/>
-        <default expression="" applyOnUpdate="0" field="csv_races"/>
-        <default expression="" applyOnUpdate="0" field="csv_first_runner"/>
-        <default expression="" applyOnUpdate="0" field="csv_last_runner"/>
-        <default expression="" applyOnUpdate="0" field="csv_21_distance"/>
-        <default expression="" applyOnUpdate="0" field="csv_10_distance"/>
-        <default expression="" applyOnUpdate="0" field="csv_instructions"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="position" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="notes" expression="" applyOnUpdate="0"/>
+        <default field="oldpositio" expression="" applyOnUpdate="0"/>
+        <default field="xyposition" expression="" applyOnUpdate="0"/>
+        <default field="csv_position" expression="" applyOnUpdate="0"/>
+        <default field="csv_name" expression="" applyOnUpdate="0"/>
+        <default field="csv_club" expression="" applyOnUpdate="0"/>
+        <default field="csv_phone" expression="" applyOnUpdate="0"/>
+        <default field="csv_email" expression="" applyOnUpdate="0"/>
+        <default field="csv_captain" expression="" applyOnUpdate="0"/>
+        <default field="csv_captain_number" expression="" applyOnUpdate="0"/>
+        <default field="csv_races" expression="" applyOnUpdate="0"/>
+        <default field="csv_first_runner" expression="" applyOnUpdate="0"/>
+        <default field="csv_last_runner" expression="" applyOnUpdate="0"/>
+        <default field="csv_21_distance" expression="" applyOnUpdate="0"/>
+        <default field="csv_10_distance" expression="" applyOnUpdate="0"/>
+        <default field="csv_instructions" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="id" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="position" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="type" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="notes" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="oldpositio" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="xyposition" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="csv_position" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="csv_name" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="csv_club" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="csv_phone" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="csv_email" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="csv_captain" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="csv_captain_number" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="csv_races" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="csv_first_runner" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="csv_last_runner" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="csv_21_distance" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="csv_10_distance" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="csv_instructions" notnull_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="position" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="notes" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="oldpositio" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="xyposition" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="csv_position" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="csv_name" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="csv_club" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="csv_phone" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="csv_email" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="csv_captain" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="csv_captain_number" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="csv_races" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="csv_first_runner" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="csv_last_runner" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="csv_21_distance" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="csv_10_distance" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="csv_instructions" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="position"/>
-        <constraint exp="" desc="" field="type"/>
-        <constraint exp="" desc="" field="notes"/>
-        <constraint exp="" desc="" field="oldpositio"/>
-        <constraint exp="" desc="" field="xyposition"/>
-        <constraint exp="" desc="" field="csv_position"/>
-        <constraint exp="" desc="" field="csv_name"/>
-        <constraint exp="" desc="" field="csv_club"/>
-        <constraint exp="" desc="" field="csv_phone"/>
-        <constraint exp="" desc="" field="csv_email"/>
-        <constraint exp="" desc="" field="csv_captain"/>
-        <constraint exp="" desc="" field="csv_captain_number"/>
-        <constraint exp="" desc="" field="csv_races"/>
-        <constraint exp="" desc="" field="csv_first_runner"/>
-        <constraint exp="" desc="" field="csv_last_runner"/>
-        <constraint exp="" desc="" field="csv_21_distance"/>
-        <constraint exp="" desc="" field="csv_10_distance"/>
-        <constraint exp="" desc="" field="csv_instructions"/>
+        <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_position" exp=""/>
+        <constraint desc="" field="csv_name" exp=""/>
+        <constraint desc="" field="csv_club" exp=""/>
+        <constraint desc="" field="csv_phone" exp=""/>
+        <constraint desc="" field="csv_email" exp=""/>
+        <constraint desc="" field="csv_captain" exp=""/>
+        <constraint desc="" field="csv_captain_number" exp=""/>
+        <constraint desc="" field="csv_races" exp=""/>
+        <constraint desc="" field="csv_first_runner" exp=""/>
+        <constraint desc="" field="csv_last_runner" exp=""/>
+        <constraint desc="" field="csv_21_distance" exp=""/>
+        <constraint desc="" field="csv_10_distance" exp=""/>
+        <constraint desc="" field="csv_instructions" exp=""/>
       </constraintExpressions>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;position&quot;" actionWidgetStyle="dropDown" sortOrder="1">
+      <attributetableconfig sortExpression="&quot;position&quot;" sortOrder="1" actionWidgetStyle="dropDown">
         <columns>
-          <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_position" 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_phone" hidden="0" type="field" width="-1"/>
-          <column name="csv_email" hidden="0" type="field" width="-1"/>
-          <column name="csv_captain" hidden="0" type="field" width="-1"/>
-          <column name="csv_captain_number" hidden="0" type="field" width="-1"/>
-          <column name="csv_first_runner" hidden="0" type="field" width="-1"/>
-          <column name="csv_last_runner" hidden="0" type="field" width="-1"/>
-          <column name="csv_races" hidden="0" type="field" width="-1"/>
-          <column name="csv_21_distance" hidden="0" type="field" width="-1"/>
-          <column name="csv_10_distance" hidden="0" type="field" width="-1"/>
-          <column name="csv_instructions" hidden="0" type="field" width="-1"/>
+          <column type="field" hidden="0" name="id" width="-1"/>
+          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" hidden="0" name="position" width="-1"/>
+          <column type="field" hidden="0" name="type" width="-1"/>
+          <column type="field" hidden="0" name="notes" width="-1"/>
+          <column type="field" hidden="0" name="oldpositio" width="-1"/>
+          <column type="field" hidden="0" name="xyposition" width="-1"/>
+          <column type="field" hidden="0" name="csv_position" width="-1"/>
+          <column type="field" hidden="0" name="csv_name" width="-1"/>
+          <column type="field" hidden="0" name="csv_club" width="-1"/>
+          <column type="field" hidden="0" name="csv_phone" width="-1"/>
+          <column type="field" hidden="0" name="csv_email" width="-1"/>
+          <column type="field" hidden="0" name="csv_captain" width="-1"/>
+          <column type="field" hidden="0" name="csv_captain_number" width="-1"/>
+          <column type="field" hidden="0" name="csv_first_runner" width="-1"/>
+          <column type="field" hidden="0" name="csv_last_runner" width="-1"/>
+          <column type="field" hidden="0" name="csv_races" width="-1"/>
+          <column type="field" hidden="0" name="csv_21_distance" width="-1"/>
+          <column type="field" hidden="0" name="csv_10_distance" width="-1"/>
+          <column type="field" hidden="0" name="csv_instructions" width="-1"/>
         </columns>
       </attributetableconfig>
       <editform tolerant="1">.</editform>
@@ -4670,46 +4643,46 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="csv_10_distance" editable="0"/>
-        <field name="csv_21_distance" editable="0"/>
-        <field name="csv_captain" editable="0"/>
-        <field name="csv_captain_number" editable="0"/>
-        <field name="csv_club" editable="0"/>
-        <field name="csv_email" 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_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"/>
+        <field editable="0" name="csv_10_distance"/>
+        <field editable="0" name="csv_21_distance"/>
+        <field editable="0" name="csv_captain"/>
+        <field editable="0" name="csv_captain_number"/>
+        <field editable="0" name="csv_club"/>
+        <field editable="0" name="csv_email"/>
+        <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_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"/>
       </editable>
       <labelOnTop>
-        <field name="csv_10_distance" labelOnTop="0"/>
-        <field name="csv_21_distance" labelOnTop="0"/>
-        <field name="csv_captain" labelOnTop="0"/>
-        <field name="csv_captain_number" labelOnTop="0"/>
-        <field name="csv_club" labelOnTop="0"/>
-        <field name="csv_email" labelOnTop="0"/>
-        <field name="csv_first_runner" labelOnTop="0"/>
-        <field name="csv_instructions" labelOnTop="0"/>
-        <field name="csv_last_runner" labelOnTop="0"/>
-        <field name="csv_name" labelOnTop="0"/>
-        <field name="csv_phone" labelOnTop="0"/>
-        <field name="csv_position" labelOnTop="0"/>
-        <field name="csv_races" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="notes" labelOnTop="0"/>
-        <field name="oldpositio" labelOnTop="0"/>
-        <field name="position" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
-        <field name="xyposition" labelOnTop="0"/>
+        <field labelOnTop="0" name="csv_10_distance"/>
+        <field labelOnTop="0" name="csv_21_distance"/>
+        <field labelOnTop="0" name="csv_captain"/>
+        <field labelOnTop="0" name="csv_captain_number"/>
+        <field labelOnTop="0" name="csv_club"/>
+        <field labelOnTop="0" name="csv_email"/>
+        <field labelOnTop="0" name="csv_first_runner"/>
+        <field labelOnTop="0" name="csv_instructions"/>
+        <field labelOnTop="0" name="csv_last_runner"/>
+        <field labelOnTop="0" name="csv_name"/>
+        <field labelOnTop="0" name="csv_phone"/>
+        <field labelOnTop="0" name="csv_position"/>
+        <field labelOnTop="0" name="csv_races"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="notes"/>
+        <field labelOnTop="0" name="oldpositio"/>
+        <field labelOnTop="0" name="position"/>
+        <field labelOnTop="0" name="type"/>
+        <field labelOnTop="0" name="xyposition"/>
       </labelOnTop>
       <widgets>
         <widget name="csv_captain_ph">
@@ -4763,7 +4736,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer maxScale="100000" refreshOnNotifyMessage="" geometry="No geometry" type="vector" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" autoRefreshTime="0" minScale="1e+8" readOnly="0">
+    <maplayer autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" autoRefreshTime="0" readOnly="0" geometry="No geometry" minScale="1e+8" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" maxScale="100000">
       <id>marshals_by_position20161003112326575</id>
       <datasource>file:./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes</datasource>
       <keywordList>
@@ -4814,7 +4787,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxz="0" minx="0" dimensions="2" maxx="0" crs="" maxy="0" miny="0" minz="0"/>
+          <spatial maxz="0" maxx="0" minx="0" crs="" miny="0" maxy="0" dimensions="2" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -4824,8 +4797,8 @@ def my_form_open(dialog, layer, feature):
         </extent>
       </resourceMetadata>
       <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>
@@ -4833,8 +4806,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/>
@@ -4847,8 +4820,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>
@@ -4857,8 +4830,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>
@@ -4867,8 +4840,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>
@@ -4877,8 +4850,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>
@@ -4887,8 +4860,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>
@@ -4897,8 +4870,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>
@@ -4907,8 +4880,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>
@@ -4917,8 +4890,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>
@@ -4927,8 +4900,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>
@@ -4937,8 +4910,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>
@@ -4947,8 +4920,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>
@@ -4957,8 +4930,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>
@@ -4967,8 +4940,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>
@@ -4977,8 +4950,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>
@@ -4987,8 +4960,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>
@@ -4997,8 +4970,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>
@@ -5007,114 +4980,114 @@ 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 name="" index="0" field="position"/>
-        <alias name="" index="1" field="first_name"/>
-        <alias name="" index="2" field="last_name"/>
-        <alias name="" index="3" field="name"/>
-        <alias name="" index="4" field="club"/>
-        <alias name="" index="5" field="phone"/>
-        <alias name="" index="6" field="email"/>
-        <alias name="" index="7" field="captain"/>
-        <alias name="" index="8" field="captain_number"/>
-        <alias name="" index="9" field="tshirt"/>
-        <alias name="" index="10" field="races"/>
-        <alias name="" index="11" field="first_runner"/>
-        <alias name="" index="12" field="last_runner"/>
-        <alias name="" index="13" field="21_distance"/>
-        <alias name="" index="14" field="10_distance"/>
-        <alias name="" index="15" field="5_distance"/>
-        <alias name="" index="16" field="instructions"/>
+        <alias field="position" index="0" name=""/>
+        <alias field="first_name" index="1" name=""/>
+        <alias field="last_name" index="2" name=""/>
+        <alias field="name" index="3" name=""/>
+        <alias field="club" index="4" name=""/>
+        <alias field="phone" index="5" name=""/>
+        <alias field="email" index="6" name=""/>
+        <alias field="captain" index="7" name=""/>
+        <alias field="captain_number" index="8" name=""/>
+        <alias field="tshirt" index="9" name=""/>
+        <alias field="races" index="10" name=""/>
+        <alias field="first_runner" index="11" name=""/>
+        <alias field="last_runner" index="12" name=""/>
+        <alias field="21_distance" index="13" name=""/>
+        <alias field="10_distance" index="14" name=""/>
+        <alias field="5_distance" index="15" name=""/>
+        <alias field="instructions" index="16" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="position"/>
-        <default expression="" applyOnUpdate="0" field="first_name"/>
-        <default expression="" applyOnUpdate="0" field="last_name"/>
-        <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_number"/>
-        <default expression="" applyOnUpdate="0" field="tshirt"/>
-        <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="21_distance"/>
-        <default expression="" applyOnUpdate="0" field="10_distance"/>
-        <default expression="" applyOnUpdate="0" field="5_distance"/>
-        <default expression="" applyOnUpdate="0" field="instructions"/>
+        <default field="position" expression="" applyOnUpdate="0"/>
+        <default field="first_name" expression="" applyOnUpdate="0"/>
+        <default field="last_name" expression="" applyOnUpdate="0"/>
+        <default field="name" expression="" applyOnUpdate="0"/>
+        <default field="club" expression="" applyOnUpdate="0"/>
+        <default field="phone" expression="" applyOnUpdate="0"/>
+        <default field="email" expression="" applyOnUpdate="0"/>
+        <default field="captain" expression="" applyOnUpdate="0"/>
+        <default field="captain_number" expression="" applyOnUpdate="0"/>
+        <default field="tshirt" expression="" applyOnUpdate="0"/>
+        <default field="races" expression="" applyOnUpdate="0"/>
+        <default field="first_runner" expression="" applyOnUpdate="0"/>
+        <default field="last_runner" expression="" applyOnUpdate="0"/>
+        <default field="21_distance" expression="" applyOnUpdate="0"/>
+        <default field="10_distance" expression="" applyOnUpdate="0"/>
+        <default field="5_distance" expression="" applyOnUpdate="0"/>
+        <default field="instructions" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="position" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="first_name" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="last_name" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="name" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="club" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="phone" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="email" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="captain" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="captain_number" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="tshirt" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="races" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="first_runner" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="last_runner" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="21_distance" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="10_distance" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="5_distance" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="instructions" notnull_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="position" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="first_name" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="last_name" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="club" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="phone" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="email" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="captain" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="captain_number" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="tshirt" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="races" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="first_runner" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="last_runner" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="21_distance" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="10_distance" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="5_distance" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="instructions" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="position"/>
-        <constraint exp="" desc="" field="first_name"/>
-        <constraint exp="" desc="" field="last_name"/>
-        <constraint exp="" desc="" field="name"/>
-        <constraint exp="" desc="" field="club"/>
-        <constraint exp="" desc="" field="phone"/>
-        <constraint exp="" desc="" field="email"/>
-        <constraint exp="" desc="" field="captain"/>
-        <constraint exp="" desc="" field="captain_number"/>
-        <constraint exp="" desc="" field="tshirt"/>
-        <constraint exp="" desc="" field="races"/>
-        <constraint exp="" desc="" field="first_runner"/>
-        <constraint exp="" desc="" field="last_runner"/>
-        <constraint exp="" desc="" field="21_distance"/>
-        <constraint exp="" desc="" field="10_distance"/>
-        <constraint exp="" desc="" field="5_distance"/>
-        <constraint exp="" desc="" field="instructions"/>
+        <constraint desc="" field="position" exp=""/>
+        <constraint desc="" field="first_name" exp=""/>
+        <constraint desc="" field="last_name" 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_number" exp=""/>
+        <constraint desc="" field="tshirt" exp=""/>
+        <constraint desc="" field="races" exp=""/>
+        <constraint desc="" field="first_runner" exp=""/>
+        <constraint desc="" field="last_runner" exp=""/>
+        <constraint desc="" field="21_distance" exp=""/>
+        <constraint desc="" field="10_distance" exp=""/>
+        <constraint desc="" field="5_distance" exp=""/>
+        <constraint desc="" field="instructions" exp=""/>
       </constraintExpressions>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <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="tshirt" 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_name" hidden="0" type="field" width="-1"/>
-          <column name="last_name" hidden="0" type="field" width="-1"/>
-          <column name="captain_number" hidden="0" type="field" width="-1"/>
-          <column name="first_runner" hidden="0" type="field" width="-1"/>
-          <column name="last_runner" hidden="0" type="field" width="-1"/>
-          <column name="21_distance" hidden="0" type="field" width="-1"/>
-          <column name="10_distance" hidden="0" type="field" width="-1"/>
-          <column name="5_distance" hidden="0" type="field" width="-1"/>
-          <column name="instructions" hidden="0" type="field" width="-1"/>
+          <column type="field" hidden="0" name="position" width="-1"/>
+          <column type="field" hidden="0" name="name" width="-1"/>
+          <column type="field" hidden="0" name="club" width="-1"/>
+          <column type="field" hidden="0" name="phone" width="-1"/>
+          <column type="field" hidden="0" name="email" width="-1"/>
+          <column type="field" hidden="0" name="captain" width="-1"/>
+          <column type="field" hidden="0" name="tshirt" width="-1"/>
+          <column type="field" hidden="0" name="races" width="-1"/>
+          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" hidden="0" name="first_name" width="-1"/>
+          <column type="field" hidden="0" name="last_name" width="-1"/>
+          <column type="field" hidden="0" name="captain_number" width="-1"/>
+          <column type="field" hidden="0" name="first_runner" width="-1"/>
+          <column type="field" hidden="0" name="last_runner" width="-1"/>
+          <column type="field" hidden="0" name="21_distance" width="-1"/>
+          <column type="field" hidden="0" name="10_distance" width="-1"/>
+          <column type="field" hidden="0" name="5_distance" width="-1"/>
+          <column type="field" hidden="0" name="instructions" width="-1"/>
         </columns>
       </attributetableconfig>
       <editform tolerant="1">.</editform>
@@ -5141,42 +5114,42 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="10_distance" editable="1"/>
-        <field name="21_distance" editable="1"/>
-        <field name="5_distance" editable="1"/>
-        <field name="captain" editable="1"/>
-        <field name="captain_number" editable="1"/>
-        <field name="club" editable="1"/>
-        <field name="email" editable="1"/>
-        <field name="first_name" editable="1"/>
-        <field name="first_runner" editable="1"/>
-        <field name="instructions" editable="1"/>
-        <field name="last_name" editable="1"/>
-        <field name="last_runner" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="phone" editable="1"/>
-        <field name="position" editable="1"/>
-        <field name="races" editable="1"/>
-        <field name="tshirt" editable="1"/>
+        <field editable="1" name="10_distance"/>
+        <field editable="1" name="21_distance"/>
+        <field editable="1" name="5_distance"/>
+        <field editable="1" name="captain"/>
+        <field editable="1" name="captain_number"/>
+        <field editable="1" name="club"/>
+        <field editable="1" name="email"/>
+        <field editable="1" name="first_name"/>
+        <field editable="1" name="first_runner"/>
+        <field editable="1" name="instructions"/>
+        <field editable="1" name="last_name"/>
+        <field editable="1" name="last_runner"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="phone"/>
+        <field editable="1" name="position"/>
+        <field editable="1" name="races"/>
+        <field editable="1" name="tshirt"/>
       </editable>
       <labelOnTop>
-        <field name="10_distance" labelOnTop="0"/>
-        <field name="21_distance" labelOnTop="0"/>
-        <field name="5_distance" labelOnTop="0"/>
-        <field name="captain" labelOnTop="0"/>
-        <field name="captain_number" labelOnTop="0"/>
-        <field name="club" labelOnTop="0"/>
-        <field name="email" labelOnTop="0"/>
-        <field name="first_name" labelOnTop="0"/>
-        <field name="first_runner" labelOnTop="0"/>
-        <field name="instructions" labelOnTop="0"/>
-        <field name="last_name" labelOnTop="0"/>
-        <field name="last_runner" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="phone" labelOnTop="0"/>
-        <field name="position" labelOnTop="0"/>
-        <field name="races" labelOnTop="0"/>
-        <field name="tshirt" labelOnTop="0"/>
+        <field labelOnTop="0" name="10_distance"/>
+        <field labelOnTop="0" name="21_distance"/>
+        <field labelOnTop="0" name="5_distance"/>
+        <field labelOnTop="0" name="captain"/>
+        <field labelOnTop="0" name="captain_number"/>
+        <field labelOnTop="0" name="club"/>
+        <field labelOnTop="0" name="email"/>
+        <field labelOnTop="0" name="first_name"/>
+        <field labelOnTop="0" name="first_runner"/>
+        <field labelOnTop="0" name="instructions"/>
+        <field labelOnTop="0" name="last_name"/>
+        <field labelOnTop="0" name="last_runner"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="phone"/>
+        <field labelOnTop="0" name="position"/>
+        <field labelOnTop="0" name="races"/>
+        <field labelOnTop="0" name="tshirt"/>
       </labelOnTop>
       <widgets/>
       <conditionalstyles>
@@ -5187,7 +5160,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>first_name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="100000" refreshOnNotifyMessage="" geometry="Point" simplifyLocal="1" simplifyDrawingHints="0" type="vector" simplifyMaxScale="1" simplifyAlgorithm="0" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshEnabled="0" autoRefreshTime="0" minScale="1e+8" readOnly="0">
+    <maplayer autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" simplifyLocal="1" autoRefreshTime="0" readOnly="0" geometry="Point" labelsEnabled="1" minScale="1e+8" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" maxScale="100000" simplifyMaxScale="1" simplifyAlgorithm="0" simplifyDrawingHints="0">
       <extent>
         <xmin>2045937.50281219300813973</xmin>
         <ymin>-4020077.48741823574528098</ymin>
@@ -5244,7 +5217,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxz="0" minx="0" dimensions="2" maxx="0" crs="" maxy="0" miny="0" minz="0"/>
+          <spatial maxz="0" maxx="0" minx="0" crs="" miny="0" maxy="0" dimensions="2" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -5266,66 +5239,66 @@ def my_form_open(dialog, layer, feature):
       <renderer-v2 type="nullSymbol"/>
       <labeling type="simple">
         <settings>
-          <text-style fontWordSpacing="0" useSubstitutions="0" fontCapitals="0" isExpression="0" fontSizeUnit="Point" fontUnderline="0" previewBkgrdColor="#ffffff" fontFamily="Myriad Pro" fontSize="8.5" multilineHeight="1" fontItalic="0" namedStyle="Regular" fontLetterSpacing="0" fieldName="name" textColor="0,0,0,255" textOpacity="0.75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0" fontStrikeout="0" fontWeight="50">
-            <text-buffer bufferSizeUnits="MM" bufferOpacity="0.6" bufferNoFill="0" bufferDraw="1" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1.5" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <background shapeType="0" shapeSizeUnit="MM" shapeDraw="0" shapeJoinStyle="64" shapeOpacity="1" shapeSVGFile="" shapeOffsetUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetY="0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="8.5" fontCapitals="0" fontSizeUnit="Point" useSubstitutions="0" isExpression="0" fontItalic="0" fontStrikeout="0" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" fieldName="name" textOpacity="0.75" textColor="0,0,0,255" fontWeight="50" fontUnderline="0" multilineHeight="1" namedStyle="Regular" fontLetterSpacing="0" fontWordSpacing="0" blendMode="0">
+            <text-buffer bufferNoFill="0" bufferSize="1.5" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="1" bufferColor="255,255,255,255" bufferOpacity="0.6"/>
+            <background shapeOffsetUnit="MM" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiY="0" shapeType="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeDraw="0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiUnit="MM" shapeOpacity="1"/>
+            <shadow shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.7" shadowOffsetAngle="135" shadowRadius="1.5" shadowBlendMode="6" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100"/>
             <substitutions/>
           </text-style>
-          <text-format decimals="3" addDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="0" wrapChar="" placeDirectionSymbol="0" plussign="0" formatNumbers="0"/>
-          <placement placementFlags="2" offsetType="0" centroidWhole="0" repeatDistanceUnits="MM" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" dist="0" yOffset="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="5" placement="6" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" xOffset="0" fitInPolygonOnly="0" centroidInside="0" maxCurvedCharAngleOut="-20" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" rotationAngle="0"/>
-          <rendering fontLimitPixelSize="0" labelPerPart="0" obstacle="1" zIndex="0" obstacleFactor="0.4" displayAll="0" maxNumLabels="2000" fontMaxPixelSize="10000" upsidedownLabels="0" limitNumLabels="0" scaleMin="1" minFeatureSize="0" drawLabels="1" mergeLines="0" scaleVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3"/>
+          <text-format placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" decimals="3"/>
+          <placement quadOffset="4" offsetType="0" placementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="5" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceUnits="MM" offsetUnits="MapUnit" centroidWhole="0" maxCurvedCharAngleIn="20" centroidInside="0" xOffset="0" placement="6" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" yOffset="0" dist="0" distUnits="MM" repeatDistance="0"/>
+          <rendering displayAll="0" fontLimitPixelSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="0.4" labelPerPart="0" obstacle="1" scaleMin="1" limitNumLabels="0" maxNumLabels="2000" obstacleType="0" drawLabels="1" upsidedownLabels="0" fontMinPixelSize="3" minFeatureSize="0" scaleMax="10000000" scaleVisibility="0" zIndex="0"/>
           <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 height="15" lineSizeType="MM" opacity="1" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" backgroundAlpha="255" maxScaleDenominator="1e+8" diagramOrientation="Up" width="15" scaleDependency="Area" minimumSize="0" backgroundColor="#ffffff" enabled="0" barWidth="5" penColor="#000000" minScaleDenominator="100000" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penAlpha="255" penWidth="0" sizeType="MM">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" rotationOffset="270" penColor="#000000" backgroundAlpha="255" opacity="1" minScaleDenominator="100000" lineSizeType="MM" diagramOrientation="Up" barWidth="5" maxScaleDenominator="1e+8" minimumSize="0" width="15" height="15" scaleBasedVisibility="0" labelPlacementMethod="XHeight" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundColor="#ffffff">
           <fontProperties description="Arial,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" field="" label=""/>
+          <attribute label="" color="#000000" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="2" obstacle="0" zIndex="0" placement="0" showAll="1" priority="0">
+      <DiagramLayerSettings priority="0" dist="0" zIndex="0" showAll="1" linePlacementFlags="2" obstacle="0" placement="0">
         <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>
@@ -5334,8 +5307,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>
@@ -5344,8 +5317,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>
@@ -5354,8 +5327,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>
@@ -5364,8 +5337,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>
@@ -5374,8 +5347,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>
@@ -5384,8 +5357,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>
@@ -5394,8 +5367,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>
@@ -5404,8 +5377,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>
@@ -5414,74 +5387,74 @@ 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 name="" index="0" field="id"/>
-        <alias name="" index="1" field="osm_id"/>
-        <alias name="" index="2" field="name"/>
-        <alias name="" index="3" field="type"/>
-        <alias name="" index="4" field="z_order"/>
-        <alias name="" index="5" field="population"/>
-        <alias name="" index="6" field="label_x"/>
-        <alias name="" index="7" field="label_y"/>
-        <alias name="" index="8" field="label_rota"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="osm_id" index="1" name=""/>
+        <alias field="name" index="2" name=""/>
+        <alias field="type" index="3" name=""/>
+        <alias field="z_order" index="4" name=""/>
+        <alias field="population" index="5" name=""/>
+        <alias field="label_x" index="6" name=""/>
+        <alias field="label_y" index="7" name=""/>
+        <alias field="label_rota" index="8" name=""/>
       </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 field="id" expression="" applyOnUpdate="0"/>
+        <default field="osm_id" expression="" applyOnUpdate="0"/>
+        <default field="name" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="z_order" expression="" applyOnUpdate="0"/>
+        <default field="population" expression="" applyOnUpdate="0"/>
+        <default field="label_x" expression="" applyOnUpdate="0"/>
+        <default field="label_y" expression="" applyOnUpdate="0"/>
+        <default field="label_rota" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="id" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="osm_id" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="name" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="type" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="z_order" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="population" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="label_x" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="label_y" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="label_rota" notnull_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="osm_id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="z_order" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="population" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="label_x" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="label_y" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="label_rota" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="osm_id"/>
-        <constraint exp="" desc="" field="name"/>
-        <constraint exp="" desc="" field="type"/>
-        <constraint exp="" desc="" field="z_order"/>
-        <constraint exp="" desc="" field="population"/>
-        <constraint exp="" desc="" field="label_x"/>
-        <constraint exp="" desc="" field="label_y"/>
-        <constraint exp="" desc="" 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>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <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"/>
+          <column type="field" hidden="0" name="id" width="-1"/>
+          <column type="field" hidden="0" name="osm_id" width="-1"/>
+          <column type="field" hidden="0" name="name" width="-1"/>
+          <column type="field" hidden="0" name="type" width="-1"/>
+          <column type="field" hidden="0" name="z_order" width="-1"/>
+          <column type="field" hidden="0" name="population" width="-1"/>
+          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" hidden="0" name="label_x" width="-1"/>
+          <column type="field" hidden="0" name="label_y" width="-1"/>
+          <column type="field" hidden="0" name="label_rota" width="-1"/>
         </columns>
       </attributetableconfig>
       <editform tolerant="1">.</editform>
@@ -5508,26 +5481,26 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="label_rota" editable="1"/>
-        <field name="label_x" editable="1"/>
-        <field name="label_y" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="osm_id" editable="1"/>
-        <field name="population" editable="1"/>
-        <field name="type" editable="1"/>
-        <field name="z_order" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="label_rota"/>
+        <field editable="1" name="label_x"/>
+        <field editable="1" name="label_y"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="osm_id"/>
+        <field editable="1" name="population"/>
+        <field editable="1" name="type"/>
+        <field editable="1" name="z_order"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="label_rota" labelOnTop="0"/>
-        <field name="label_x" labelOnTop="0"/>
-        <field name="label_y" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="osm_id" labelOnTop="0"/>
-        <field name="population" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
-        <field name="z_order" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="label_rota"/>
+        <field labelOnTop="0" name="label_x"/>
+        <field labelOnTop="0" name="label_y"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="osm_id"/>
+        <field labelOnTop="0" name="population"/>
+        <field labelOnTop="0" name="type"/>
+        <field labelOnTop="0" name="z_order"/>
       </labelOnTop>
       <widgets/>
       <conditionalstyles>
@@ -5538,7 +5511,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="100000" refreshOnNotifyMessage="" geometry="Line" simplifyLocal="1" simplifyDrawingHints="0" type="vector" simplifyMaxScale="1" simplifyAlgorithm="0" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshEnabled="0" autoRefreshTime="0" minScale="1e+8" readOnly="0">
+    <maplayer autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" simplifyLocal="1" autoRefreshTime="0" readOnly="0" geometry="Line" labelsEnabled="1" minScale="1e+8" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" maxScale="100000" simplifyMaxScale="1" simplifyAlgorithm="0" simplifyDrawingHints="0">
       <extent>
         <xmin>18.3437671999999985</xmin>
         <ymin>-34.02801110000000051</ymin>
@@ -5595,7 +5568,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxz="0" minx="0" dimensions="2" maxx="0" crs="" maxy="0" miny="0" minz="0"/>
+          <spatial maxz="0" maxx="0" minx="0" crs="" miny="0" maxy="0" dimensions="2" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -5614,14 +5587,14 @@ def my_form_open(dialog, layer, feature):
         <map-layer-style name="default"/>
       </map-layer-style-manager>
       <auxiliaryLayer/>
-      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 symbollevels="0" type="RuleRenderer" enableorderby="0" forceraster="0">
         <rules key="{7f12d429-ae70-4c2d-a34a-eee5abbe2ad2}">
-          <rule filter="regexp_match( attribute( @atlas_feature, 'type' ), '^(residen|access)' ) AND regexp_match( &quot;highway&quot;, '^(primary|secondary|tertiary)' )" key="{f4eb265a-7df0-4880-ba8b-62fa5c664496}" symbol="0"/>
-          <rule filter="ELSE" key="{c37e51d1-6158-4d1c-800c-b9f70f8487d8}" symbol="1"/>
+          <rule symbol="0" filter="regexp_match( attribute( @atlas_feature, 'type' ), '^(residen|access)' ) AND regexp_match( &quot;highway&quot;, '^(primary|secondary|tertiary)' )" key="{f4eb265a-7df0-4880-ba8b-62fa5c664496}"/>
+          <rule symbol="1" filter="ELSE" key="{c37e51d1-6158-4d1c-800c-b9f70f8487d8}"/>
         </rules>
         <symbols>
-          <symbol name="0" type="line" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+          <symbol type="line" clip_to_extent="1" name="0" alpha="1">
+            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -5639,15 +5612,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 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" type="line" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="0">
+          <symbol type="line" clip_to_extent="1" name="1" alpha="1">
+            <layer class="SimpleLine" enabled="0" pass="0" locked="0">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -5665,9 +5638,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 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>
@@ -5676,61 +5649,61 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings>
-          <text-style fontWordSpacing="0" useSubstitutions="0" fontCapitals="0" isExpression="1" fontSizeUnit="Point" fontUnderline="0" previewBkgrdColor="#ffffff" fontFamily="Myriad Pro" fontSize="7" multilineHeight="1" fontItalic="0" namedStyle="Regular" fontLetterSpacing="0" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" textColor="0,0,0,255" textOpacity="0.8" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0" fontStrikeout="0" fontWeight="50">
-            <text-buffer bufferSizeUnits="MM" bufferOpacity="0.6" bufferNoFill="0" bufferDraw="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <background shapeType="0" shapeSizeUnit="MM" shapeDraw="0" shapeJoinStyle="64" shapeOpacity="1" shapeSVGFile="" shapeOffsetUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetY="0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="7" fontCapitals="0" fontSizeUnit="Point" useSubstitutions="0" isExpression="1" fontItalic="0" fontStrikeout="0" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" textOpacity="0.8" textColor="0,0,0,255" fontWeight="50" fontUnderline="0" multilineHeight="1" namedStyle="Regular" fontLetterSpacing="0" fontWordSpacing="0" blendMode="0">
+            <text-buffer bufferNoFill="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="1" bufferColor="255,255,255,255" bufferOpacity="0.6"/>
+            <background shapeOffsetUnit="MM" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiY="0" shapeType="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeDraw="0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiUnit="MM" shapeOpacity="1"/>
+            <shadow shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.7" shadowOffsetAngle="135" shadowRadius="1.5" shadowBlendMode="6" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100"/>
             <substitutions/>
           </text-style>
-          <text-format decimals="3" addDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="0" wrapChar="" placeDirectionSymbol="0" plussign="0" formatNumbers="0"/>
-          <placement placementFlags="4" offsetType="0" centroidWhole="0" repeatDistanceUnits="MapUnit" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" dist="0" yOffset="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="3" placement="3" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" xOffset="0" fitInPolygonOnly="0" centroidInside="0" maxCurvedCharAngleOut="-20" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" rotationAngle="0"/>
-          <rendering fontLimitPixelSize="0" labelPerPart="0" obstacle="1" zIndex="0" obstacleFactor="0.5600000000000001" displayAll="0" maxNumLabels="2000" fontMaxPixelSize="10000" upsidedownLabels="0" limitNumLabels="0" scaleMin="1" minFeatureSize="5" drawLabels="1" mergeLines="1" scaleVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3"/>
+          <text-format placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" decimals="3"/>
+          <placement quadOffset="4" offsetType="0" placementFlags="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="3" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceUnits="MapUnit" offsetUnits="MapUnit" centroidWhole="0" maxCurvedCharAngleIn="20" centroidInside="0" xOffset="0" placement="3" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" yOffset="0" dist="0" distUnits="MM" repeatDistance="0"/>
+          <rendering displayAll="0" fontLimitPixelSize="0" fontMaxPixelSize="10000" mergeLines="1" obstacleFactor="0.5600000000000001" labelPerPart="0" obstacle="1" scaleMin="1" limitNumLabels="0" maxNumLabels="2000" obstacleType="0" drawLabels="1" upsidedownLabels="0" fontMinPixelSize="3" minFeatureSize="5" scaleMax="10000000" scaleVisibility="0" zIndex="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="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="expression" value="CASE &#xa;WHEN regexp_match( &quot;name&quot;, '(Somerset Road|Port Road|Ebenezer|Victoria|Clarens|Promenade|Vlei|Fritz Sonnenberg|Granger Bay Boulevard|Norfolk)' ) THEN 10&#xa;ELSE 4&#xa;END" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="Priority">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value="CASE &#xa;WHEN regexp_match( &quot;name&quot;, '(Somerset Road|Port Road|Ebenezer|Victoria|Clarens|Promenade|Vlei|Fritz Sonnenberg|Granger Bay Boulevard|Norfolk)' ) THEN 10&#xa;ELSE 4&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="Show" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="''" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="Show">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value="''"/>
+                  <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 ('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>
@@ -5740,25 +5713,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 height="15" lineSizeType="MM" opacity="1" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" backgroundAlpha="255" maxScaleDenominator="1e+8" diagramOrientation="Up" width="15" scaleDependency="Area" minimumSize="0" backgroundColor="#ffffff" enabled="0" barWidth="5" penColor="#000000" minScaleDenominator="100000" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penAlpha="255" penWidth="0" sizeType="MM">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" rotationOffset="270" penColor="#000000" backgroundAlpha="255" opacity="1" minScaleDenominator="100000" lineSizeType="MM" diagramOrientation="Up" barWidth="5" maxScaleDenominator="1e+8" minimumSize="0" width="15" height="15" scaleBasedVisibility="0" labelPlacementMethod="XHeight" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundColor="#ffffff">
           <fontProperties description="Arial,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" field="" label=""/>
+          <attribute label="" color="#000000" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="2" obstacle="0" zIndex="0" placement="2" showAll="1" priority="0">
+      <DiagramLayerSettings priority="0" dist="0" zIndex="0" showAll="1" linePlacementFlags="2" obstacle="0" placement="2">
         <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>
@@ -5767,8 +5740,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>
@@ -5777,8 +5750,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>
@@ -5822,8 +5795,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>
@@ -5879,96 +5852,96 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="osm_id"/>
-        <alias name="" index="1" field="name"/>
-        <alias name="" index="2" field="highway"/>
-        <alias name="" index="3" field="waterway"/>
-        <alias name="" index="4" field="aerialway"/>
-        <alias name="" index="5" field="barrier"/>
-        <alias name="" index="6" field="man_made"/>
-        <alias name="" index="7" field="z_order"/>
-        <alias name="" index="8" field="other_tags"/>
-        <alias name="" index="9" field="never_show"/>
-        <alias name="" index="10" field="label_x"/>
-        <alias name="" index="11" field="label_y"/>
-        <alias name="" index="12" field="label_rota"/>
-        <alias name="" index="13" field="always_sho"/>
-        <alias name="" index="14" field="resident_a"/>
+        <alias field="osm_id" index="0" name=""/>
+        <alias field="name" index="1" name=""/>
+        <alias field="highway" index="2" name=""/>
+        <alias field="waterway" index="3" name=""/>
+        <alias field="aerialway" index="4" name=""/>
+        <alias field="barrier" index="5" name=""/>
+        <alias field="man_made" index="6" name=""/>
+        <alias field="z_order" index="7" name=""/>
+        <alias field="other_tags" index="8" name=""/>
+        <alias field="never_show" index="9" name=""/>
+        <alias field="label_x" index="10" name=""/>
+        <alias field="label_y" index="11" name=""/>
+        <alias field="label_rota" index="12" name=""/>
+        <alias field="always_sho" index="13" name=""/>
+        <alias field="resident_a" index="14" name=""/>
       </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 field="osm_id" expression="" applyOnUpdate="0"/>
+        <default field="name" expression="" applyOnUpdate="0"/>
+        <default field="highway" expression="" applyOnUpdate="0"/>
+        <default field="waterway" expression="" applyOnUpdate="0"/>
+        <default field="aerialway" expression="" applyOnUpdate="0"/>
+        <default field="barrier" expression="" applyOnUpdate="0"/>
+        <default field="man_made" expression="" applyOnUpdate="0"/>
+        <default field="z_order" expression="" applyOnUpdate="0"/>
+        <default field="other_tags" expression="" applyOnUpdate="0"/>
+        <default field="never_show" expression="" applyOnUpdate="0"/>
+        <default field="label_x" expression="" applyOnUpdate="0"/>
+        <default field="label_y" expression="" applyOnUpdate="0"/>
+        <default field="label_rota" expression="" applyOnUpdate="0"/>
+        <default field="always_sho" expression="" applyOnUpdate="0"/>
+        <default field="resident_a" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="osm_id" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="name" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="highway" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="waterway" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="aerialway" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="barrier" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="man_made" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="z_order" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="other_tags" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="never_show" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="label_x" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="label_y" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="label_rota" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="always_sho" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="resident_a" notnull_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="osm_id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="highway" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="waterway" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="aerialway" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="barrier" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="man_made" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="z_order" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="other_tags" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="never_show" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="label_x" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="label_y" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="label_rota" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="always_sho" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="resident_a" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="osm_id"/>
-        <constraint exp="" desc="" field="name"/>
-        <constraint exp="" desc="" field="highway"/>
-        <constraint exp="" desc="" field="waterway"/>
-        <constraint exp="" desc="" field="aerialway"/>
-        <constraint exp="" desc="" field="barrier"/>
-        <constraint exp="" desc="" field="man_made"/>
-        <constraint exp="" desc="" field="z_order"/>
-        <constraint exp="" desc="" field="other_tags"/>
-        <constraint exp="" desc="" field="never_show"/>
-        <constraint exp="" desc="" field="label_x"/>
-        <constraint exp="" desc="" field="label_y"/>
-        <constraint exp="" desc="" field="label_rota"/>
-        <constraint exp="" desc="" field="always_sho"/>
-        <constraint exp="" desc="" 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>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;osm_id&quot;" actionWidgetStyle="dropDown" sortOrder="1">
+      <attributetableconfig sortExpression="&quot;osm_id&quot;" sortOrder="1" actionWidgetStyle="dropDown">
         <columns>
-          <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"/>
+          <column type="field" hidden="0" name="osm_id" width="-1"/>
+          <column type="field" hidden="0" name="name" width="-1"/>
+          <column type="field" hidden="0" name="z_order" width="-1"/>
+          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" hidden="0" name="highway" width="-1"/>
+          <column type="field" hidden="0" name="waterway" width="-1"/>
+          <column type="field" hidden="0" name="aerialway" width="-1"/>
+          <column type="field" hidden="0" name="barrier" width="-1"/>
+          <column type="field" hidden="0" name="man_made" width="-1"/>
+          <column type="field" hidden="0" name="other_tags" width="-1"/>
+          <column type="field" hidden="0" name="never_show" width="-1"/>
+          <column type="field" hidden="0" name="label_x" width="-1"/>
+          <column type="field" hidden="0" name="label_y" width="-1"/>
+          <column type="field" hidden="0" name="label_rota" width="-1"/>
+          <column type="field" hidden="0" name="always_sho" width="-1"/>
+          <column type="field" hidden="0" name="resident_a" width="-1"/>
         </columns>
       </attributetableconfig>
       <editform tolerant="1">.</editform>
@@ -5995,74 +5968,74 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="aerialway" editable="1"/>
-        <field name="always_sho" editable="1"/>
-        <field name="barrier" editable="1"/>
-        <field name="highway" editable="1"/>
-        <field name="label_rota" editable="1"/>
-        <field name="label_x" editable="1"/>
-        <field name="label_y" editable="1"/>
-        <field name="man_made" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="never_show" editable="1"/>
-        <field name="orig_access" editable="0"/>
-        <field name="orig_always_sho" editable="0"/>
-        <field name="orig_bridge" editable="0"/>
-        <field name="orig_c_z_order" editable="0"/>
-        <field name="orig_class" editable="0"/>
-        <field name="orig_id" editable="0"/>
-        <field name="orig_label_rota" editable="0"/>
-        <field name="orig_label_x" editable="0"/>
-        <field name="orig_label_y" editable="0"/>
-        <field name="orig_name" editable="0"/>
-        <field name="orig_oneway" editable="0"/>
-        <field name="orig_ref" editable="0"/>
-        <field name="orig_service" editable="0"/>
-        <field name="orig_show" editable="0"/>
-        <field name="orig_tunnel" editable="0"/>
-        <field name="orig_type" editable="0"/>
-        <field name="orig_z_order" editable="0"/>
-        <field name="osm_id" editable="1"/>
-        <field name="other_tags" editable="1"/>
-        <field name="resident_a" editable="1"/>
-        <field name="resident_access" editable="1"/>
-        <field name="waterway" editable="1"/>
-        <field name="z_order" editable="1"/>
+        <field editable="1" name="aerialway"/>
+        <field editable="1" name="always_sho"/>
+        <field editable="1" name="barrier"/>
+        <field editable="1" name="highway"/>
+        <field editable="1" name="label_rota"/>
+        <field editable="1" name="label_x"/>
+        <field editable="1" name="label_y"/>
+        <field editable="1" name="man_made"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="never_show"/>
+        <field editable="0" name="orig_access"/>
+        <field editable="0" name="orig_always_sho"/>
+        <field editable="0" name="orig_bridge"/>
+        <field editable="0" name="orig_c_z_order"/>
+        <field editable="0" name="orig_class"/>
+        <field editable="0" name="orig_id"/>
+        <field editable="0" name="orig_label_rota"/>
+        <field editable="0" name="orig_label_x"/>
+        <field editable="0" name="orig_label_y"/>
+        <field editable="0" name="orig_name"/>
+        <field editable="0" name="orig_oneway"/>
+        <field editable="0" name="orig_ref"/>
+        <field editable="0" name="orig_service"/>
+        <field editable="0" name="orig_show"/>
+        <field editable="0" name="orig_tunnel"/>
+        <field editable="0" name="orig_type"/>
+        <field editable="0" name="orig_z_order"/>
+        <field editable="1" name="osm_id"/>
+        <field editable="1" name="other_tags"/>
+        <field editable="1" name="resident_a"/>
+        <field editable="1" name="resident_access"/>
+        <field editable="1" name="waterway"/>
+        <field editable="1" name="z_order"/>
       </editable>
       <labelOnTop>
-        <field name="aerialway" labelOnTop="0"/>
-        <field name="always_sho" labelOnTop="0"/>
-        <field name="barrier" labelOnTop="0"/>
-        <field name="highway" labelOnTop="0"/>
-        <field name="label_rota" labelOnTop="0"/>
-        <field name="label_x" labelOnTop="0"/>
-        <field name="label_y" labelOnTop="0"/>
-        <field name="man_made" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="never_show" labelOnTop="0"/>
-        <field name="orig_access" labelOnTop="0"/>
-        <field name="orig_always_sho" labelOnTop="0"/>
-        <field name="orig_bridge" labelOnTop="0"/>
-        <field name="orig_c_z_order" labelOnTop="0"/>
-        <field name="orig_class" labelOnTop="0"/>
-        <field name="orig_id" labelOnTop="0"/>
-        <field name="orig_label_rota" labelOnTop="0"/>
-        <field name="orig_label_x" labelOnTop="0"/>
-        <field name="orig_label_y" labelOnTop="0"/>
-        <field name="orig_name" labelOnTop="0"/>
-        <field name="orig_oneway" labelOnTop="0"/>
-        <field name="orig_ref" labelOnTop="0"/>
-        <field name="orig_service" labelOnTop="0"/>
-        <field name="orig_show" labelOnTop="0"/>
-        <field name="orig_tunnel" labelOnTop="0"/>
-        <field name="orig_type" labelOnTop="0"/>
-        <field name="orig_z_order" labelOnTop="0"/>
-        <field name="osm_id" labelOnTop="0"/>
-        <field name="other_tags" labelOnTop="0"/>
-        <field name="resident_a" labelOnTop="0"/>
-        <field name="resident_access" labelOnTop="0"/>
-        <field name="waterway" labelOnTop="0"/>
-        <field name="z_order" labelOnTop="0"/>
+        <field labelOnTop="0" name="aerialway"/>
+        <field labelOnTop="0" name="always_sho"/>
+        <field labelOnTop="0" name="barrier"/>
+        <field labelOnTop="0" name="highway"/>
+        <field labelOnTop="0" name="label_rota"/>
+        <field labelOnTop="0" name="label_x"/>
+        <field labelOnTop="0" name="label_y"/>
+        <field labelOnTop="0" name="man_made"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="never_show"/>
+        <field labelOnTop="0" name="orig_access"/>
+        <field labelOnTop="0" name="orig_always_sho"/>
+        <field labelOnTop="0" name="orig_bridge"/>
+        <field labelOnTop="0" name="orig_c_z_order"/>
+        <field labelOnTop="0" name="orig_class"/>
+        <field labelOnTop="0" name="orig_id"/>
+        <field labelOnTop="0" name="orig_label_rota"/>
+        <field labelOnTop="0" name="orig_label_x"/>
+        <field labelOnTop="0" name="orig_label_y"/>
+        <field labelOnTop="0" name="orig_name"/>
+        <field labelOnTop="0" name="orig_oneway"/>
+        <field labelOnTop="0" name="orig_ref"/>
+        <field labelOnTop="0" name="orig_service"/>
+        <field labelOnTop="0" name="orig_show"/>
+        <field labelOnTop="0" name="orig_tunnel"/>
+        <field labelOnTop="0" name="orig_type"/>
+        <field labelOnTop="0" name="orig_z_order"/>
+        <field labelOnTop="0" name="osm_id"/>
+        <field labelOnTop="0" name="other_tags"/>
+        <field labelOnTop="0" name="resident_a"/>
+        <field labelOnTop="0" name="resident_access"/>
+        <field labelOnTop="0" name="waterway"/>
+        <field labelOnTop="0" name="z_order"/>
       </labelOnTop>
       <widgets>
         <widget name="always_show">
@@ -6116,15 +6089,15 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" refreshOnNotifyMessage="" geometry="Point" simplifyLocal="1" simplifyDrawingHints="0" type="vector" simplifyMaxScale="1" simplifyAlgorithm="0" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshEnabled="0" autoRefreshTime="0" minScale="1e+8" readOnly="0">
+    <maplayer autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" simplifyLocal="1" autoRefreshTime="0" readOnly="0" geometry="Point" labelsEnabled="1" minScale="1e+8" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" maxScale="0" simplifyMaxScale="1" simplifyAlgorithm="0" simplifyDrawingHints="0">
       <extent>
         <xmin>2048104.86252160812728107</xmin>
         <ymin>-4016499.04737948765978217</ymin>
         <xmax>2050068.23129932186566293</xmax>
-        <ymax>-4015303.68345076218247414</ymax>
+        <ymax>-4015294.2153964783065021</ymax>
       </extent>
       <id>poi_labels_59d3855d_466f_419c_8119_94b9ad7c140d</id>
-      <datasource>../../../poi_labels.shp</datasource>
+      <datasource>./poi_labels.shp</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -6173,7 +6146,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxz="0" minx="0" dimensions="2" maxx="0" crs="" maxy="0" miny="0" minz="0"/>
+          <spatial maxz="0" maxx="0" minx="0" crs="" miny="0" maxy="0" dimensions="2" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -6192,18 +6165,18 @@ def my_form_open(dialog, layer, feature):
         <map-layer-style name="default"/>
       </map-layer-style-manager>
       <auxiliaryLayer/>
-      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 symbollevels="0" type="RuleRenderer" enableorderby="0" forceraster="0">
         <rules key="{0927a9cd-bbb2-44ea-811b-fdbcb767a09a}">
-          <rule filter="regexp_match( &quot;type&quot;, '(start|finish)')" key="{efda7615-994b-459d-a657-ee8185286b0b}" symbol="0"/>
-          <rule filter="&quot;type&quot; = 'toilets'" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}" symbol="1"/>
-          <rule filter="&quot;type&quot; = 'togbag'" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}" symbol="2"/>
-          <rule filter=" &quot;type&quot; = 'closure'" key="{67af661e-65f1-44a7-9993-d5a668077b33}" symbol="3"/>
-          <rule filter="&quot;type&quot; = 'myciti'" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}" symbol="4"/>
-          <rule filter="&quot;type&quot; = 'parking'" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}" symbol="5"/>
+          <rule symbol="0" filter="regexp_match( &quot;type&quot;, '(start|finish)')" key="{efda7615-994b-459d-a657-ee8185286b0b}"/>
+          <rule symbol="1" filter="&quot;type&quot; = 'toilets'" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}"/>
+          <rule symbol="2" filter="&quot;type&quot; = 'togbag'" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}"/>
+          <rule symbol="3" filter=" &quot;type&quot; = 'closure'" key="{67af661e-65f1-44a7-9993-d5a668077b33}"/>
+          <rule symbol="4" filter="&quot;type&quot; = 'myciti'" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}"/>
+          <rule symbol="5" filter="&quot;type&quot; = 'parking'" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}"/>
         </rules>
         <symbols>
-          <symbol name="0" type="marker" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
+          <symbol type="marker" clip_to_extent="1" name="0" alpha="1">
+            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
               <prop v="0" k="angle"/>
               <prop v="0,0,0,255" k="color"/>
               <prop v="1" k="horizontal_anchor_point"/>
@@ -6224,17 +6197,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 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" type="marker" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="SvgMarker" pass="0" enabled="1">
+          <symbol type="marker" clip_to_extent="1" name="1" alpha="1">
+            <layer class="SvgMarker" enabled="1" pass="0" locked="0">
               <prop v="0" k="angle"/>
-              <prop v="0,255,157,255" k="color"/>
+              <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"/>
@@ -6252,25 +6225,25 @@ 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 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" type="marker" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="SvgMarker" pass="0" enabled="1">
+          <symbol type="marker" clip_to_extent="1" name="2" alpha="1">
+            <layer class="SvgMarker" enabled="1" pass="0" locked="0">
               <prop v="0" k="angle"/>
-              <prop v="255,255,255,255" k="color"/>
+              <prop v="0,0,0,255" k="color"/>
               <prop v="0" k="fixedAspectRatio"/>
               <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="../gym-bag.svg" k="name"/>
+              <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" k="outline_width"/>
+              <prop v="0.2" k="outline_width"/>
               <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
               <prop v="MM" k="outline_width_unit"/>
               <prop v="diameter" k="scale_method"/>
@@ -6280,31 +6253,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="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 '#91d337'&#xa;ELSE&#xa;'#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>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" type="marker" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="SvgMarker" pass="0" enabled="1">
+          <symbol type="marker" clip_to_extent="1" name="3" alpha="1">
+            <layer class="SvgMarker" enabled="1" pass="0" 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="../road_closure.svg" k="name"/>
+              <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"/>
@@ -6319,15 +6292,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 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" type="marker" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="SvgMarker" pass="0" enabled="1">
+          <symbol type="marker" clip_to_extent="1" name="4" alpha="1">
+            <layer class="SvgMarker" enabled="1" pass="0" locked="0">
               <prop v="0" k="angle"/>
               <prop v="0,12,254,255" k="color"/>
               <prop v="0" k="fixedAspectRatio"/>
@@ -6411,13 +6384,13 @@ def my_form_open(dialog, layer, feature):
               </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>
             </layer>
-            <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
+            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
               <prop v="0" k="angle"/>
               <prop v="255,0,0,0" k="color"/>
               <prop v="1" k="horizontal_anchor_point"/>
@@ -6438,15 +6411,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 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="5" type="marker" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="SvgMarker" pass="0" enabled="1">
+          <symbol type="marker" clip_to_extent="1" name="5" alpha="1">
+            <layer class="SvgMarker" enabled="1" pass="0" locked="0">
               <prop v="0" k="angle"/>
               <prop v="43,153,41,255" k="color"/>
               <prop v="0" k="fixedAspectRatio"/>
@@ -6466,9 +6439,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 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>
@@ -6477,45 +6450,45 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings>
-          <text-style fontWordSpacing="0" useSubstitutions="0" fontCapitals="0" isExpression="0" fontSizeUnit="Point" fontUnderline="0" previewBkgrdColor="#ffffff" fontFamily="Myriad Pro" fontSize="10" multilineHeight="1" fontItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fieldName="name" textColor="0,0,0,255" textOpacity="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0" fontStrikeout="0" fontWeight="63">
-            <text-buffer bufferSizeUnits="MM" bufferOpacity="0.75" bufferNoFill="1" bufferDraw="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="2" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <background shapeType="0" shapeSizeUnit="MM" shapeDraw="0" shapeJoinStyle="64" shapeOpacity="1" shapeSVGFile="" shapeOffsetUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetY="0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" fontCapitals="0" fontSizeUnit="Point" useSubstitutions="0" isExpression="0" fontItalic="0" fontStrikeout="0" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" fieldName="name" textOpacity="0.8" textColor="0,0,0,255" fontWeight="63" fontUnderline="0" multilineHeight="1" namedStyle="Semibold" fontLetterSpacing="0" fontWordSpacing="0" blendMode="0">
+            <text-buffer bufferNoFill="1" bufferSize="2" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="1" bufferColor="255,255,255,255" bufferOpacity="0.7"/>
+            <background shapeOffsetUnit="MM" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiY="0" shapeType="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeDraw="0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiUnit="MM" shapeOpacity="1"/>
+            <shadow shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.7" shadowOffsetAngle="135" shadowRadius="1.5" shadowBlendMode="6" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100"/>
             <substitutions/>
           </text-style>
-          <text-format decimals="3" addDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="3" wrapChar="" placeDirectionSymbol="0" plussign="0" formatNumbers="0"/>
-          <placement placementFlags="10" offsetType="0" centroidWhole="0" repeatDistanceUnits="MM" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" dist="2" yOffset="0" offsetUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="10" placement="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" xOffset="0" fitInPolygonOnly="0" centroidInside="0" maxCurvedCharAngleOut="-25" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" rotationAngle="0"/>
-          <rendering fontLimitPixelSize="0" labelPerPart="0" obstacle="1" zIndex="10" obstacleFactor="1.8" displayAll="1" maxNumLabels="2000" fontMaxPixelSize="10000" upsidedownLabels="0" limitNumLabels="0" scaleMin="0" minFeatureSize="0" drawLabels="1" mergeLines="0" scaleVisibility="0" obstacleType="0" scaleMax="0" fontMinPixelSize="3"/>
+          <text-format placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="3" decimals="3"/>
+          <placement quadOffset="4" offsetType="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="10" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceUnits="MM" offsetUnits="MM" centroidWhole="0" maxCurvedCharAngleIn="25" centroidInside="0" xOffset="0" placement="0" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" yOffset="0" dist="3" distUnits="MM" repeatDistance="0"/>
+          <rendering displayAll="1" fontLimitPixelSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1.8" labelPerPart="0" obstacle="1" scaleMin="0" limitNumLabels="0" maxNumLabels="2000" obstacleType="0" drawLabels="1" upsidedownLabels="0" fontMinPixelSize="3" minFeatureSize="0" scaleMax="0" scaleVisibility="0" zIndex="10"/>
           <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 height="15" lineSizeType="MM" opacity="1" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" backgroundAlpha="255" maxScaleDenominator="1e+8" diagramOrientation="Up" width="15" scaleDependency="Area" minimumSize="0" backgroundColor="#ffffff" enabled="0" barWidth="5" penColor="#000000" minScaleDenominator="0" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penAlpha="255" penWidth="0" sizeType="MM">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" rotationOffset="270" penColor="#000000" backgroundAlpha="255" opacity="1" minScaleDenominator="0" lineSizeType="MM" diagramOrientation="Up" barWidth="5" maxScaleDenominator="1e+8" minimumSize="0" width="15" height="15" scaleBasedVisibility="0" labelPlacementMethod="XHeight" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundColor="#ffffff">
           <fontProperties description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0" style="0"/>
-          <attribute color="#000000" field="" label=""/>
+          <attribute label="" color="#000000" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="18" obstacle="0" zIndex="0" placement="0" showAll="1" priority="0">
+      <DiagramLayerSettings priority="0" dist="0" zIndex="0" showAll="1" linePlacementFlags="18" obstacle="0" placement="0">
         <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>
@@ -6550,41 +6523,41 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="type"/>
-        <alias name="" index="2" field="name"/>
-        <alias name="" index="3" field="distance"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="type" index="1" name=""/>
+        <alias field="name" index="2" name=""/>
+        <alias field="distance" index="3" name=""/>
       </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 field="id" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="name" expression="" applyOnUpdate="0"/>
+        <default field="distance" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="id" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="type" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="name" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="distance" notnull_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="distance" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="type"/>
-        <constraint exp="" desc="" field="name"/>
-        <constraint exp="" desc="" field="distance"/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="name" exp=""/>
+        <constraint desc="" field="distance" exp=""/>
       </constraintExpressions>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;type&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;type&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <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"/>
+          <column type="field" hidden="0" name="id" width="-1"/>
+          <column type="field" hidden="0" name="type" width="-1"/>
+          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" hidden="0" name="name" width="-1"/>
+          <column type="field" hidden="0" name="distance" width="-1"/>
         </columns>
       </attributetableconfig>
       <editform tolerant="1"></editform>
@@ -6611,16 +6584,16 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="distance" editable="1"/>
-        <field name="id" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="1" name="distance"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field name="distance" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="distance"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <widgets/>
       <conditionalstyles>
@@ -6631,7 +6604,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" refreshOnNotifyMessage="" geometry="Polygon" simplifyLocal="1" simplifyDrawingHints="1" type="vector" simplifyMaxScale="1" simplifyAlgorithm="0" labelsEnabled="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshEnabled="0" autoRefreshTime="0" minScale="1e+8" readOnly="0">
+    <maplayer autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" simplifyLocal="1" autoRefreshTime="0" readOnly="0" geometry="Polygon" labelsEnabled="0" minScale="1e+8" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" maxScale="0" simplifyMaxScale="1" simplifyAlgorithm="0" simplifyDrawingHints="1">
       <extent>
         <xmin>2045286.68750100489705801</xmin>
         <ymin>-4019650.19606142397969961</ymin>
@@ -6688,7 +6661,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxz="0" minx="0" dimensions="2" maxx="0" crs="" maxy="0" miny="0" minz="0"/>
+          <spatial maxz="0" maxx="0" minx="0" crs="" miny="0" maxy="0" dimensions="2" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -6707,10 +6680,10 @@ def my_form_open(dialog, layer, feature):
         <map-layer-style name="default"/>
       </map-layer-style-manager>
       <auxiliaryLayer/>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 symbollevels="0" type="singleSymbol" enableorderby="0" forceraster="0">
         <symbols>
-          <symbol name="0" type="fill" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="LinePatternFill" pass="0" enabled="1">
+          <symbol type="fill" clip_to_extent="1" name="0" alpha="1">
+            <layer class="LinePatternFill" enabled="1" pass="0" locked="0">
               <prop v="135" k="angle"/>
               <prop v="211,134,33,255" k="color"/>
               <prop v="2" k="distance"/>
@@ -6726,13 +6699,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 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" type="line" alpha="1" clip_to_extent="1">
-                <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+              <symbol type="line" clip_to_extent="1" name="@0@0" alpha="1">
+                <layer class="SimpleLine" enabled="1" pass="0" locked="0">
                   <prop v="square" k="capstyle"/>
                   <prop v="5;2" k="customdash"/>
                   <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -6750,15 +6723,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 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 locked="0" class="SimpleFill" pass="0" enabled="1">
+            <layer class="SimpleFill" enabled="1" pass="0" 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"/>
@@ -6772,9 +6745,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 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>
@@ -6784,26 +6757,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 height="15" lineSizeType="MM" opacity="1" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" backgroundAlpha="255" maxScaleDenominator="1e+8" diagramOrientation="Up" width="15" scaleDependency="Area" minimumSize="0" backgroundColor="#ffffff" enabled="0" barWidth="5" penColor="#000000" minScaleDenominator="0" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penAlpha="255" penWidth="0" sizeType="MM">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" rotationOffset="270" penColor="#000000" backgroundAlpha="255" opacity="1" minScaleDenominator="0" lineSizeType="MM" diagramOrientation="Up" barWidth="5" maxScaleDenominator="1e+8" minimumSize="0" width="15" height="15" scaleBasedVisibility="0" labelPlacementMethod="XHeight" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundColor="#ffffff">
           <fontProperties description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0" style="0"/>
-          <attribute color="#000000" field="" label=""/>
+          <attribute label="" color="#000000" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="18" obstacle="0" zIndex="0" placement="1" showAll="1" priority="0">
+      <DiagramLayerSettings priority="0" dist="0" zIndex="0" showAll="1" linePlacementFlags="18" obstacle="0" placement="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>
@@ -6815,13 +6788,13 @@ def my_form_open(dialog, layer, feature):
       <constraints/>
       <constraintExpressions/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <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"/>
+          <column type="field" hidden="0" name="id" width="-1"/>
+          <column type="field" hidden="0" name="type" width="431"/>
+          <column type="actions" hidden="1" width="-1"/>
         </columns>
       </attributetableconfig>
       <editform tolerant="1"></editform>
@@ -6848,12 +6821,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <widgets/>
       <conditionalstyles>
@@ -6864,7 +6837,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" refreshOnNotifyMessage="" geometry="Line" simplifyLocal="1" simplifyDrawingHints="1" type="vector" simplifyMaxScale="1" simplifyAlgorithm="0" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshEnabled="0" autoRefreshTime="0" minScale="1e+8" readOnly="0">
+    <maplayer autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" simplifyLocal="1" autoRefreshTime="0" readOnly="0" geometry="Line" labelsEnabled="1" minScale="1e+8" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" maxScale="0" simplifyMaxScale="1" simplifyAlgorithm="0" simplifyDrawingHints="1">
       <extent>
         <xmin>2045527.88145093410275877</xmin>
         <ymin>-4021539.35817469004541636</ymin>
@@ -6921,7 +6894,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxz="0" minx="0" dimensions="2" maxx="0" crs="" maxy="0" miny="0" minz="0"/>
+          <spatial maxz="0" maxx="0" minx="0" crs="" miny="0" maxy="0" dimensions="2" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -6940,15 +6913,15 @@ def my_form_open(dialog, layer, feature):
         <map-layer-style name="default"/>
       </map-layer-style-manager>
       <auxiliaryLayer/>
-      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 symbollevels="0" type="RuleRenderer" enableorderby="0" forceraster="0">
         <rules key="{57366f52-c504-4c9a-800f-dcbf1d415bf6}">
-          <rule filter="&quot;status&quot; = 'closure'" key="{3d527c2d-2e74-4cfa-bc4b-b23a84bd2b64}" symbol="0" label="Road Closures"/>
-          <rule filter="&quot;status&quot; = 'one-way'" key="{15afbf65-f71f-4335-906e-79a74c987d9a}" symbol="1" label="One-Way"/>
-          <rule filter="&quot;status&quot; = 'open'" key="{1c49b105-b991-480a-b221-afb9009498f0}" symbol="2" label="Road Open"/>
+          <rule label="Road Closures" symbol="0" filter="&quot;status&quot; = 'closure'" key="{3d527c2d-2e74-4cfa-bc4b-b23a84bd2b64}"/>
+          <rule label="One-Way" symbol="1" filter="&quot;status&quot; = 'one-way'" key="{15afbf65-f71f-4335-906e-79a74c987d9a}"/>
+          <rule label="Road Open" symbol="2" filter="&quot;status&quot; = 'open'" key="{1c49b105-b991-480a-b221-afb9009498f0}"/>
         </rules>
         <symbols>
-          <symbol name="0" type="line" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+          <symbol type="line" clip_to_extent="1" name="0" alpha="1">
+            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -6966,26 +6939,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="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" type="line" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+          <symbol type="line" clip_to_extent="1" name="1" alpha="1">
+            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -7003,24 +6976,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="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 locked="0" class="MarkerLine" pass="0" enabled="1">
+            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
               <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"/>
@@ -7034,19 +7007,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="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" type="marker" alpha="1" clip_to_extent="1">
-                <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
+              <symbol type="marker" clip_to_extent="1" name="@1@1" alpha="1">
+                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
                   <prop v="0" k="angle"/>
                   <prop v="0,255,0,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -7067,23 +7040,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="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" type="line" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+          <symbol type="line" clip_to_extent="1" name="2" alpha="1">
+            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -7101,20 +7074,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="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>
@@ -7123,45 +7096,45 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings>
-          <text-style fontWordSpacing="0" useSubstitutions="0" fontCapitals="0" isExpression="0" fontSizeUnit="Point" fontUnderline="0" previewBkgrdColor="#ffffff" fontFamily="Myriad Pro" fontSize="9" multilineHeight="1" fontItalic="0" namedStyle="Regular" fontLetterSpacing="0" fieldName="times" textColor="0,0,0,255" textOpacity="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0" fontStrikeout="0" fontWeight="50">
-            <text-buffer bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <background shapeType="0" shapeSizeUnit="MM" shapeDraw="0" shapeJoinStyle="64" shapeOpacity="1" shapeSVGFile="" shapeOffsetUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetY="0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="9" fontCapitals="0" fontSizeUnit="Point" useSubstitutions="0" isExpression="0" fontItalic="0" fontStrikeout="0" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" fieldName="times" textOpacity="1" textColor="0,0,0,255" fontWeight="50" fontUnderline="0" multilineHeight="1" namedStyle="Regular" fontLetterSpacing="0" fontWordSpacing="0" blendMode="0">
+            <text-buffer bufferNoFill="1" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <background shapeOffsetUnit="MM" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiY="0" shapeType="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeDraw="0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiUnit="MM" shapeOpacity="1"/>
+            <shadow shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.7" shadowOffsetAngle="135" shadowRadius="1.5" shadowBlendMode="6" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100"/>
             <substitutions/>
           </text-style>
-          <text-format decimals="3" addDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="4294967295" wrapChar="" placeDirectionSymbol="0" plussign="0" formatNumbers="0"/>
-          <placement placementFlags="10" offsetType="0" centroidWhole="0" repeatDistanceUnits="MM" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" dist="0" yOffset="0" offsetUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="5" placement="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" xOffset="0" fitInPolygonOnly="0" centroidInside="0" maxCurvedCharAngleOut="-25" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" rotationAngle="0"/>
-          <rendering fontLimitPixelSize="0" labelPerPart="0" obstacle="1" zIndex="0" obstacleFactor="1" displayAll="0" maxNumLabels="2000" fontMaxPixelSize="10000" upsidedownLabels="0" limitNumLabels="0" scaleMin="0" minFeatureSize="0" drawLabels="1" mergeLines="0" scaleVisibility="0" obstacleType="0" scaleMax="0" fontMinPixelSize="3"/>
+          <text-format placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="4294967295" decimals="3"/>
+          <placement quadOffset="4" offsetType="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="5" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceUnits="MM" offsetUnits="MM" centroidWhole="0" maxCurvedCharAngleIn="25" centroidInside="0" xOffset="0" placement="2" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" yOffset="0" dist="0" distUnits="MM" repeatDistance="0"/>
+          <rendering displayAll="0" fontLimitPixelSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" labelPerPart="0" obstacle="1" scaleMin="0" limitNumLabels="0" maxNumLabels="2000" obstacleType="0" drawLabels="1" upsidedownLabels="0" fontMinPixelSize="3" minFeatureSize="0" scaleMax="0" scaleVisibility="0" zIndex="0"/>
           <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 height="15" lineSizeType="MM" opacity="1" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" backgroundAlpha="255" maxScaleDenominator="1e+8" diagramOrientation="Up" width="15" scaleDependency="Area" minimumSize="0" backgroundColor="#ffffff" enabled="0" barWidth="5" penColor="#000000" minScaleDenominator="0" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penAlpha="255" penWidth="0" sizeType="MM">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" rotationOffset="270" penColor="#000000" backgroundAlpha="255" opacity="1" minScaleDenominator="0" lineSizeType="MM" diagramOrientation="Up" barWidth="5" maxScaleDenominator="1e+8" minimumSize="0" width="15" height="15" scaleBasedVisibility="0" labelPlacementMethod="XHeight" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundColor="#ffffff">
           <fontProperties description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0" style="0"/>
-          <attribute color="#000000" field="" label=""/>
+          <attribute label="" color="#000000" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="18" obstacle="0" zIndex="0" placement="2" showAll="1" priority="0">
+      <DiagramLayerSettings priority="0" dist="0" zIndex="0" showAll="1" linePlacementFlags="18" obstacle="0" placement="2">
         <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>
@@ -7196,41 +7169,41 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="type"/>
-        <alias name="" index="2" field="status"/>
-        <alias name="" index="3" field="times"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="type" index="1" name=""/>
+        <alias field="status" index="2" name=""/>
+        <alias field="times" index="3" name=""/>
       </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 field="id" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="status" expression="" applyOnUpdate="0"/>
+        <default field="times" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="id" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="type" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="status" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="times" notnull_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="status" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="times" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="type"/>
-        <constraint exp="" desc="" field="status"/>
-        <constraint exp="" desc="" field="times"/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="status" exp=""/>
+        <constraint desc="" field="times" exp=""/>
       </constraintExpressions>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;id&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <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"/>
+          <column type="field" hidden="0" name="id" width="-1"/>
+          <column type="field" hidden="0" name="type" width="202"/>
+          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" hidden="0" name="status" width="-1"/>
+          <column type="field" hidden="0" name="times" width="-1"/>
         </columns>
       </attributetableconfig>
       <editform tolerant="1"></editform>
@@ -7257,16 +7230,16 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="status" editable="1"/>
-        <field name="times" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="status"/>
+        <field editable="1" name="times"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="status" labelOnTop="0"/>
-        <field name="times" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="status"/>
+        <field labelOnTop="0" name="times"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <widgets/>
       <conditionalstyles>
@@ -7277,7 +7250,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="100000" refreshOnNotifyMessage="" geometry="Point" simplifyLocal="1" simplifyDrawingHints="0" type="vector" simplifyMaxScale="1" simplifyAlgorithm="0" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshEnabled="0" autoRefreshTime="0" minScale="1e+8" readOnly="0">
+    <maplayer autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" simplifyLocal="1" autoRefreshTime="0" readOnly="0" geometry="Point" labelsEnabled="1" minScale="1e+8" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" maxScale="100000" simplifyMaxScale="1" simplifyAlgorithm="0" simplifyDrawingHints="0">
       <extent>
         <xmin>18.37579395571144758</xmin>
         <ymin>-33.94513036405621875</ymin>
@@ -7341,128 +7314,128 @@ def my_form_open(dialog, layer, feature):
         <rules key="">
           <rule description="21KM" 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="">
             <settings>
-              <text-style fontWordSpacing="0" useSubstitutions="0" fontCapitals="0" isExpression="1" fontSizeUnit="Point" fontUnderline="0" previewBkgrdColor="#ffffff" fontFamily="Myriad Pro" fontSize="10" multilineHeight="1" fontItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textColor="255,255,255,255" textOpacity="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0" fontStrikeout="0" fontWeight="63">
-                <text-buffer bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="0" bufferDraw="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeType="0" shapeSizeUnit="MM" shapeDraw="1" shapeJoinStyle="128" shapeOpacity="1" shapeSVGFile="" shapeOffsetUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeX="0.25" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="210,32,39,255" shapeOffsetY="0" shapeRadiiUnit="MM" shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="210,32,39,255" shapeSizeType="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" fontCapitals="0" fontSizeUnit="Point" useSubstitutions="0" isExpression="1" fontItalic="0" fontStrikeout="0" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textOpacity="1" textColor="255,255,255,255" fontWeight="63" fontUnderline="0" multilineHeight="1" namedStyle="Semibold" fontLetterSpacing="0" fontWordSpacing="0" blendMode="0">
+                <text-buffer bufferNoFill="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <background shapeOffsetUnit="MM" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="128" shapeRadiiY="0" shapeType="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeFillColor="210,32,39,255" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeSizeX="0.25" shapeBorderColor="210,32,39,255" shapeBorderWidth="1" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeDraw="1" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiUnit="MM" shapeOpacity="1"/>
+                <shadow shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.7" shadowOffsetAngle="135" shadowRadius="1.5" shadowBlendMode="6" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100"/>
                 <substitutions/>
               </text-style>
-              <text-format decimals="0" addDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="3" wrapChar="" placeDirectionSymbol="0" plussign="0" formatNumbers="0"/>
-              <placement placementFlags="10" offsetType="0" centroidWhole="0" repeatDistanceUnits="MM" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" dist="2" yOffset="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="10" placement="6" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" xOffset="0" fitInPolygonOnly="0" centroidInside="0" maxCurvedCharAngleOut="-20" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" rotationAngle="0"/>
-              <rendering fontLimitPixelSize="0" labelPerPart="0" obstacle="1" zIndex="0" obstacleFactor="2" displayAll="1" maxNumLabels="2000" fontMaxPixelSize="10000" upsidedownLabels="0" limitNumLabels="0" scaleMin="1" minFeatureSize="0" drawLabels="1" mergeLines="0" scaleVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="3" decimals="0"/>
+              <placement quadOffset="4" offsetType="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="10" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceUnits="MM" offsetUnits="MapUnit" centroidWhole="0" maxCurvedCharAngleIn="20" centroidInside="0" xOffset="0" placement="6" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" yOffset="0" dist="2" distUnits="MM" repeatDistance="0"/>
+              <rendering displayAll="1" fontLimitPixelSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="2" labelPerPart="0" obstacle="1" scaleMin="1" limitNumLabels="0" maxNumLabels="2000" obstacleType="0" drawLabels="1" upsidedownLabels="0" fontMinPixelSize="3" minFeatureSize="0" scaleMax="10000000" scaleVisibility="0" zIndex="0"/>
               <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="field" value="label_x" type="QString"/>
-                      <Option name="type" value="2" type="int"/>
+                  <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="QString" name="field" value="label_x"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" value="false" 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="false"/>
+                      <Option type="QString" name="field" value="label_y"/>
+                      <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 description="10KM" 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="">
             <settings>
-              <text-style fontWordSpacing="0" useSubstitutions="0" fontCapitals="0" isExpression="1" fontSizeUnit="Point" fontUnderline="0" previewBkgrdColor="#ffffff" fontFamily="Myriad Pro" fontSize="10" multilineHeight="1" fontItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textColor="255,255,255,255" textOpacity="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0" fontStrikeout="0" fontWeight="63">
-                <text-buffer bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="0" bufferDraw="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeType="0" shapeSizeUnit="MM" shapeDraw="1" shapeJoinStyle="128" shapeOpacity="1" shapeSVGFile="" shapeOffsetUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeX="0.25" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="103,34,144,255" shapeOffsetY="0" shapeRadiiUnit="MM" shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="103,34,144,255" shapeSizeType="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" fontCapitals="0" fontSizeUnit="Point" useSubstitutions="0" isExpression="1" fontItalic="0" fontStrikeout="0" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textOpacity="1" textColor="255,255,255,255" fontWeight="63" fontUnderline="0" multilineHeight="1" namedStyle="Semibold" fontLetterSpacing="0" fontWordSpacing="0" blendMode="0">
+                <text-buffer bufferNoFill="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <background shapeOffsetUnit="MM" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="128" shapeRadiiY="0" shapeType="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeFillColor="103,34,144,255" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeSizeX="0.25" shapeBorderColor="103,34,144,255" shapeBorderWidth="1" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeDraw="1" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiUnit="MM" shapeOpacity="1"/>
+                <shadow shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.7" shadowOffsetAngle="135" shadowRadius="1.5" shadowBlendMode="6" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100"/>
                 <substitutions/>
               </text-style>
-              <text-format decimals="0" addDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="3" wrapChar="" placeDirectionSymbol="0" plussign="0" formatNumbers="0"/>
-              <placement placementFlags="10" offsetType="0" centroidWhole="0" repeatDistanceUnits="MM" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" dist="2" yOffset="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="10" placement="6" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" xOffset="0" fitInPolygonOnly="0" centroidInside="0" maxCurvedCharAngleOut="-20" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" rotationAngle="0"/>
-              <rendering fontLimitPixelSize="0" labelPerPart="0" obstacle="1" zIndex="0" obstacleFactor="2" displayAll="1" maxNumLabels="2000" fontMaxPixelSize="10000" upsidedownLabels="0" limitNumLabels="0" scaleMin="1" minFeatureSize="0" drawLabels="1" mergeLines="0" scaleVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="3" decimals="0"/>
+              <placement quadOffset="4" offsetType="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="10" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceUnits="MM" offsetUnits="MapUnit" centroidWhole="0" maxCurvedCharAngleIn="20" centroidInside="0" xOffset="0" placement="6" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" yOffset="0" dist="2" distUnits="MM" repeatDistance="0"/>
+              <rendering displayAll="1" fontLimitPixelSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="2" labelPerPart="0" obstacle="1" scaleMin="1" limitNumLabels="0" maxNumLabels="2000" obstacleType="0" drawLabels="1" upsidedownLabels="0" fontMinPixelSize="3" minFeatureSize="0" scaleMax="10000000" scaleVisibility="0" zIndex="0"/>
               <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="field" value="label_x" type="QString"/>
-                      <Option name="type" value="2" type="int"/>
+                  <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="QString" name="field" value="label_x"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" value="false" 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="false"/>
+                      <Option type="QString" name="field" value="label_y"/>
+                      <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 description="5KM" 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="">
             <settings>
-              <text-style fontWordSpacing="0" useSubstitutions="0" fontCapitals="0" isExpression="1" fontSizeUnit="Point" fontUnderline="0" previewBkgrdColor="#ffffff" fontFamily="Myriad Pro" fontSize="10" multilineHeight="1" fontItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" textColor="255,255,255,255" textOpacity="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0" fontStrikeout="0" fontWeight="63">
-                <text-buffer bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="0" bufferDraw="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeType="0" shapeSizeUnit="MM" shapeDraw="1" shapeJoinStyle="128" shapeOpacity="1" shapeSVGFile="" shapeOffsetUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeX="0.25" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeOffsetY="0" shapeRadiiUnit="MM" shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="145,211,55,255" shapeSizeType="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" fontCapitals="0" fontSizeUnit="Point" useSubstitutions="0" isExpression="1" fontItalic="0" fontStrikeout="0" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" textOpacity="1" textColor="255,255,255,255" fontWeight="63" fontUnderline="0" multilineHeight="1" namedStyle="Semibold" fontLetterSpacing="0" fontWordSpacing="0" blendMode="0">
+                <text-buffer bufferNoFill="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <background shapeOffsetUnit="MM" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="128" shapeRadiiY="0" shapeType="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeFillColor="145,211,55,255" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeSizeX="0.25" shapeBorderColor="145,211,55,255" shapeBorderWidth="1" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeDraw="1" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiUnit="MM" shapeOpacity="1"/>
+                <shadow shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.7" shadowOffsetAngle="135" shadowRadius="1.5" shadowBlendMode="6" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100"/>
                 <substitutions/>
               </text-style>
-              <text-format decimals="0" addDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="3" wrapChar="" placeDirectionSymbol="0" plussign="0" formatNumbers="0"/>
-              <placement placementFlags="10" offsetType="0" centroidWhole="0" repeatDistanceUnits="MM" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" dist="2" yOffset="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="10" placement="6" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" xOffset="0" fitInPolygonOnly="0" centroidInside="0" maxCurvedCharAngleOut="-20" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" rotationAngle="0"/>
-              <rendering fontLimitPixelSize="0" labelPerPart="0" obstacle="1" zIndex="0" obstacleFactor="2" displayAll="1" maxNumLabels="2000" fontMaxPixelSize="10000" upsidedownLabels="0" limitNumLabels="0" scaleMin="1" minFeatureSize="0" drawLabels="1" mergeLines="0" scaleVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="3" decimals="0"/>
+              <placement quadOffset="4" offsetType="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="10" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceUnits="MM" offsetUnits="MapUnit" centroidWhole="0" maxCurvedCharAngleIn="20" centroidInside="0" xOffset="0" placement="6" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" yOffset="0" dist="2" distUnits="MM" repeatDistance="0"/>
+              <rendering displayAll="1" fontLimitPixelSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="2" labelPerPart="0" obstacle="1" scaleMin="1" limitNumLabels="0" maxNumLabels="2000" obstacleType="0" drawLabels="1" upsidedownLabels="0" fontMinPixelSize="3" minFeatureSize="0" scaleMax="10000000" scaleVisibility="0" zIndex="0"/>
               <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="field" value="label_x" type="QString"/>
-                      <Option name="type" value="2" type="int"/>
+                  <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="QString" name="field" value="label_x"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" value="false" 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="false"/>
+                      <Option type="QString" name="field" value="label_y"/>
+                      <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 description="Always show" key="" active="0">
+          <rule active="0" description="Always show" key="">
             <settings>
-              <text-style fontWordSpacing="0" useSubstitutions="0" fontCapitals="0" isExpression="0" fontSizeUnit="Point" fontUnderline="0" previewBkgrdColor="#ffffff" fontFamily="Roboto Condensed" fontSize="11" multilineHeight="1" fontItalic="1" namedStyle="Italic" fontLetterSpacing="0" fieldName="Name" textColor="0,0,0,255" textOpacity="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0" fontStrikeout="0" fontWeight="50">
-                <text-buffer bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="0" bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeType="0" shapeSizeUnit="MM" shapeDraw="1" shapeJoinStyle="64" shapeOpacity="1" shapeSVGFile="" shapeOffsetUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetY="0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="11" fontCapitals="0" fontSizeUnit="Point" useSubstitutions="0" isExpression="0" fontItalic="1" fontStrikeout="0" fontFamily="Roboto Condensed" previewBkgrdColor="#ffffff" fieldName="Name" textOpacity="1" textColor="0,0,0,255" fontWeight="50" fontUnderline="0" multilineHeight="1" namedStyle="Italic" fontLetterSpacing="0" fontWordSpacing="0" blendMode="0">
+                <text-buffer bufferNoFill="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <background shapeOffsetUnit="MM" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiY="0" shapeType="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeDraw="1" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiUnit="MM" shapeOpacity="1"/>
+                <shadow shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.7" shadowOffsetAngle="135" shadowRadius="1.5" shadowBlendMode="6" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100"/>
                 <substitutions/>
               </text-style>
-              <text-format decimals="3" addDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="3" wrapChar="" placeDirectionSymbol="0" plussign="0" formatNumbers="0"/>
-              <placement placementFlags="10" offsetType="0" centroidWhole="0" repeatDistanceUnits="MM" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" dist="0" yOffset="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="5" placement="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" xOffset="0" fitInPolygonOnly="0" centroidInside="0" maxCurvedCharAngleOut="-25" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" rotationAngle="0"/>
-              <rendering fontLimitPixelSize="0" labelPerPart="0" obstacle="1" zIndex="0" obstacleFactor="1" displayAll="0" maxNumLabels="2000" fontMaxPixelSize="10000" upsidedownLabels="0" limitNumLabels="0" scaleMin="1" minFeatureSize="0" drawLabels="1" mergeLines="0" scaleVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="3" decimals="3"/>
+              <placement quadOffset="4" offsetType="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="5" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceUnits="MM" offsetUnits="MapUnit" centroidWhole="0" maxCurvedCharAngleIn="25" centroidInside="0" xOffset="0" placement="0" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" yOffset="0" dist="0" distUnits="MM" repeatDistance="0"/>
+              <rendering displayAll="0" fontLimitPixelSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" labelPerPart="0" obstacle="1" scaleMin="1" limitNumLabels="0" maxNumLabels="2000" obstacleType="0" drawLabels="1" upsidedownLabels="0" fontMinPixelSize="3" minFeatureSize="0" scaleMax="10000000" scaleVisibility="0" zIndex="0"/>
               <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>
@@ -7470,25 +7443,25 @@ def my_form_open(dialog, layer, feature):
         </rules>
       </labeling>
       <customproperties>
-        <property value="COALESCE(&quot;Text&quot;, '&lt;NULL>')" key="dualview/previewExpressions"/>
+        <property key="dualview/previewExpressions" value="COALESCE(&quot;Text&quot;, '&lt;NULL>')"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory height="15" lineSizeType="MM" opacity="1" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" backgroundAlpha="255" maxScaleDenominator="1e+8" diagramOrientation="Up" width="15" scaleDependency="Area" minimumSize="0" backgroundColor="#ffffff" enabled="0" barWidth="5" penColor="#000000" minScaleDenominator="100000" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penAlpha="255" penWidth="0" sizeType="MM">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" rotationOffset="270" penColor="#000000" backgroundAlpha="255" opacity="1" minScaleDenominator="100000" lineSizeType="MM" diagramOrientation="Up" barWidth="5" maxScaleDenominator="1e+8" minimumSize="0" width="15" height="15" scaleBasedVisibility="0" labelPlacementMethod="XHeight" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundColor="#ffffff">
           <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" field="" label=""/>
+          <attribute label="" color="#000000" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="2" obstacle="0" zIndex="0" placement="0" showAll="1" priority="0">
+      <DiagramLayerSettings priority="0" dist="0" zIndex="0" showAll="1" linePlacementFlags="2" obstacle="0" placement="0">
         <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>
@@ -7497,8 +7470,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>
@@ -7507,8 +7480,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>
@@ -7517,8 +7490,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>
@@ -7527,8 +7500,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>
@@ -7537,8 +7510,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>
@@ -7547,8 +7520,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>
@@ -7557,8 +7530,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>
@@ -7567,8 +7540,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>
@@ -7577,8 +7550,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>
@@ -7587,8 +7560,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>
@@ -7597,8 +7570,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>
@@ -7607,89 +7580,89 @@ 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 name="" index="0" field="Name"/>
-        <alias name="" index="1" field="descriptio"/>
-        <alias name="" index="2" field="timestamp"/>
-        <alias name="" index="3" field="begin"/>
-        <alias name="" index="4" field="end"/>
-        <alias name="" index="5" field="Distance"/>
-        <alias name="" index="6" field="RouteLen"/>
-        <alias name="" index="7" field="length_m"/>
-        <alias name="" index="8" field="length_km"/>
-        <alias name="" index="9" field="Source"/>
-        <alias name="" index="10" field="org_fid"/>
-        <alias name="" index="11" field="distance"/>
+        <alias field="Name" index="0" name=""/>
+        <alias field="descriptio" index="1" name=""/>
+        <alias field="timestamp" index="2" name=""/>
+        <alias field="begin" index="3" name=""/>
+        <alias field="end" index="4" name=""/>
+        <alias field="Distance" index="5" name=""/>
+        <alias field="RouteLen" index="6" name=""/>
+        <alias field="length_m" index="7" name=""/>
+        <alias field="length_km" index="8" name=""/>
+        <alias field="Source" index="9" name=""/>
+        <alias field="org_fid" index="10" name=""/>
+        <alias field="distance" index="11" name=""/>
       </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 field="Name" expression="" applyOnUpdate="0"/>
+        <default field="descriptio" expression="" applyOnUpdate="0"/>
+        <default field="timestamp" expression="" applyOnUpdate="0"/>
+        <default field="begin" expression="" applyOnUpdate="0"/>
+        <default field="end" expression="" applyOnUpdate="0"/>
+        <default field="Distance" expression="" applyOnUpdate="0"/>
+        <default field="RouteLen" expression="" applyOnUpdate="0"/>
+        <default field="length_m" expression="" applyOnUpdate="0"/>
+        <default field="length_km" expression="" applyOnUpdate="0"/>
+        <default field="Source" expression="" applyOnUpdate="0"/>
+        <default field="org_fid" expression="" applyOnUpdate="0"/>
+        <default field="distance" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="Name" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="descriptio" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="timestamp" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="begin" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="end" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="Distance" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="RouteLen" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="length_m" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="length_km" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="Source" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="org_fid" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="distance" notnull_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="Name" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="descriptio" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="timestamp" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="begin" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="end" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="Distance" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="RouteLen" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="length_m" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="length_km" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="Source" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="org_fid" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="distance" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="Name"/>
-        <constraint exp="" desc="" field="descriptio"/>
-        <constraint exp="" desc="" field="timestamp"/>
-        <constraint exp="" desc="" field="begin"/>
-        <constraint exp="" desc="" field="end"/>
-        <constraint exp="" desc="" field="Distance"/>
-        <constraint exp="" desc="" field="RouteLen"/>
-        <constraint exp="" desc="" field="length_m"/>
-        <constraint exp="" desc="" field="length_km"/>
-        <constraint exp="" desc="" field="Source"/>
-        <constraint exp="" desc="" field="org_fid"/>
-        <constraint exp="" desc="" 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>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;distance&quot;" actionWidgetStyle="dropDown" sortOrder="1">
+      <attributetableconfig sortExpression="&quot;distance&quot;" sortOrder="1" actionWidgetStyle="dropDown">
         <columns>
-          <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"/>
+          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" hidden="0" name="org_fid" width="-1"/>
+          <column type="field" hidden="0" name="distance" width="-1"/>
+          <column type="field" hidden="0" name="Name" width="-1"/>
+          <column type="field" hidden="0" name="Source" width="-1"/>
+          <column type="field" hidden="0" name="RouteLen" width="-1"/>
+          <column type="field" hidden="0" name="descriptio" width="-1"/>
+          <column type="field" hidden="0" name="timestamp" width="-1"/>
+          <column type="field" hidden="0" name="begin" width="-1"/>
+          <column type="field" hidden="0" name="end" width="-1"/>
+          <column type="field" hidden="0" name="Distance" width="-1"/>
+          <column type="field" hidden="0" name="length_m" width="-1"/>
+          <column type="field" hidden="0" name="length_km" width="-1"/>
         </columns>
       </attributetableconfig>
       <editform tolerant="1"></editform>
@@ -7716,32 +7689,32 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="Distance" editable="1"/>
-        <field name="Name" editable="1"/>
-        <field name="RouteLen" editable="1"/>
-        <field name="Source" editable="1"/>
-        <field name="begin" editable="1"/>
-        <field name="descriptio" editable="1"/>
-        <field name="distance" editable="1"/>
-        <field name="end" editable="1"/>
-        <field name="length_km" editable="1"/>
-        <field name="length_m" editable="1"/>
-        <field name="org_fid" editable="1"/>
-        <field name="timestamp" editable="1"/>
+        <field editable="1" name="Distance"/>
+        <field editable="1" name="Name"/>
+        <field editable="1" name="RouteLen"/>
+        <field editable="1" name="Source"/>
+        <field editable="1" name="begin"/>
+        <field editable="1" name="descriptio"/>
+        <field editable="1" name="distance"/>
+        <field editable="1" name="end"/>
+        <field editable="1" name="length_km"/>
+        <field editable="1" name="length_m"/>
+        <field editable="1" name="org_fid"/>
+        <field editable="1" name="timestamp"/>
       </editable>
       <labelOnTop>
-        <field name="Distance" labelOnTop="0"/>
-        <field name="Name" labelOnTop="0"/>
-        <field name="RouteLen" labelOnTop="0"/>
-        <field name="Source" labelOnTop="0"/>
-        <field name="begin" labelOnTop="0"/>
-        <field name="descriptio" labelOnTop="0"/>
-        <field name="distance" labelOnTop="0"/>
-        <field name="end" labelOnTop="0"/>
-        <field name="length_km" labelOnTop="0"/>
-        <field name="length_m" labelOnTop="0"/>
-        <field name="org_fid" labelOnTop="0"/>
-        <field name="timestamp" labelOnTop="0"/>
+        <field labelOnTop="0" name="Distance"/>
+        <field labelOnTop="0" name="Name"/>
+        <field labelOnTop="0" name="RouteLen"/>
+        <field labelOnTop="0" name="Source"/>
+        <field labelOnTop="0" name="begin"/>
+        <field labelOnTop="0" name="descriptio"/>
+        <field labelOnTop="0" name="distance"/>
+        <field labelOnTop="0" name="end"/>
+        <field labelOnTop="0" name="length_km"/>
+        <field labelOnTop="0" name="length_m"/>
+        <field labelOnTop="0" name="org_fid"/>
+        <field labelOnTop="0" name="timestamp"/>
       </labelOnTop>
       <widgets/>
       <conditionalstyles>
@@ -7752,7 +7725,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
       <mapTip>Text</mapTip>
     </maplayer>
-    <maplayer maxScale="0" refreshOnNotifyMessage="" geometry="Polygon" simplifyLocal="1" simplifyDrawingHints="1" type="vector" simplifyMaxScale="1" simplifyAlgorithm="0" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshEnabled="0" autoRefreshTime="0" minScale="1e+8" readOnly="0">
+    <maplayer autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" simplifyLocal="1" autoRefreshTime="0" readOnly="0" geometry="Polygon" labelsEnabled="1" minScale="1e+8" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" maxScale="0" simplifyMaxScale="1" simplifyAlgorithm="0" simplifyDrawingHints="1">
       <extent>
         <xmin>18.37549461152003971</xmin>
         <ymin>-33.94162201868364548</ymin>
@@ -7809,7 +7782,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxz="0" minx="0" dimensions="2" maxx="0" crs="" maxy="0" miny="0" minz="0"/>
+          <spatial maxz="0" maxx="0" minx="0" crs="" miny="0" maxy="0" dimensions="2" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -7833,44 +7806,44 @@ def my_form_open(dialog, layer, feature):
       <renderer-v2 type="nullSymbol"/>
       <labeling type="simple">
         <settings>
-          <text-style fontWordSpacing="0" useSubstitutions="0" fontCapitals="0" isExpression="0" fontSizeUnit="Point" fontUnderline="0" previewBkgrdColor="#ffffff" fontFamily="Myriad Pro" fontSize="8" multilineHeight="1" fontItalic="0" namedStyle="Bold" fontLetterSpacing="0" fieldName="label" textColor="31,120,180,255" textOpacity="0.8" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0" fontStrikeout="0" fontWeight="75">
-            <text-buffer bufferSizeUnits="MM" bufferOpacity="0.4" bufferNoFill="0" bufferDraw="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="0.75" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <background shapeType="0" shapeSizeUnit="MM" shapeDraw="1" shapeJoinStyle="128" shapeOpacity="0.5" shapeSVGFile="" shapeOffsetUnit="MM" shapeSizeY="0.5" shapeRotation="0" shapeSizeX="0.5" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="31,120,180,255" shapeOffsetY="0" shapeRadiiUnit="MM" shapeBorderWidth="0.75" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,0" shapeSizeType="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="8" fontCapitals="0" fontSizeUnit="Point" useSubstitutions="0" isExpression="0" fontItalic="0" fontStrikeout="0" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" fieldName="label" textOpacity="0.8" textColor="31,120,180,255" fontWeight="75" fontUnderline="0" multilineHeight="1" namedStyle="Bold" fontLetterSpacing="0" fontWordSpacing="0" blendMode="0">
+            <text-buffer bufferNoFill="0" bufferSize="0.75" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="1" bufferColor="255,255,255,255" bufferOpacity="0.4"/>
+            <background shapeOffsetUnit="MM" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="128" shapeRadiiY="0" shapeType="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeFillColor="255,255,255,0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeSizeX="0.5" shapeBorderColor="31,120,180,255" shapeBorderWidth="0.75" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.5" shapeDraw="1" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiUnit="MM" shapeOpacity="0.5"/>
+            <shadow shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.7" shadowOffsetAngle="135" shadowRadius="1.5" shadowBlendMode="6" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100"/>
             <substitutions/>
           </text-style>
-          <text-format decimals="3" addDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="1" wrapChar="" placeDirectionSymbol="0" plussign="0" formatNumbers="0"/>
-          <placement placementFlags="10" offsetType="0" centroidWhole="1" repeatDistanceUnits="MM" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" dist="2" yOffset="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="1" priority="5" placement="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" xOffset="1" fitInPolygonOnly="0" centroidInside="0" maxCurvedCharAngleOut="-25" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" rotationAngle="0"/>
-          <rendering fontLimitPixelSize="0" labelPerPart="0" obstacle="1" zIndex="5" obstacleFactor="0.76" displayAll="0" maxNumLabels="6" fontMaxPixelSize="10000" upsidedownLabels="0" limitNumLabels="0" scaleMin="1" minFeatureSize="0" drawLabels="1" mergeLines="0" scaleVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3"/>
+          <text-format placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" decimals="3"/>
+          <placement quadOffset="1" offsetType="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="5" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceUnits="MM" offsetUnits="MapUnit" centroidWhole="1" maxCurvedCharAngleIn="25" centroidInside="0" xOffset="1" placement="0" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" yOffset="0" dist="2" distUnits="MM" repeatDistance="0"/>
+          <rendering displayAll="0" fontLimitPixelSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="0.76" labelPerPart="0" obstacle="1" scaleMin="1" limitNumLabels="0" maxNumLabels="6" obstacleType="0" drawLabels="1" upsidedownLabels="0" fontMinPixelSize="3" minFeatureSize="0" scaleMax="10000000" scaleVisibility="0" zIndex="5"/>
           <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="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 height="15" lineSizeType="MM" opacity="1" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" backgroundAlpha="255" maxScaleDenominator="1e+8" diagramOrientation="Up" width="15" scaleDependency="Area" minimumSize="0" backgroundColor="#ffffff" enabled="0" barWidth="5" penColor="#000000" minScaleDenominator="-2.14748e+9" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penAlpha="255" penWidth="0" sizeType="MM">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" rotationOffset="270" penColor="#000000" backgroundAlpha="255" opacity="1" minScaleDenominator="-2.14748e+9" lineSizeType="MM" diagramOrientation="Up" barWidth="5" maxScaleDenominator="1e+8" minimumSize="0" width="15" height="15" scaleBasedVisibility="0" labelPlacementMethod="XHeight" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundColor="#ffffff">
           <fontProperties description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" field="" label=""/>
+          <attribute label="" color="#000000" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="2" obstacle="0" zIndex="0" placement="0" showAll="1" priority="0">
+      <DiagramLayerSettings priority="0" dist="0" zIndex="0" showAll="1" linePlacementFlags="2" obstacle="0" placement="0">
         <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>
@@ -7879,8 +7852,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>
@@ -7889,8 +7862,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>
@@ -7899,44 +7872,44 @@ 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 name="" index="0" field="id"/>
-        <alias name="" index="1" field="table_set"/>
-        <alias name="" index="2" field="label"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="table_set" index="1" name=""/>
+        <alias field="label" index="2" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="table_set"/>
-        <default expression="" applyOnUpdate="0" field="label"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="table_set" expression="" applyOnUpdate="0"/>
+        <default field="label" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="id" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="table_set" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="label" notnull_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="table_set" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="label" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="table_set"/>
-        <constraint exp="" desc="" field="label"/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="table_set" exp=""/>
+        <constraint desc="" field="label" exp=""/>
       </constraintExpressions>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <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 type="field" hidden="0" name="id" width="-1"/>
+          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" hidden="0" name="table_set" width="-1"/>
+          <column type="field" hidden="0" name="label" width="-1"/>
         </columns>
       </attributetableconfig>
       <editform tolerant="1">.</editform>
@@ -7963,14 +7936,14 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="label" editable="1"/>
-        <field name="table_set" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="label"/>
+        <field editable="1" name="table_set"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="label" labelOnTop="0"/>
-        <field name="table_set" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="label"/>
+        <field labelOnTop="0" name="table_set"/>
       </labelOnTop>
       <widgets/>
       <conditionalstyles>
@@ -8002,53 +7975,83 @@ def my_form_open(dialog, layer, feature):
     <layer id="poi_labels_59d3855d_466f_419c_8119_94b9ad7c140d"/>
   </layerorder>
   <properties>
-    <WMSAccessConstraints type="QString">None</WMSAccessConstraints>
-    <DefaultStyles>
-      <ColorRamp type="QString"></ColorRamp>
-      <Fill type="QString"></Fill>
-      <AlphaInt type="int">255</AlphaInt>
-      <Marker type="QString"></Marker>
-      <Line type="QString"></Line>
-      <Opacity type="double">1</Opacity>
-      <RandomColors type="bool">true</RandomColors>
-    </DefaultStyles>
+    <WMSContactOrganization type="QString"></WMSContactOrganization>
+    <WCSUrl type="QString"></WCSUrl>
+    <WFSLayers type="QStringList"/>
+    <WMSContactMail type="QString"></WMSContactMail>
     <Variables>
-      <variableNames type="QStringList"/>
       <variableValues type="QStringList"/>
+      <variableNames type="QStringList"/>
     </Variables>
-    <WMSSegmentizeFeatureInfoGeometry type="bool">false</WMSSegmentizeFeatureInfoGeometry>
-    <WMSContactPerson type="QString"></WMSContactPerson>
-    <WMSContactPhone type="QString"></WMSContactPhone>
-    <WMSImageQuality type="int">90</WMSImageQuality>
-    <WMSContactPosition type="QString"></WMSContactPosition>
-    <WMSFees type="QString">conditions unknown</WMSFees>
-    <WMSUseLayerIDs type="bool">false</WMSUseLayerIDs>
-    <Gui>
-      <SelectionColorBluePart type="int">0</SelectionColorBluePart>
-      <CanvasColorBluePart type="int">255</CanvasColorBluePart>
-      <SelectionColorAlphaPart type="int">255</SelectionColorAlphaPart>
-      <CanvasColorRedPart type="int">255</CanvasColorRedPart>
-      <CanvasColorGreenPart type="int">255</CanvasColorGreenPart>
-      <SelectionColorRedPart type="int">255</SelectionColorRedPart>
-      <SelectionColorGreenPart type="int">255</SelectionColorGreenPart>
-    </Gui>
+    <WMSUrl type="QString"></WMSUrl>
+    <Paths>
+      <Absolute type="bool">false</Absolute>
+    </Paths>
+    <WMSServiceAbstract type="QString"></WMSServiceAbstract>
+    <WFSTLayers>
+      <Insert type="QStringList"/>
+      <Update type="QStringList"/>
+      <Delete type="QStringList"/>
+    </WFSTLayers>
     <Macros>
       <pythonCode type="QString"></pythonCode>
     </Macros>
-    <WMSUrl type="QString"></WMSUrl>
+    <WMSFees type="QString">conditions unknown</WMSFees>
+    <Measure>
+      <Ellipsoid type="QString">WGS84</Ellipsoid>
+    </Measure>
+    <DefaultStyles>
+      <Marker type="QString"></Marker>
+      <Fill type="QString"></Fill>
+      <AlphaInt type="int">255</AlphaInt>
+      <Line type="QString"></Line>
+      <ColorRamp type="QString"></ColorRamp>
+      <RandomColors type="bool">true</RandomColors>
+      <Opacity type="double">1</Opacity>
+    </DefaultStyles>
     <WMSPrecision type="QString">8</WMSPrecision>
-    <WMSServiceTitle type="QString"></WMSServiceTitle>
+    <WMSAccessConstraints type="QString">None</WMSAccessConstraints>
     <Grid>
-      <Enabled type="bool">false</Enabled>
-      <MarginUnit type="QString">MM</MarginUnit>
-      <MapUnits type="int">0</MapUnits>
-      <IntervalY type="double">10</IntervalY>
-      <AnnotationFrameDistance type="double">0</AnnotationFrameDistance>
-      <Style type="int">0</Style>
-      <AnnotationDirection type="int">0</AnnotationDirection>
       <AnnotationPrecision type="int">0</AnnotationPrecision>
-      <AnnotationFont type="QString">Roboto Condensed,,16,-1,5,50,0,0,0,0,0</AnnotationFont>
+      <OffsetX type="double">0</OffsetX>
+      <LineSymbol type="QString">&lt;symbol clip_to_extent="1" type="line" alpha="1" name="line symbol">
+ &lt;layer pass="0" class="SimpleLine" enabled="1" locked="0">
+  &lt;prop k="capstyle" v="square"/>
+  &lt;prop k="customdash" v="5;2"/>
+  &lt;prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+  &lt;prop k="customdash_unit" v="MM"/>
+  &lt;prop k="draw_inside_polygon" v="0"/>
+  &lt;prop k="joinstyle" v="bevel"/>
+  &lt;prop k="line_color" v="35,35,35,255"/>
+  &lt;prop k="line_style" v="solid"/>
+  &lt;prop k="line_width" v="0.26"/>
+  &lt;prop k="line_width_unit" v="MM"/>
+  &lt;prop k="offset" v="0"/>
+  &lt;prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+  &lt;prop k="offset_unit" v="MM"/>
+  &lt;prop k="use_custom_dash" v="0"/>
+  &lt;prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+  &lt;data_defined_properties>
+   &lt;Option type="Map">
+    &lt;Option type="QString" value="" name="name"/>
+    &lt;Option name="properties"/>
+    &lt;Option type="QString" value="collection" name="type"/>
+   &lt;/Option>
+  &lt;/data_defined_properties>
+ &lt;/layer>
+&lt;/symbol>
+</LineSymbol>
+      <ShowAnnotation type="bool">false</ShowAnnotation>
+      <Style type="int">0</Style>
+      <MarginUnit type="QString">MM</MarginUnit>
+      <Enabled type="bool">false</Enabled>
+      <OffsetY type="double">0</OffsetY>
       <Placement type="int">1</Placement>
+      <IntervalX type="double">10</IntervalX>
+      <AnnotationDirection type="int">0</AnnotationDirection>
+      <IntervalY type="double">10</IntervalY>
+      <MapUnits type="int">0</MapUnits>
+      <AnnotationFrameDistance type="double">0</AnnotationFrameDistance>
       <MarkerSymbol type="QString">&lt;symbol clip_to_extent="1" type="marker" alpha="1" name="marker symbol">
  &lt;layer pass="0" class="SimpleMarker" enabled="1" locked="0">
   &lt;prop k="angle" v="0"/>
@@ -8079,52 +8082,80 @@ def my_form_open(dialog, layer, feature):
  &lt;/layer>
 &lt;/symbol>
 </MarkerSymbol>
-      <LineSymbol type="QString">&lt;symbol clip_to_extent="1" type="line" alpha="1" name="line symbol">
- &lt;layer pass="0" class="SimpleLine" enabled="1" locked="0">
-  &lt;prop k="capstyle" v="square"/>
-  &lt;prop k="customdash" v="5;2"/>
-  &lt;prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-  &lt;prop k="customdash_unit" v="MM"/>
-  &lt;prop k="draw_inside_polygon" v="0"/>
-  &lt;prop k="joinstyle" v="bevel"/>
-  &lt;prop k="line_color" v="35,35,35,255"/>
-  &lt;prop k="line_style" v="solid"/>
-  &lt;prop k="line_width" v="0.26"/>
-  &lt;prop k="line_width_unit" v="MM"/>
-  &lt;prop k="offset" v="0"/>
-  &lt;prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-  &lt;prop k="offset_unit" v="MM"/>
-  &lt;prop k="use_custom_dash" v="0"/>
-  &lt;prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-  &lt;data_defined_properties>
-   &lt;Option type="Map">
-    &lt;Option type="QString" value="" name="name"/>
-    &lt;Option name="properties"/>
-    &lt;Option type="QString" value="collection" name="type"/>
-   &lt;/Option>
-  &lt;/data_defined_properties>
- &lt;/layer>
-&lt;/symbol>
-</LineSymbol>
-      <ShowAnnotation type="bool">false</ShowAnnotation>
-      <OffsetY type="double">0</OffsetY>
-      <IntervalX type="double">10</IntervalX>
-      <OffsetX type="double">0</OffsetX>
+      <AnnotationFont type="QString">Roboto Condensed,,16,-1,5,50,0,0,0,0,0</AnnotationFont>
     </Grid>
-    <PositionPrecision>
-      <Automatic type="bool">true</Automatic>
-      <DecimalPlaces type="int">2</DecimalPlaces>
-      <DegreeFormat type="QString">MU</DegreeFormat>
-    </PositionPrecision>
-    <WFSLayers type="QStringList"/>
+    <WMSRequestDefinedDataSources type="bool">false</WMSRequestDefinedDataSources>
+    <WMSContactPhone type="QString"></WMSContactPhone>
+    <PAL>
+      <DrawOutlineLabels type="bool">true</DrawOutlineLabels>
+      <CandidatesPolygon type="int">30</CandidatesPolygon>
+      <DrawRectOnly type="bool">false</DrawRectOnly>
+      <CandidatesPoint type="int">16</CandidatesPoint>
+      <SearchMethod type="int">0</SearchMethod>
+      <ShowingAllLabels type="bool">false</ShowingAllLabels>
+      <CandidatesLine type="int">50</CandidatesLine>
+      <ShowingCandidates type="bool">false</ShowingCandidates>
+      <ShowingPartialsLabels type="bool">true</ShowingPartialsLabels>
+    </PAL>
+    <Measurement>
+      <AreaUnits type="QString">&lt;unknown></AreaUnits>
+      <DistanceUnits type="QString">&lt;unknown></DistanceUnits>
+    </Measurement>
+    <WMSServiceCapabilities type="bool">false</WMSServiceCapabilities>
     <WMSKeywordList type="QStringList">
       <value></value>
     </WMSKeywordList>
+    <RequiredLayers>
+      <Layers type="QStringList">
+        <value>water_tables20170921142016467</value>
+        <value>fencing_504d8fa2_bdeb_4951_b151_966d5d257666</value>
+        <value>fence_groups_b08dad12_5ae6_4ba8_b737_e74b37bd274c</value>
+        <value>GDAL_City_of_Cape_Town_2015_Aerial20160928085834970</value>
+        <value>all_routes20170907054841602</value>
+        <value>Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d</value>
+        <value>osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18</value>
+        <value>marshal_overviews_shp20160930210331241</value>
+        <value>osm_places20160930221519937</value>
+      </Layers>
+    </RequiredLayers>
+    <WMSUseLayerIDs type="bool">false</WMSUseLayerIDs>
+    <Mask>
+      <layer_id type="QString"></layer_id>
+      <parameters type="QString">KGxwMApJMDAKYUkxCmFJNQphSTAxCmFGMS4wCmFJMDAKYU5hTmEobHAxCmFOYUkyCmFJMAphTmFOYS4=</parameters>
+    </Mask>
+    <Identify>
+      <disabledLayers type="QStringList"/>
+    </Identify>
+    <WMSAddWktGeometry type="bool">false</WMSAddWktGeometry>
+    <WMSContactPosition type="QString"></WMSContactPosition>
+    <WMSImageQuality type="int">90</WMSImageQuality>
     <WFSUrl type="QString"></WFSUrl>
-    <WCSUrl type="QString"></WCSUrl>
+    <PositionPrecision>
+      <Automatic type="bool">true</Automatic>
+      <DegreeFormat type="QString">MU</DegreeFormat>
+      <DecimalPlaces type="int">2</DecimalPlaces>
+    </PositionPrecision>
+    <WCSLayers type="QStringList"/>
+    <WMSContactPerson type="QString"></WMSContactPerson>
+    <Gui>
+      <CanvasColorGreenPart type="int">255</CanvasColorGreenPart>
+      <CanvasColorRedPart type="int">255</CanvasColorRedPart>
+      <CanvasColorBluePart type="int">255</CanvasColorBluePart>
+      <SelectionColorBluePart type="int">0</SelectionColorBluePart>
+      <SelectionColorRedPart type="int">255</SelectionColorRedPart>
+      <SelectionColorAlphaPart type="int">255</SelectionColorAlphaPart>
+      <SelectionColorGreenPart type="int">255</SelectionColorGreenPart>
+    </Gui>
+    <WMSSegmentizeFeatureInfoGeometry type="bool">false</WMSSegmentizeFeatureInfoGeometry>
+    <SpatialRefSys>
+      <ProjectionsEnabled type="int">1</ProjectionsEnabled>
+      <ProjectCrs type="QString">EPSG:3857</ProjectCrs>
+      <ProjectCRSProj4String type="QString">+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</ProjectCRSProj4String>
+      <ProjectCRSID type="int">3857</ProjectCRSID>
+    </SpatialRefSys>
     <Digitizing>
-      <SnappingMode type="QString">current_layer</SnappingMode>
-      <DefaultSnapTolerance type="double">0</DefaultSnapTolerance>
+      <AvoidIntersectionsList type="QStringList"/>
+      <DefaultSnapType type="QString">off</DefaultSnapType>
       <LayerSnapToList type="QStringList">
         <value>to_vertex_and_segment</value>
         <value>to_vertex_and_segment</value>
@@ -8139,23 +8170,7 @@ def my_form_open(dialog, layer, feature):
         <value>to_vertex_and_segment</value>
         <value>to_vertex_and_segment</value>
       </LayerSnapToList>
-      <AvoidIntersectionsList type="QStringList"/>
-      <LayerSnappingList type="QStringList">
-        <value>20170907___Gun_Run_10km_10km_kmz_LineString20170907054652280</value>
-        <value>20170907___Gun_Run_21_21km_kmz_LineString20170907054546428</value>
-        <value>20170907___Gun_Run_5km_Gun_Run_5K_kmz_LineString20170907054709477</value>
-        <value>all_routes20170907054841602</value>
-        <value>extra_security20170921130834191</value>
-        <value>fencing_areas20160930180843078</value>
-        <value>marshal_overviews_shp20160930210331241</value>
-        <value>marshal_positions20160930121322287</value>
-        <value>osm_places20160930221519937</value>
-        <value>osm_roads20170921182231228</value>
-        <value>route_markers20171001130518852</value>
-        <value>water_tables20170921142016467</value>
-      </LayerSnappingList>
-      <DefaultSnapType type="QString">off</DefaultSnapType>
-      <DefaultSnapToleranceUnit type="int">2</DefaultSnapToleranceUnit>
+      <SnappingMode type="QString">current_layer</SnappingMode>
       <LayerSnappingToleranceList type="QStringList">
         <value>0.000000</value>
         <value>0.000000</value>
@@ -8170,6 +8185,7 @@ def my_form_open(dialog, layer, feature):
         <value>0.000000</value>
         <value>0.000000</value>
       </LayerSnappingToleranceList>
+      <DefaultSnapTolerance type="double">0</DefaultSnapTolerance>
       <LayerSnappingEnabledList type="QStringList">
         <value>disabled</value>
         <value>disabled</value>
@@ -8184,7 +8200,6 @@ def my_form_open(dialog, layer, feature):
         <value>disabled</value>
         <value>disabled</value>
       </LayerSnappingEnabledList>
-      <TopologicalEditing type="int">0</TopologicalEditing>
       <LayerSnappingToleranceUnitList type="QStringList">
         <value>2</value>
         <value>2</value>
@@ -8199,277 +8214,235 @@ def my_form_open(dialog, layer, feature):
         <value>2</value>
         <value>2</value>
       </LayerSnappingToleranceUnitList>
-    </Digitizing>
-    <WMSAddWktGeometry type="bool">false</WMSAddWktGeometry>
-    <Measure>
-      <Ellipsoid type="QString">WGS84</Ellipsoid>
-    </Measure>
-    <RequiredLayers>
-      <Layers type="QStringList">
-        <value>water_tables20170921142016467</value>
-        <value>fencing_504d8fa2_bdeb_4951_b151_966d5d257666</value>
-        <value>fence_groups_b08dad12_5ae6_4ba8_b737_e74b37bd274c</value>
-        <value>GDAL_City_of_Cape_Town_2015_Aerial20160928085834970</value>
+      <LayerSnappingList type="QStringList">
+        <value>20170907___Gun_Run_10km_10km_kmz_LineString20170907054652280</value>
+        <value>20170907___Gun_Run_21_21km_kmz_LineString20170907054546428</value>
+        <value>20170907___Gun_Run_5km_Gun_Run_5K_kmz_LineString20170907054709477</value>
         <value>all_routes20170907054841602</value>
-        <value>Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d</value>
-        <value>osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18</value>
+        <value>extra_security20170921130834191</value>
+        <value>fencing_areas20160930180843078</value>
         <value>marshal_overviews_shp20160930210331241</value>
+        <value>marshal_positions20160930121322287</value>
         <value>osm_places20160930221519937</value>
-      </Layers>
-    </RequiredLayers>
-    <WMSServiceCapabilities type="bool">false</WMSServiceCapabilities>
-    <WMSContactOrganization type="QString"></WMSContactOrganization>
-    <WFSTLayers>
-      <Delete type="QStringList"/>
-      <Update type="QStringList"/>
-      <Insert type="QStringList"/>
-    </WFSTLayers>
-    <WMSOnlineResource type="QString"></WMSOnlineResource>
-    <WMSServiceAbstract type="QString"></WMSServiceAbstract>
-    <WMSContactMail type="QString"></WMSContactMail>
-    <Mask>
-      <layer_id type="QString"></layer_id>
-      <parameters type="QString">KGxwMApJMDAKYUkxCmFJNQphSTAxCmFGMS4wCmFJMDAKYU5hTmEobHAxCmFOYUkyCmFJMAphTmFOYS4=</parameters>
-    </Mask>
-    <Measurement>
-      <AreaUnits type="QString">&lt;unknown></AreaUnits>
-      <DistanceUnits type="QString">&lt;unknown></DistanceUnits>
-    </Measurement>
+        <value>osm_roads20170921182231228</value>
+        <value>route_markers20171001130518852</value>
+        <value>water_tables20170921142016467</value>
+      </LayerSnappingList>
+      <DefaultSnapToleranceUnit type="int">2</DefaultSnapToleranceUnit>
+      <TopologicalEditing type="int">0</TopologicalEditing>
+    </Digitizing>
     <Legend>
       <filterByMap type="bool">false</filterByMap>
     </Legend>
-    <Identify>
-      <disabledLayers type="QStringList"/>
-    </Identify>
-    <PAL>
-      <ShowingCandidates type="bool">false</ShowingCandidates>
-      <DrawOutlineLabels type="bool">true</DrawOutlineLabels>
-      <SearchMethod type="int">0</SearchMethod>
-      <ShowingAllLabels type="bool">false</ShowingAllLabels>
-      <CandidatesLine type="int">50</CandidatesLine>
-      <CandidatesPolygon type="int">30</CandidatesPolygon>
-      <CandidatesPoint type="int">16</CandidatesPoint>
-      <ShowingPartialsLabels type="bool">true</ShowingPartialsLabels>
-      <DrawRectOnly type="bool">false</DrawRectOnly>
-    </PAL>
-    <WCSLayers type="QStringList"/>
-    <Paths>
-      <Absolute type="bool">false</Absolute>
-    </Paths>
-    <SpatialRefSys>
-      <ProjectionsEnabled type="int">1</ProjectionsEnabled>
-      <ProjectCRSID type="int">3857</ProjectCRSID>
-      <ProjectCRSProj4String type="QString">+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</ProjectCRSProj4String>
-      <ProjectCrs type="QString">EPSG:3857</ProjectCrs>
-    </SpatialRefSys>
-    <WMSRequestDefinedDataSources type="bool">false</WMSRequestDefinedDataSources>
+    <WMSServiceTitle type="QString"></WMSServiceTitle>
+    <WMSOnlineResource type="QString"></WMSOnlineResource>
   </properties>
   <visibility-presets>
     <visibility-preset name="Access Routes" has-expanded-info="1">
-      <layer style="default" expanded="0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer style="default" expanded="1" id="residents_access_roads_a7a1b453_729e_4ac7_bb64_95381b84aa35"/>
-      <expanded-legend-nodes id="residents_access_roads_a7a1b453_729e_4ac7_bb64_95381b84aa35"/>
-      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
       <checked-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18">
         <checked-legend-node id="{c37e51d1-6158-4d1c-800c-b9f70f8487d8}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="residents_access_roads_a7a1b453_729e_4ac7_bb64_95381b84aa35" expanded="1" style="default"/>
+      <expanded-legend-nodes id="residents_access_roads_a7a1b453_729e_4ac7_bb64_95381b84aa35"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="0" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
         <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Marshal pages"/>
         <expanded-group-node id="Residents Access"/>
         <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshal pages"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Map"/>
         <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Ask Me" has-expanded-info="1">
-      <layer style="default" expanded="0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer style="default" expanded="1" id="directions_to_start_cf338b4b_1403_45e8_b11f_47b48dd39657"/>
+      <layer id="osm_places20160930221519937" expanded="1" style="default"/>
+      <expanded-legend-nodes id="osm_places20160930221519937"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="directions_to_start_cf338b4b_1403_45e8_b11f_47b48dd39657" expanded="1" style="default"/>
       <expanded-legend-nodes id="directions_to_start_cf338b4b_1403_45e8_b11f_47b48dd39657">
         <expanded-legend-node id="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
       </expanded-legend-nodes>
-      <layer style="default" expanded="1" id="poi_labels_59d3855d_466f_419c_8119_94b9ad7c140d"/>
+      <layer id="poi_labels_59d3855d_466f_419c_8119_94b9ad7c140d" expanded="1" style="default"/>
       <expanded-legend-nodes id="poi_labels_59d3855d_466f_419c_8119_94b9ad7c140d"/>
-      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" expanded="1" id="osm_places20160930221519937"/>
-      <expanded-legend-nodes id="osm_places20160930221519937"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="0" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
         <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Residents Access"/>
-        <expanded-group-node id="Ask Me"/>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Marshal pages"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Residents Access"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
         <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Ask Me"/>
+        <expanded-group-node id="Routes/Markers"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Fencing" has-expanded-info="1">
-      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer id="osm_places20160930221519937" expanded="0" style="default"/>
+      <expanded-legend-nodes id="osm_places20160930221519937"/>
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="1" style="default"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer style="default" expanded="1" id="all_routes20170907054841602"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="water_tables20170921142016467" expanded="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="all_routes20170907054841602" expanded="1" style="default"/>
       <expanded-legend-nodes id="all_routes20170907054841602">
         <expanded-legend-node id="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
       </expanded-legend-nodes>
-      <layer style="default" expanded="1" id="fencing_504d8fa2_bdeb_4951_b151_966d5d257666"/>
+      <layer id="route_markers_a5e14af7_58c2_4a9e_8e4a_d8d9a41d2bb6" expanded="1" style="default"/>
+      <expanded-legend-nodes id="route_markers_a5e14af7_58c2_4a9e_8e4a_d8d9a41d2bb6"/>
+      <layer id="fencing_504d8fa2_bdeb_4951_b151_966d5d257666" expanded="1" style="default"/>
       <checked-legend-nodes id="fencing_504d8fa2_bdeb_4951_b151_966d5d257666">
         <checked-legend-node id="{9da1c54c-0ca9-4db9-a722-ce3f53ccd358}"/>
-        <checked-legend-node id="{b3b38ee9-c245-4839-b078-3b966a2a5c4e}"/>
         <checked-legend-node id="{bb4463e8-e33a-4475-878c-fd2d7b636418}"/>
+        <checked-legend-node id="{b3b38ee9-c245-4839-b078-3b966a2a5c4e}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_504d8fa2_bdeb_4951_b151_966d5d257666">
         <expanded-legend-node id="{6f66f64e-a034-49f3-a480-0837e467ccae}"/>
       </expanded-legend-nodes>
-      <layer style="default" expanded="1" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" expanded="1" id="route_markers_a5e14af7_58c2_4a9e_8e4a_d8d9a41d2bb6"/>
-      <expanded-legend-nodes id="route_markers_a5e14af7_58c2_4a9e_8e4a_d8d9a41d2bb6"/>
-      <layer style="default" expanded="0" id="osm_places20160930221519937"/>
-      <expanded-legend-nodes id="osm_places20160930221519937"/>
       <expanded-group-nodes>
         <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Elevation"/>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Marshal pages"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
         <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Marshal map - inset" has-expanded-info="1">
-      <layer style="default" expanded="0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="osm_places20160930221519937" expanded="1" style="default"/>
+      <expanded-legend-nodes id="osm_places20160930221519937"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" expanded="1" id="all_routes20170907054841602"/>
+      <layer id="water_tables20170921142016467" expanded="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="all_routes20170907054841602" expanded="1" style="default"/>
       <expanded-legend-nodes id="all_routes20170907054841602">
         <expanded-legend-node id="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
       </expanded-legend-nodes>
-      <layer style="default" expanded="1" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" expanded="1" id="route_markers_a5e14af7_58c2_4a9e_8e4a_d8d9a41d2bb6"/>
+      <layer id="route_markers_a5e14af7_58c2_4a9e_8e4a_d8d9a41d2bb6" expanded="1" style="default"/>
       <expanded-legend-nodes id="route_markers_a5e14af7_58c2_4a9e_8e4a_d8d9a41d2bb6"/>
-      <layer style="default" expanded="1" id="osm_places20160930221519937"/>
-      <expanded-legend-nodes id="osm_places20160930221519937"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="0" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
         <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Marshal pages"/>
         <expanded-group-node id="Residents Access"/>
         <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshal pages"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Map"/>
         <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Marshal map - main" has-expanded-info="1">
-      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" expanded="1" id="extra_security20170921130834191"/>
-      <expanded-legend-nodes id="extra_security20170921130834191"/>
-      <layer style="default" expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer id="osm_places20160930221519937" expanded="1" style="default"/>
+      <expanded-legend-nodes id="osm_places20160930221519937"/>
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="1" style="default"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer style="default" expanded="1" id="marshal_positions20160930121322287"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="extra_security20170921130834191" expanded="1" style="default"/>
+      <expanded-legend-nodes id="extra_security20170921130834191"/>
+      <layer id="water_tables20170921142016467" expanded="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="marshal_positions20160930121322287" expanded="1" style="default"/>
       <expanded-legend-nodes id="marshal_positions20160930121322287"/>
-      <layer style="default" expanded="1" id="all_routes20170907054841602"/>
+      <layer id="all_routes20170907054841602" expanded="1" style="default"/>
       <expanded-legend-nodes id="all_routes20170907054841602">
         <expanded-legend-node id="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
       </expanded-legend-nodes>
-      <layer style="default" expanded="1" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" expanded="1" id="route_markers_a5e14af7_58c2_4a9e_8e4a_d8d9a41d2bb6"/>
+      <layer id="route_markers_a5e14af7_58c2_4a9e_8e4a_d8d9a41d2bb6" expanded="1" style="default"/>
       <expanded-legend-nodes id="route_markers_a5e14af7_58c2_4a9e_8e4a_d8d9a41d2bb6"/>
-      <layer style="default" expanded="1" id="osm_places20160930221519937"/>
-      <expanded-legend-nodes id="osm_places20160930221519937"/>
       <expanded-group-nodes>
         <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Marshal pages"/>
         <expanded-group-node id="Residents Access"/>
         <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshal pages"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Map"/>
         <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Marshal overview" has-expanded-info="1">
-      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" expanded="1" id="extra_security20170921130834191"/>
-      <expanded-legend-nodes id="extra_security20170921130834191"/>
-      <layer style="default" expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer id="osm_places20160930221519937" expanded="0" style="default"/>
+      <expanded-legend-nodes id="osm_places20160930221519937"/>
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="1" style="default"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer style="default" expanded="1" id="marshal_positions20160930121322287"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="extra_security20170921130834191" expanded="1" style="default"/>
+      <expanded-legend-nodes id="extra_security20170921130834191"/>
+      <layer id="water_tables20170921142016467" expanded="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="marshal_positions20160930121322287" expanded="1" style="default"/>
       <expanded-legend-nodes id="marshal_positions20160930121322287"/>
-      <layer style="default" expanded="1" id="all_routes20170907054841602"/>
+      <layer id="all_routes20170907054841602" expanded="1" style="default"/>
       <expanded-legend-nodes id="all_routes20170907054841602">
         <expanded-legend-node id="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
       </expanded-legend-nodes>
-      <layer style="default" expanded="1" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" expanded="1" id="route_markers_a5e14af7_58c2_4a9e_8e4a_d8d9a41d2bb6"/>
+      <layer id="route_markers_a5e14af7_58c2_4a9e_8e4a_d8d9a41d2bb6" expanded="1" style="default"/>
       <expanded-legend-nodes id="route_markers_a5e14af7_58c2_4a9e_8e4a_d8d9a41d2bb6"/>
-      <layer style="default" expanded="0" id="osm_places20160930221519937"/>
-      <expanded-legend-nodes id="osm_places20160930221519937"/>
       <expanded-group-nodes>
         <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Elevation"/>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Marshal pages"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
         <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Routes" has-expanded-info="1">
-      <layer style="default" expanded="0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="osm_places20160930221519937" expanded="0" style="default"/>
+      <expanded-legend-nodes id="osm_places20160930221519937"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" expanded="1" id="all_routes20170907054841602"/>
+      <layer id="water_tables20170921142016467" expanded="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="all_routes20170907054841602" expanded="1" style="default"/>
       <expanded-legend-nodes id="all_routes20170907054841602">
         <expanded-legend-node id="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
       </expanded-legend-nodes>
-      <layer style="default" expanded="1" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" expanded="1" id="route_markers_a5e14af7_58c2_4a9e_8e4a_d8d9a41d2bb6"/>
+      <layer id="route_markers_a5e14af7_58c2_4a9e_8e4a_d8d9a41d2bb6" expanded="1" style="default"/>
       <expanded-legend-nodes id="route_markers_a5e14af7_58c2_4a9e_8e4a_d8d9a41d2bb6"/>
-      <layer style="default" expanded="0" id="osm_places20160930221519937"/>
-      <expanded-legend-nodes id="osm_places20160930221519937"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="0" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
         <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Elevation"/>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Marshal pages"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
         <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
       </expanded-group-nodes>
     </visibility-preset>
   </visibility-presets>
@@ -8496,12 +8469,12 @@ def my_form_open(dialog, layer, feature):
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout name="Routes" printResolution="192" worldFileMap="" units="mm">
-      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
-      <Grid offsetX="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetY="0"/>
+    <Layout worldFileMap="" printResolution="192" name="Routes" units="mm">
+      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
+      <Grid offsetY="0" offsetUnits="mm" resolution="10" offsetX="0" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" type="fill" alpha="1" clip_to_extent="1">
-          <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+        <symbol type="fill" clip_to_extent="1" name="" alpha="1">
+          <layer class="SimpleFill" enabled="1" pass="0" 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"/>
@@ -8515,130 +8488,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 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 position="0,0,mm" frameJoinStyle="miter" templateUuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" visibility="1" opacity="1" type="65638" uuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" background="true" groupUuid="" positionOnPage="0,0,mm" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" excludeFromExports="0" positionLock="false" zValue="0" blendMode="0" size="297,210,mm">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem zValue="0" background="true" type="65638" frameJoinStyle="miter" size="297,210,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="0,0,mm" uuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" templateUuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" excludeFromExports="0" position="0,0,mm" itemRotation="0" positionLock="false" id="" blendMode="0">
+          <FrameColor green="0" blue="0" red="0" alpha="255"/>
+          <BackgroundColor green="255" blue="255" red="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" units="mm" orientation="2" position="0"/>
+          <Guide page="0" position="0" units="mm" orientation="2"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem position="12.7639,188.018,mm" frameJoinStyle="miter" templateUuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" visibility="1" opacity="1" valign="64" type="65641" uuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" background="false" groupUuid="" positionOnPage="12.7639,188.018,mm" marginY="1" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" halign="1" excludeFromExports="0" positionLock="true" zValue="9" labelText="[%&quot;Distance&quot;%]" blendMode="0" size="14.6625,7.071,mm" htmlState="0" marginX="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="9" marginY="1" background="false" type="65641" frameJoinStyle="miter" size="14.6625,7.071,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" labelText="[%&quot;Distance&quot;%]" referencePoint="0" valign="64" visibility="1" positionOnPage="12.7639,188.018,mm" uuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" templateUuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" htmlState="0" excludeFromExports="0" position="12.7639,188.018,mm" itemRotation="0" positionLock="true" halign="1" id="" blendMode="0" marginX="1">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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 description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
-        <FontColor blue="0" red="0" green="0"/>
+        <FontColor green="0" blue="0" red="0"/>
       </LayoutItem>
-      <LayoutItem position="27.4264,188.118,mm" frameJoinStyle="miter" templateUuid="{d9f4225c-620f-4a62-a293-599f109f5206}" visibility="1" opacity="1" valign="64" type="65641" uuid="{d9f4225c-620f-4a62-a293-599f109f5206}" background="false" groupUuid="" positionOnPage="27.4264,188.118,mm" marginY="1" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" halign="1" excludeFromExports="0" positionLock="true" zValue="8" labelText="RACE ROUTE" blendMode="0" size="28.8048,6.8714,mm" htmlState="0" marginX="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="8" marginY="1" background="false" type="65641" frameJoinStyle="miter" size="28.8048,6.8714,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" labelText="RACE ROUTE" referencePoint="0" valign="64" visibility="1" positionOnPage="27.4264,188.118,mm" uuid="{d9f4225c-620f-4a62-a293-599f109f5206}" templateUuid="{d9f4225c-620f-4a62-a293-599f109f5206}" htmlState="0" excludeFromExports="0" position="27.4264,188.118,mm" itemRotation="0" positionLock="true" halign="1" id="" blendMode="0" marginX="1">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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 description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" red="0" green="0"/>
+        <FontColor green="0" blue="0" red="0"/>
       </LayoutItem>
-      <LayoutItem position="228.202,188.218,mm" frameJoinStyle="miter" templateUuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" visibility="1" opacity="1" valign="32" type="65641" uuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" background="false" groupUuid="" positionOnPage="228.202,188.218,mm" marginY="1" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" halign="2" excludeFromExports="0" positionLock="true" zValue="6" labelText="REVISION 3.0" blendMode="0" size="27.7839,6.8714,mm" htmlState="0" marginX="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="6" marginY="1" background="false" type="65641" frameJoinStyle="miter" size="27.7839,6.8714,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" labelText="REVISION 3.0" referencePoint="0" valign="32" visibility="1" positionOnPage="228.202,188.218,mm" uuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" templateUuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" htmlState="0" excludeFromExports="0" position="228.202,188.218,mm" itemRotation="0" positionLock="true" halign="2" id="" blendMode="0" marginX="1">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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 description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" red="0" green="0"/>
+        <FontColor green="0" blue="0" red="0"/>
       </LayoutItem>
-      <LayoutItem position="204.316,195.489,mm" frameJoinStyle="miter" templateUuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" visibility="1" opacity="1" valign="64" type="65641" uuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" background="false" groupUuid="" positionOnPage="204.316,195.489,mm" marginY="1" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" halign="2" excludeFromExports="0" positionLock="true" zValue="5" labelText="Sunday, 14 October 2018" blendMode="0" size="51.6706,6.60801,mm" htmlState="0" marginX="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="5" marginY="1" background="false" type="65641" frameJoinStyle="miter" size="51.6706,6.60801,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" labelText="Sunday, 14 October 2018" referencePoint="0" valign="64" visibility="1" positionOnPage="204.316,195.489,mm" uuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" templateUuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" htmlState="0" excludeFromExports="0" position="204.316,195.489,mm" itemRotation="0" positionLock="true" halign="2" id="" blendMode="0" marginX="1">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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 description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" red="0" green="0"/>
+        <FontColor green="0" blue="0" red="0"/>
       </LayoutItem>
-      <LayoutItem position="258.483,187.425,mm" northOffset="0" resizeMode="0" frameJoinStyle="miter" templateUuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" visibility="1" opacity="1" file="../Gun_Run_Logo_2018.png" type="65640" uuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" background="false" groupUuid="" positionOnPage="258.483,187.425,mm" itemRotation="0" anchorPoint="4" svgBorderWidth="0.2" referencePoint="0" pictureWidth="29.7021" frame="false" id="" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" excludeFromExports="0" svgBorderColor="0,0,0,255" positionLock="true" zValue="4" mapUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" northMode="0" blendMode="0" pictureRotation="0" size="29.7523,17.4718,mm" pictureHeight="17.4718">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="4" svgFillColor="255,255,255,255" background="false" type="65640" frameJoinStyle="miter" pictureRotation="0" size="29.7523,17.4718,mm" groupUuid="" outlineWidthM="0.3,mm" svgBorderColor="0,0,0,255" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="258.483,187.425,mm" uuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" templateUuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" excludeFromExports="0" position="258.483,187.425,mm" northOffset="0" pictureHeight="17.4718" svgBorderWidth="0.2" itemRotation="0" positionLock="true" mapUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" northMode="0" resizeMode="0" file="../Gun_Run_Logo_2018.png" id="" blendMode="0" pictureWidth="29.7021" anchorPoint="4">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option 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 position="12.9139,195.239,mm" shapeType="1" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" templateUuid="{5e005555-54ea-40fd-a5a7-20254950b890}" visibility="1" opacity="1" type="65643" uuid="{5e005555-54ea-40fd-a5a7-20254950b890}" background="false" groupUuid="" positionOnPage="12.9139,195.239,mm" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" excludeFromExports="0" positionLock="true" zValue="3" blendMode="0" size="242.922,0.1,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="3" background="false" type="65643" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" size="242.922,0.1,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="12.9139,195.239,mm" uuid="{5e005555-54ea-40fd-a5a7-20254950b890}" templateUuid="{5e005555-54ea-40fd-a5a7-20254950b890}" shapeType="1" excludeFromExports="0" position="12.9139,195.239,mm" itemRotation="0" positionLock="true" id="" blendMode="0">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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="" type="fill" alpha="1" clip_to_extent="1">
-          <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+        <symbol type="fill" clip_to_extent="1" name="" alpha="1">
+          <layer class="SimpleFill" enabled="1" pass="0" 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"/>
@@ -8652,64 +8625,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 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 position="8.86559,6.09761,mm" frameJoinStyle="miter" templateUuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" visibility="1" opacity="1" type="65639" uuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" background="false" groupUuid="" positionOnPage="8.86559,6.09761,mm" mapRotation="0" followPreset="true" itemRotation="0" referencePoint="0" frame="true" id="" outlineWidthM="0.3,mm" excludeFromExports="0" positionLock="true" zValue="2" keepLayerSet="false" blendMode="0" size="67.7828,166.874,mm" followPresetName="Routes" drawCanvasItems="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="2" background="false" type="65639" frameJoinStyle="miter" size="67.7828,166.874,mm" groupUuid="" outlineWidthM="0.3,mm" frame="true" opacity="1" referencePoint="0" visibility="1" positionOnPage="8.86559,6.09761,mm" uuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" templateUuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" keepLayerSet="false" excludeFromExports="0" position="8.86559,6.09761,mm" itemRotation="0" mapRotation="0" positionLock="true" drawCanvasItems="false" followPresetName="Routes" id="" followPreset="true" blendMode="0">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '22000'&#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 '22000'&#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 '2045260.277'&#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 '2045260.277'&#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 '-4021624.475'&#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 '-4021624.475'&#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="2050333.25980100058950484" ymin="-4018530.32327284989878535" xmin="2048166.31620243540965021" ymax="-4013195.54002301394939423"/>
+        <Extent ymin="-4018530.32327284989878535" xmin="2048166.31620243540965021" xmax="2050333.25980100058950484" ymax="-4013195.54002301394939423"/>
         <LayerSet/>
-        <ComposerMapGrid bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" gridFrameWidth="2" leftAnnotationDisplay="0" bottomAnnotationDirection="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" unit="0" gridFramePenThickness="0.5" frameAnnotationDistance="1" annotationPrecision="3" showAnnotation="0" annotationFormat="0" topAnnotationPosition="1" rightAnnotationPosition="1" annotationFontColor="0,0,0,255" frameFillColor1="255,255,255,255" topAnnotationDirection="0" gridFrameStyle="0" intervalX="0" bottomFrameDivisions="0" rightAnnotationDirection="0" gridStyle="0" topFrameDivisions="0" leftAnnotationDirection="0" show="0" rightFrameDivisions="0" name="Grid 1" offsetX="0" annotationExpression="" leftAnnotationPosition="1" crossLength="3" blendMode="0" rightAnnotationDisplay="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" intervalY="0" leftFrameDivisions="0" gridFrameSideFlags="15" offsetY="0">
+        <ComposerMapGrid crossLength="3" annotationExpression="" topFrameDivisions="0" offsetX="0" leftAnnotationPosition="1" rightAnnotationPosition="1" gridFramePenThickness="0.5" topAnnotationPosition="1" bottomFrameDivisions="0" leftFrameDivisions="0" bottomAnnotationDirection="0" blendMode="0" annotationFormat="0" gridFrameStyle="0" topAnnotationDisplay="0" bottomAnnotationPosition="1" gridFrameWidth="2" show="0" rightAnnotationDirection="0" unit="0" gridFrameSideFlags="15" intervalY="0" bottomAnnotationDisplay="0" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" leftAnnotationDirection="0" annotationFontColor="0,0,0,255" rightFrameDivisions="0" frameFillColor2="0,0,0,255" showAnnotation="0" intervalX="0" frameAnnotationDistance="1" offsetY="0" leftAnnotationDisplay="0" rightAnnotationDisplay="0" gridStyle="0" annotationPrecision="3" name="Grid 1" frameFillColor1="255,255,255,255" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}">
           <lineStyle>
-            <symbol name="" type="line" alpha="1" clip_to_extent="1">
-              <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+            <symbol type="line" clip_to_extent="1" name="" alpha="1">
+              <layer class="SimpleLine" enabled="1" pass="0" locked="0">
                 <prop v="square" k="capstyle"/>
                 <prop v="5;2" k="customdash"/>
                 <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -8727,17 +8700,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 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="" type="marker" alpha="1" clip_to_extent="1">
-              <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
+            <symbol type="marker" clip_to_extent="1" name="" alpha="1">
+              <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
                 <prop v="0" k="angle"/>
                 <prop v="0,0,0,255" k="color"/>
                 <prop v="1" k="horizontal_anchor_point"/>
@@ -8758,9 +8731,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 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>
@@ -8768,43 +8741,43 @@ def my_form_open(dialog, layer, feature):
           </markerStyle>
           <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="1" margin="0.05" scalingMode="2"/>
+        <AtlasMap margin="0.05" atlasDriven="1" scalingMode="2"/>
       </LayoutItem>
-      <LayoutItem position="12.7639,10.411,mm" frameJoinStyle="miter" templateUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" visibility="1" opacity="1" type="65639" uuid="{b35d820c-6054-4426-a840-5216bed2ca94}" background="true" groupUuid="" positionOnPage="12.7639,10.411,mm" mapRotation="0" followPreset="true" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" excludeFromExports="0" positionLock="false" zValue="1" keepLayerSet="false" blendMode="0" size="275.472,177.014,mm" followPresetName="Routes" drawCanvasItems="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="1" background="true" type="65639" frameJoinStyle="miter" size="275.472,177.014,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="12.7639,10.411,mm" uuid="{b35d820c-6054-4426-a840-5216bed2ca94}" templateUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" keepLayerSet="false" excludeFromExports="0" position="12.7639,10.411,mm" itemRotation="0" mapRotation="0" positionLock="false" drawCanvasItems="false" followPresetName="Routes" id="" followPreset="true" blendMode="0">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '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="true"/>
+                  <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="true" 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="true"/>
+                  <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="true" 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="true"/>
+                  <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="2050392.80700224405154586" ymin="-4016466.77900000009685755" xmin="2048192.80700000002980232" ymax="-4015053.09112637676298618"/>
+        <Extent ymin="-4016466.77900000009685755" xmin="2048192.80700000002980232" xmax="2050392.80700224405154586" ymax="-4015053.09112637676298618"/>
         <LayerSet/>
-        <ComposerMapGrid bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" gridFrameWidth="2" leftAnnotationDisplay="0" bottomAnnotationDirection="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" unit="0" gridFramePenThickness="0.5" frameAnnotationDistance="1" annotationPrecision="3" showAnnotation="0" annotationFormat="0" topAnnotationPosition="1" rightAnnotationPosition="1" annotationFontColor="0,0,0,255" frameFillColor1="255,255,255,255" topAnnotationDirection="0" gridFrameStyle="0" intervalX="0" bottomFrameDivisions="0" rightAnnotationDirection="0" gridStyle="0" topFrameDivisions="0" leftAnnotationDirection="0" show="0" rightFrameDivisions="0" name="Grid 1" offsetX="0" annotationExpression="" leftAnnotationPosition="1" crossLength="3" blendMode="0" rightAnnotationDisplay="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" intervalY="0" leftFrameDivisions="0" gridFrameSideFlags="15" offsetY="0">
+        <ComposerMapGrid crossLength="3" annotationExpression="" topFrameDivisions="0" offsetX="0" leftAnnotationPosition="1" rightAnnotationPosition="1" gridFramePenThickness="0.5" topAnnotationPosition="1" bottomFrameDivisions="0" leftFrameDivisions="0" bottomAnnotationDirection="0" blendMode="0" annotationFormat="0" gridFrameStyle="0" topAnnotationDisplay="0" bottomAnnotationPosition="1" gridFrameWidth="2" show="0" rightAnnotationDirection="0" unit="0" gridFrameSideFlags="15" intervalY="0" bottomAnnotationDisplay="0" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" leftAnnotationDirection="0" annotationFontColor="0,0,0,255" rightFrameDivisions="0" frameFillColor2="0,0,0,255" showAnnotation="0" intervalX="0" frameAnnotationDistance="1" offsetY="0" leftAnnotationDisplay="0" rightAnnotationDisplay="0" gridStyle="0" annotationPrecision="3" name="Grid 1" frameFillColor1="255,255,255,255" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}">
           <lineStyle>
-            <symbol name="" type="line" alpha="1" clip_to_extent="1">
-              <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+            <symbol type="line" clip_to_extent="1" name="" alpha="1">
+              <layer class="SimpleLine" enabled="1" pass="0" locked="0">
                 <prop v="square" k="capstyle"/>
                 <prop v="5;2" k="customdash"/>
                 <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -8822,17 +8795,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 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="" type="marker" alpha="1" clip_to_extent="1">
-              <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
+            <symbol type="marker" clip_to_extent="1" name="" alpha="1">
+              <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
                 <prop v="0" k="angle"/>
                 <prop v="0,0,0,255" k="color"/>
                 <prop v="1" k="horizontal_anchor_point"/>
@@ -8853,9 +8826,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 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>
@@ -8863,26 +8836,26 @@ def my_form_open(dialog, layer, feature):
           </markerStyle>
           <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="1" margin="0.10000000000000001" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="1" scalingMode="2"/>
       </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 coverageLayerSource="/home/tim/Documents/GunRunMaps/GIS base files and routes/all_routes.shp" coverageLayerProvider="ogr" hideCoverage="0" coverageLayer="all_routes20170907054841602" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21)' )" filterFeatures="1" sortKey="RouteLen" pageNameExpression="&quot;Distance&quot;" sortFeatures="1" enabled="1" coverageLayerName="all_routes" filenamePattern="'Gun Run 2018 - '||&quot;RouteLen&quot;||'KM rev '" sortAscending="0"/>
+      <Atlas filenamePattern="'Gun Run 2018 - '||&quot;RouteLen&quot;||'KM rev '" sortKey="RouteLen" sortAscending="0" sortFeatures="1" enabled="1" coverageLayer="all_routes20170907054841602" hideCoverage="0" pageNameExpression="&quot;Distance&quot;" coverageLayerProvider="ogr" coverageLayerName="all_routes" coverageLayerSource="/home/tim/Documents/Projects/2018/Gun Run/Maps/GIS base files and routes/all_routes.shp" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21)' )" filterFeatures="1"/>
     </Layout>
-    <Layout name="Marshals" printResolution="120" worldFileMap="" units="mm">
-      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
-      <Grid offsetX="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetY="0"/>
+    <Layout worldFileMap="" printResolution="120" name="Marshals" units="mm">
+      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
+      <Grid offsetY="0" offsetUnits="mm" resolution="10" offsetX="0" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" type="fill" alpha="1" clip_to_extent="1">
-          <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+        <symbol type="fill" clip_to_extent="1" name="" alpha="1">
+          <layer class="SimpleFill" enabled="1" pass="0" 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"/>
@@ -8896,22 +8869,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 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 position="0,0,mm" frameJoinStyle="miter" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" visibility="1" opacity="1" type="65638" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" background="true" groupUuid="" positionOnPage="0,0,mm" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" excludeFromExports="0" positionLock="false" zValue="0" blendMode="0" size="280.83,198.549,mm">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem zValue="0" background="true" type="65638" frameJoinStyle="miter" size="280.83,198.549,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="0,0,mm" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" excludeFromExports="0" position="0,0,mm" itemRotation="0" positionLock="false" id="" blendMode="0">
+          <FrameColor green="0" blue="0" red="0" alpha="255"/>
+          <BackgroundColor green="255" blue="255" red="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/>
@@ -8919,15 +8892,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem positionLock="true" outlineWidthM="0.1,mm" splitLayer="0" groupUuid="" lineSpacing="1" titleAlignment="1" referencePoint="0" type="65642" itemRotation="0" wrapChar="" size="19.9422,26,mm" excludeFromExports="0" wmsLegendHeight="25" symbolHeight="4" legendFilterByAtlas="0" frameJoinStyle="bevel" opacity="1" id="" wmsLegendWidth="50" title="" symbolWidth="7" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" rasterBorderColor="0,0,0,255" position="128.239,3.58,mm" visibility="1" rasterBorderWidth="0" rasterBorder="1" zValue="5" equalColumnWidth="1" fontColor="#000000" columnSpace="2" positionOnPage="128.239,3.58,mm" columnCount="1" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" blendMode="0" resizeToContents="1" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" frame="true" boxSpace="2" background="true">
-        <FrameColor alpha="255" blue="128" red="128" green="128"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem lineSpacing="1" itemRotation="0" referencePoint="0" equalColumnWidth="1" splitLayer="0" wmsLegendHeight="25" groupUuid="" id="" title="" symbolWidth="7" positionLock="true" blendMode="0" background="true" boxSpace="2" rasterBorderColor="0,0,0,255" frameJoinStyle="bevel" rasterBorderWidth="0" titleAlignment="1" size="19.9422,26,mm" opacity="1" position="128.239,3.58,mm" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" wrapChar="" positionOnPage="128.239,3.58,mm" resizeToContents="1" symbolHeight="4" visibility="1" zValue="5" columnSpace="2" frame="true" type="65642" wmsLegendWidth="50" rasterBorder="1" legendFilterByAtlas="0" columnCount="1" excludeFromExports="0" outlineWidthM="0.1,mm" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" fontColor="#000000" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}">
+        <FrameColor green="128" blue="128" red="128" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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/>
@@ -8945,45 +8918,45 @@ def my_form_open(dialog, layer, feature):
           <style name="symbol" marginTop="2">
             <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
           </style>
-          <style name="symbolLabel" marginTop="2" marginLeft="2">
+          <style name="symbolLabel" marginLeft="2" marginTop="2">
             <styleFont description="Myriad Pro,8,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties/>
-          <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" name="Routes" expanded="1">
             <customproperties/>
-            <layer-tree-layer name="all_routes" source="./all_routes.shp" providerKey="ogr" expanded="1" checked="Qt::Checked" id="all_routes20170907054841602">
+            <layer-tree-layer id="all_routes20170907054841602" checked="Qt::Checked" source="./all_routes.shp" providerKey="ogr" name="all_routes" expanded="1">
               <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 position="102.986,142.175,mm" frameJoinStyle="miter" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" visibility="1" opacity="1" type="65639" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" background="false" groupUuid="" positionOnPage="102.986,142.175,mm" mapRotation="0" followPreset="true" itemRotation="0" referencePoint="0" frame="true" id="" outlineWidthM="0.2,mm" excludeFromExports="0" positionLock="true" zValue="4" keepLayerSet="false" blendMode="0" size="50.4055,50.7436,mm" followPresetName="Marshal map - inset" drawCanvasItems="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="4" background="false" type="65639" frameJoinStyle="miter" size="50.4055,50.7436,mm" groupUuid="" outlineWidthM="0.2,mm" frame="true" opacity="1" referencePoint="0" visibility="1" positionOnPage="102.986,142.175,mm" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" keepLayerSet="false" excludeFromExports="0" position="102.986,142.175,mm" itemRotation="0" mapRotation="0" positionLock="true" drawCanvasItems="false" followPresetName="Marshal map - inset" id="" followPreset="true" blendMode="0">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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="2048641.13804376311600208" ymin="-4016806.15934272995218635" xmin="2047541.13804264133796096" ymax="-4015698.78098011249676347"/>
+        <Extent ymin="-4016806.15934272995218635" xmin="2047541.13804264133796096" xmax="2048641.13804376311600208" ymax="-4015698.78098011249676347"/>
         <LayerSet/>
-        <ComposerMapGrid bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" gridFrameWidth="2" leftAnnotationDisplay="0" bottomAnnotationDirection="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" unit="0" gridFramePenThickness="0.5" frameAnnotationDistance="1" annotationPrecision="3" showAnnotation="0" annotationFormat="0" topAnnotationPosition="1" rightAnnotationPosition="1" annotationFontColor="0,0,0,255" frameFillColor1="255,255,255,255" topAnnotationDirection="0" gridFrameStyle="0" intervalX="0" bottomFrameDivisions="0" rightAnnotationDirection="0" gridStyle="0" topFrameDivisions="0" leftAnnotationDirection="0" show="0" rightFrameDivisions="0" name="Grid 1" offsetX="0" annotationExpression="" leftAnnotationPosition="1" crossLength="3" blendMode="0" rightAnnotationDisplay="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" intervalY="0" leftFrameDivisions="0" gridFrameSideFlags="15" offsetY="0">
+        <ComposerMapGrid crossLength="3" annotationExpression="" topFrameDivisions="0" offsetX="0" leftAnnotationPosition="1" rightAnnotationPosition="1" gridFramePenThickness="0.5" topAnnotationPosition="1" bottomFrameDivisions="0" leftFrameDivisions="0" bottomAnnotationDirection="0" blendMode="0" annotationFormat="0" gridFrameStyle="0" topAnnotationDisplay="0" bottomAnnotationPosition="1" gridFrameWidth="2" show="0" rightAnnotationDirection="0" unit="0" gridFrameSideFlags="15" intervalY="0" bottomAnnotationDisplay="0" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" leftAnnotationDirection="0" annotationFontColor="0,0,0,255" rightFrameDivisions="0" frameFillColor2="0,0,0,255" showAnnotation="0" intervalX="0" frameAnnotationDistance="1" offsetY="0" leftAnnotationDisplay="0" rightAnnotationDisplay="0" gridStyle="0" annotationPrecision="3" name="Grid 1" frameFillColor1="255,255,255,255" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}">
           <lineStyle>
-            <symbol name="" type="line" alpha="1" clip_to_extent="1">
-              <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+            <symbol type="line" clip_to_extent="1" name="" alpha="1">
+              <layer class="SimpleLine" enabled="1" pass="0" locked="0">
                 <prop v="square" k="capstyle"/>
                 <prop v="5;2" k="customdash"/>
                 <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -9001,17 +8974,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 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="" type="marker" alpha="1" clip_to_extent="1">
-              <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
+            <symbol type="marker" clip_to_extent="1" name="" alpha="1">
+              <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
                 <prop v="0" k="angle"/>
                 <prop v="0,0,0,255" k="color"/>
                 <prop v="1" k="horizontal_anchor_point"/>
@@ -9032,9 +9005,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 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>
@@ -9042,9 +9015,9 @@ def my_form_open(dialog, layer, feature):
           </markerStyle>
           <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
         </ComposerMapGrid>
-        <ComposerMapOverview blendMode="0" name="Overview 1" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" show="1" inverted="0" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" centered="1">
-          <symbol name="" type="fill" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+        <ComposerMapOverview frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" blendMode="0" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" inverted="0" centered="1" show="1" name="Overview 1">
+          <symbol type="fill" clip_to_extent="1" name="" alpha="1">
+            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="0,0,255,75" k="color"/>
               <prop v="bevel" k="joinstyle"/>
@@ -9058,35 +9031,35 @@ 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 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>
         </ComposerMapOverview>
-        <AtlasMap atlasDriven="1" margin="0.10000000000000001" scalingMode="0"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="1" scalingMode="0"/>
       </LayoutItem>
-      <LayoutItem position="3.53,6.0007,mm" frameJoinStyle="miter" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" visibility="1" opacity="1" type="65639" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" background="false" groupUuid="" positionOnPage="3.53,6.0007,mm" mapRotation="0" followPreset="true" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" excludeFromExports="0" positionLock="true" zValue="3" keepLayerSet="false" blendMode="0" size="142,181,mm" followPresetName="Marshal map - main" drawCanvasItems="true">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="3" background="false" type="65639" frameJoinStyle="miter" size="142,181,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="3.53,6.0007,mm" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" keepLayerSet="false" excludeFromExports="0" position="3.53,6.0007,mm" itemRotation="0" mapRotation="0" positionLock="true" drawCanvasItems="true" followPresetName="Marshal map - main" id="" followPreset="true" blendMode="0">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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="2048204.73804331803694367" ymin="-4016397.27016156911849976" xmin="2047977.53804308641701937" ymax="-4016107.67016127333045006"/>
+        <Extent ymin="-4016397.27016156911849976" xmin="2047977.53804308641701937" xmax="2048204.73804331803694367" ymax="-4016107.67016127333045006"/>
         <LayerSet/>
-        <ComposerMapGrid bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" gridFrameWidth="2" leftAnnotationDisplay="0" bottomAnnotationDirection="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" unit="0" gridFramePenThickness="0.5" frameAnnotationDistance="1" annotationPrecision="3" showAnnotation="0" annotationFormat="0" topAnnotationPosition="1" rightAnnotationPosition="1" annotationFontColor="0,0,0,255" frameFillColor1="255,255,255,255" topAnnotationDirection="0" gridFrameStyle="0" intervalX="0" bottomFrameDivisions="0" rightAnnotationDirection="0" gridStyle="0" topFrameDivisions="0" leftAnnotationDirection="0" show="0" rightFrameDivisions="0" name="Grid 1" offsetX="0" annotationExpression="" leftAnnotationPosition="1" crossLength="3" blendMode="0" rightAnnotationDisplay="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" intervalY="0" leftFrameDivisions="0" gridFrameSideFlags="15" offsetY="0">
+        <ComposerMapGrid crossLength="3" annotationExpression="" topFrameDivisions="0" offsetX="0" leftAnnotationPosition="1" rightAnnotationPosition="1" gridFramePenThickness="0.5" topAnnotationPosition="1" bottomFrameDivisions="0" leftFrameDivisions="0" bottomAnnotationDirection="0" blendMode="0" annotationFormat="0" gridFrameStyle="0" topAnnotationDisplay="0" bottomAnnotationPosition="1" gridFrameWidth="2" show="0" rightAnnotationDirection="0" unit="0" gridFrameSideFlags="15" intervalY="0" bottomAnnotationDisplay="0" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" leftAnnotationDirection="0" annotationFontColor="0,0,0,255" rightFrameDivisions="0" frameFillColor2="0,0,0,255" showAnnotation="0" intervalX="0" frameAnnotationDistance="1" offsetY="0" leftAnnotationDisplay="0" rightAnnotationDisplay="0" gridStyle="0" annotationPrecision="3" name="Grid 1" frameFillColor1="255,255,255,255" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}">
           <lineStyle>
-            <symbol name="" type="line" alpha="1" clip_to_extent="1">
-              <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+            <symbol type="line" clip_to_extent="1" name="" alpha="1">
+              <layer class="SimpleLine" enabled="1" pass="0" locked="0">
                 <prop v="square" k="capstyle"/>
                 <prop v="5;2" k="customdash"/>
                 <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -9104,17 +9077,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 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="" type="marker" alpha="1" clip_to_extent="1">
-              <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
+            <symbol type="marker" clip_to_extent="1" name="" alpha="1">
+              <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
                 <prop v="0" k="angle"/>
                 <prop v="0,0,0,255" k="color"/>
                 <prop v="1" k="horizontal_anchor_point"/>
@@ -9135,9 +9108,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 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>
@@ -9145,83 +9118,83 @@ def my_form_open(dialog, layer, feature):
           </markerStyle>
           <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="1" margin="0.10000000000000001" scalingMode="0"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="1" scalingMode="0"/>
       </LayoutItem>
-      <LayoutItem position="277.3,6.0007,mm" frameJoinStyle="round" sectionHeight="159.418" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" visibility="1" opacity="1" type="65647" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" hidePageIfEmpty="0" background="false" sectionWidth="127.436" groupUuid="" positionOnPage="277.3,6.0007,mm" hideBackgroundIfEmpty="0" itemRotation="0" referencePoint="2" sectionY="0" frame="false" id="" outlineWidthM="0.3,mm" excludeFromExports="0" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" sectionX="0" positionLock="true" zValue="2" blendMode="0" size="127.436,159.418,mm" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}">
-        <FrameColor alpha="255" blue="119" red="119" green="119"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="2" background="false" type="65647" frameJoinStyle="round" size="127.436,159.418,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" hidePageIfEmpty="0" referencePoint="2" visibility="1" positionOnPage="277.3,6.0007,mm" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" sectionWidth="127.436" excludeFromExports="0" position="277.3,6.0007,mm" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" itemRotation="0" hideBackgroundIfEmpty="0" positionLock="true" sectionHeight="159.418" sectionX="0" sectionY="0" id="" blendMode="0">
+        <FrameColor green="119" blue="119" red="119" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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 position="230.194,167.419,mm" northOffset="0" resizeMode="0" frameJoinStyle="miter" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" visibility="1" opacity="1" file="../Gun_Run_Logo_2018.png" type="65640" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" background="false" groupUuid="" positionOnPage="230.194,167.419,mm" itemRotation="0" anchorPoint="0" svgBorderWidth="0.2" referencePoint="0" pictureWidth="46.92" frame="false" id="" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" excludeFromExports="0" svgBorderColor="0,0,0,255" positionLock="true" zValue="1" mapUuid="" northMode="0" blendMode="0" pictureRotation="0" size="47.1065,27.6,mm" pictureHeight="27.6">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="1" svgFillColor="255,255,255,255" background="false" type="65640" frameJoinStyle="miter" pictureRotation="0" size="47.1065,27.6,mm" groupUuid="" outlineWidthM="0.3,mm" svgBorderColor="0,0,0,255" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="230.194,167.419,mm" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" excludeFromExports="0" position="230.194,167.419,mm" northOffset="0" pictureHeight="27.6" svgBorderWidth="0.2" itemRotation="0" positionLock="true" mapUuid="" northMode="0" resizeMode="0" file="../Gun_Run_Logo_2018.png" id="" blendMode="0" pictureWidth="46.92" anchorPoint="0">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option 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 evaluateExpressions="true" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" type="65648" 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;&lt;tr>&lt;td>Last runner&lt;/td>&lt;td>[%csv_last_runner%]&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;&lt;tr>&lt;td>[%&quot;csv_captain&quot;%]&amp;nbsp;&lt;/td>&lt;td>[%&quot;csv_captain_number&quot;%]&lt;/td>&lt;/tr>&#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>" useSmartBreaks="true" maxBreakDistance="12" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" contentMode="1" url="" resizeMode="0" 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">
-        <childFrame templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}"/>
+      <LayoutMultiFrame evaluateExpressions="true" useSmartBreaks="true" type="65648" 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;}" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" maxBreakDistance="12" stylesheetEnabled="true" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;tr>&lt;td>Name&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', &quot;csv_name&quot;, '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;/td>&lt;/tr>', '')%]&#xa;&lt;tr>&lt;td>Club&lt;/td>&lt;td>[%csv_club%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%csv_captain%]&lt;/td>&lt;/tr>&#xa;&#xa;&lt;tr>&lt;td>Last runner&lt;/td>&lt;td>[%csv_last_runner%]&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;&lt;tr>&lt;td>[%&quot;csv_captain&quot;%]&amp;nbsp;&lt;/td>&lt;td>[%&quot;csv_captain_number&quot;%]&lt;/td>&lt;/tr>&#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" contentMode="1" 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 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>
-      <LayoutMultiFrame evaluateExpressions="true" templateUuid="{0d806c1b-c0e7-44f3-83a6-c25ae6c99cd3}" type="65648" html="" useSmartBreaks="true" maxBreakDistance="10" uuid="{0d806c1b-c0e7-44f3-83a6-c25ae6c99cd3}" contentMode="0" url="" resizeMode="0" stylesheet="" stylesheetEnabled="false">
+      <LayoutMultiFrame evaluateExpressions="true" useSmartBreaks="true" type="65648" stylesheet="" uuid="{0d806c1b-c0e7-44f3-83a6-c25ae6c99cd3}" templateUuid="{0d806c1b-c0e7-44f3-83a6-c25ae6c99cd3}" maxBreakDistance="10" stylesheetEnabled="false" html="" resizeMode="0" contentMode="0" url="">
         <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="png" key="atlasRasterFormat"/>
-        <property value="0" key="imageCropMarginUnit"/>
-        <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 key="atlasRasterFormat" value="png"/>
+        <property key="imageCropMarginUnit" value="0"/>
+        <property key="resizeToContentsBottomMargin" value="3.53"/>
+        <property key="resizeToContentsLeftMargin" value="3.53"/>
+        <property key="resizeToContentsRightMargin" value="3.53"/>
+        <property key="resizeToContentsTopMargin" value="3.53"/>
       </customproperties>
-      <Atlas coverageLayerSource="/home/tim/Documents/GunRunMaps/GIS base files and routes/marshal_positions.shp" coverageLayerProvider="ogr" hideCoverage="0" coverageLayer="marshal_positions20160930121322287" filterFeatures="0" sortKey="position" pageNameExpression="&quot;position&quot;" sortFeatures="1" enabled="1" coverageLayerName="marshal_positions" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" sortAscending="1"/>
+      <Atlas filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" sortKey="position" sortAscending="1" sortFeatures="1" enabled="1" coverageLayer="marshal_positions20160930121322287" hideCoverage="0" pageNameExpression="&quot;position&quot;" coverageLayerProvider="ogr" coverageLayerName="marshal_positions" coverageLayerSource="/home/tim/Documents/Projects/2018/Gun Run/Maps/GIS base files and routes/marshal_positions.shp" filterFeatures="0"/>
     </Layout>
-    <Layout name="Marshal Plan" printResolution="120" worldFileMap="" units="mm">
-      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
-      <Grid offsetX="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetY="0"/>
+    <Layout worldFileMap="" printResolution="120" name="Marshal Plan" units="mm">
+      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
+      <Grid offsetY="0" offsetUnits="mm" resolution="10" offsetX="0" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" type="fill" alpha="1" clip_to_extent="1">
-          <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+        <symbol type="fill" clip_to_extent="1" name="" alpha="1">
+          <layer class="SimpleFill" enabled="1" pass="0" 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"/>
@@ -9235,22 +9208,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 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 position="0,0,mm" frameJoinStyle="miter" templateUuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" visibility="1" opacity="1" type="65638" uuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" background="true" groupUuid="" positionOnPage="0,0,mm" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" excludeFromExports="0" positionLock="false" zValue="0" blendMode="0" size="297,420,mm">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem zValue="0" background="true" type="65638" frameJoinStyle="miter" size="297,420,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="0,0,mm" uuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" templateUuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" excludeFromExports="0" position="0,0,mm" itemRotation="0" positionLock="false" id="" blendMode="0">
+          <FrameColor green="0" blue="0" red="0" alpha="255"/>
+          <BackgroundColor green="255" blue="255" red="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/>
@@ -9258,15 +9231,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem positionLock="false" outlineWidthM="0.3,mm" splitLayer="0" groupUuid="" lineSpacing="1" titleAlignment="1" referencePoint="0" type="65642" itemRotation="0" wrapChar="" size="21.6797,27,mm" excludeFromExports="0" wmsLegendHeight="25" symbolHeight="4" legendFilterByAtlas="0" frameJoinStyle="miter" opacity="1" id="" wmsLegendWidth="50" title="" symbolWidth="7" templateUuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" rasterBorderColor="0,0,0,255" position="15.6525,12.5708,mm" visibility="1" rasterBorderWidth="0" rasterBorder="1" zValue="8" equalColumnWidth="1" fontColor="#000000" columnSpace="2" positionOnPage="15.6525,12.5708,mm" columnCount="1" map_uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" blendMode="0" resizeToContents="1" uuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" frame="false" boxSpace="2" background="true">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem lineSpacing="1" itemRotation="0" referencePoint="0" equalColumnWidth="1" splitLayer="0" wmsLegendHeight="25" groupUuid="" id="" title="" symbolWidth="7" positionLock="false" blendMode="0" background="true" boxSpace="2" rasterBorderColor="0,0,0,255" frameJoinStyle="miter" rasterBorderWidth="0" titleAlignment="1" size="21.6797,27,mm" opacity="1" position="15.6525,12.5708,mm" map_uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" wrapChar="" positionOnPage="15.6525,12.5708,mm" resizeToContents="1" symbolHeight="4" visibility="1" zValue="8" columnSpace="2" frame="false" type="65642" wmsLegendWidth="50" rasterBorder="1" legendFilterByAtlas="0" columnCount="1" excludeFromExports="0" outlineWidthM="0.3,mm" uuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" fontColor="#000000" templateUuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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/>
@@ -9284,125 +9257,125 @@ def my_form_open(dialog, layer, feature):
           <style name="symbol" marginTop="2">
             <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
           </style>
-          <style name="symbolLabel" marginTop="2" marginLeft="2">
+          <style name="symbolLabel" marginLeft="2" marginTop="2">
             <styleFont description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties/>
-          <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" name="Routes" expanded="1">
             <customproperties/>
-            <layer-tree-layer name="all_routes" source="./all_routes.shp" providerKey="ogr" expanded="1" checked="Qt::Checked" id="all_routes20170907054841602">
+            <layer-tree-layer id="all_routes20170907054841602" checked="Qt::Checked" source="./all_routes.shp" providerKey="ogr" name="all_routes" expanded="1">
               <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 position="5.69321,399.106,mm" frameJoinStyle="miter" templateUuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" visibility="1" opacity="1" valign="64" type="65641" uuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" background="false" groupUuid="" positionOnPage="5.69321,399.106,mm" marginY="1" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" halign="1" excludeFromExports="0" positionLock="false" zValue="7" labelText="MARSHAL POSITIONS" blendMode="0" size="45.1194,7.36972,mm" htmlState="0" marginX="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="7" marginY="1" background="false" type="65641" frameJoinStyle="miter" size="45.1194,7.36972,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" labelText="MARSHAL POSITIONS" referencePoint="0" valign="64" visibility="1" positionOnPage="5.69321,399.106,mm" uuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" templateUuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" htmlState="0" excludeFromExports="0" position="5.69321,399.106,mm" itemRotation="0" positionLock="false" halign="1" id="" blendMode="0" marginX="1">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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 description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
-        <FontColor blue="0" red="0" green="0"/>
+        <FontColor green="0" blue="0" red="0"/>
       </LayoutItem>
-      <LayoutItem position="5.69321,406.988,mm" frameJoinStyle="miter" templateUuid="{619c5aac-2a47-4730-9726-57b172205ef7}" visibility="1" opacity="1" valign="32" type="65641" uuid="{619c5aac-2a47-4730-9726-57b172205ef7}" background="false" groupUuid="" positionOnPage="5.69321,406.988,mm" marginY="1" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" halign="1" excludeFromExports="0" positionLock="false" zValue="6" labelText="Page [% &quot;page&quot; %]" blendMode="0" size="16.2476,7.80192,mm" htmlState="0" marginX="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="6" marginY="1" background="false" type="65641" frameJoinStyle="miter" size="16.2476,7.80192,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" labelText="Page [% &quot;page&quot; %]" referencePoint="0" valign="32" visibility="1" positionOnPage="5.69321,406.988,mm" uuid="{619c5aac-2a47-4730-9726-57b172205ef7}" templateUuid="{619c5aac-2a47-4730-9726-57b172205ef7}" htmlState="0" excludeFromExports="0" position="5.69321,406.988,mm" itemRotation="0" positionLock="false" halign="1" id="" blendMode="0" marginX="1">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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 description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" red="0" green="0"/>
+        <FontColor green="0" blue="0" red="0"/>
       </LayoutItem>
-      <LayoutItem position="214.292,406.988,mm" frameJoinStyle="miter" templateUuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" visibility="1" opacity="1" valign="32" type="65641" uuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" background="false" groupUuid="" positionOnPage="214.292,406.988,mm" marginY="1" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" halign="2" excludeFromExports="0" positionLock="false" zValue="5" labelText="REVISION 3.1" blendMode="0" size="27.7839,7.51682,mm" htmlState="0" marginX="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="5" marginY="1" background="false" type="65641" frameJoinStyle="miter" size="27.7839,7.51682,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" labelText="REVISION 3.1" referencePoint="0" valign="32" visibility="1" positionOnPage="214.292,406.988,mm" uuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" templateUuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" htmlState="0" excludeFromExports="0" position="214.292,406.988,mm" itemRotation="0" positionLock="false" halign="2" id="" blendMode="0" marginX="1">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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 description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" red="0" green="0"/>
+        <FontColor green="0" blue="0" red="0"/>
       </LayoutItem>
-      <LayoutItem position="185.72,399.107,mm" frameJoinStyle="miter" templateUuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" visibility="1" opacity="1" valign="64" type="65641" uuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" background="false" groupUuid="" positionOnPage="185.72,399.107,mm" marginY="1" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" halign="2" excludeFromExports="0" positionLock="false" zValue="4" labelText="Sunday, 14 October 2018" blendMode="0" size="56.3557,7.36902,mm" htmlState="0" marginX="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="4" marginY="1" background="false" type="65641" frameJoinStyle="miter" size="56.3557,7.36902,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" labelText="Sunday, 14 October 2018" referencePoint="0" valign="64" visibility="1" positionOnPage="185.72,399.107,mm" uuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" templateUuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" htmlState="0" excludeFromExports="0" position="185.72,399.107,mm" itemRotation="0" positionLock="false" halign="2" id="" blendMode="0" marginX="1">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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 description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" red="0" green="0"/>
+        <FontColor green="0" blue="0" red="0"/>
       </LayoutItem>
-      <LayoutItem position="243.319,382.696,mm" northOffset="0" resizeMode="0" frameJoinStyle="miter" templateUuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" visibility="1" opacity="1" file="../Gun_Run_Logo_2018.png" type="65640" uuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" background="false" groupUuid="" positionOnPage="243.319,382.696,mm" itemRotation="0" anchorPoint="8" svgBorderWidth="0.2" referencePoint="0" pictureWidth="49.3143" frame="false" id="" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" excludeFromExports="0" svgBorderColor="0,0,0,255" positionLock="false" zValue="3" mapUuid="" northMode="0" blendMode="0" pictureRotation="0" size="49.3143,31.2967,mm" pictureHeight="29.0084">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="3" svgFillColor="255,255,255,255" background="false" type="65640" frameJoinStyle="miter" pictureRotation="0" size="49.3143,31.2967,mm" groupUuid="" outlineWidthM="0.3,mm" svgBorderColor="0,0,0,255" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="243.319,382.696,mm" uuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" templateUuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" excludeFromExports="0" position="243.319,382.696,mm" northOffset="0" pictureHeight="29.0084" svgBorderWidth="0.2" itemRotation="0" positionLock="false" mapUuid="" northMode="0" resizeMode="0" file="../Gun_Run_Logo_2018.png" id="" blendMode="0" pictureWidth="49.3143" anchorPoint="8">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option 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 position="5.84321,406.626,mm" shapeType="1" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" templateUuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" visibility="1" opacity="1" type="65643" uuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" background="false" groupUuid="" positionOnPage="5.84321,406.626,mm" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" excludeFromExports="0" positionLock="false" zValue="2" blendMode="0" size="236.083,0.14328,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="2" background="false" type="65643" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" size="236.083,0.14328,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="5.84321,406.626,mm" uuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" templateUuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" shapeType="1" excludeFromExports="0" position="5.84321,406.626,mm" itemRotation="0" positionLock="false" id="" blendMode="0">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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="" type="fill" alpha="1" clip_to_extent="1">
-          <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+        <symbol type="fill" clip_to_extent="1" name="" alpha="1">
+          <layer class="SimpleFill" enabled="1" pass="0" 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"/>
@@ -9416,58 +9389,58 @@ 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 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 position="-8.18575,45.787,mm" frameJoinStyle="miter" templateUuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" visibility="1" opacity="1" type="65639" uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" background="true" groupUuid="" positionOnPage="-8.18575,45.787,mm" mapRotation="0" followPreset="true" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" excludeFromExports="0" positionLock="false" zValue="1" keepLayerSet="false" blendMode="0" size="286.94,392.396,mm" followPresetName="Marshal overview" drawCanvasItems="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="1" background="true" type="65639" frameJoinStyle="miter" size="286.94,392.396,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="-8.18575,45.787,mm" uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" templateUuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" keepLayerSet="false" excludeFromExports="0" position="-8.18575,45.787,mm" itemRotation="0" mapRotation="0" positionLock="false" drawCanvasItems="false" followPresetName="Marshal overview" id="" followPreset="true" blendMode="0">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="field" value="" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+              <Option 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="2046812.46911549428477883" ymin="-4021659.23377959709614515" xmin="2044778.48160414351150393" ymax="-4018877.7161276382394135"/>
+        <Extent ymin="-4021659.23377959709614515" xmin="2044778.48160414351150393" xmax="2046812.46911549428477883" ymax="-4018877.7161276382394135"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="1" margin="0" scalingMode="2"/>
+        <AtlasMap margin="0" atlasDriven="1" scalingMode="2"/>
       </LayoutItem>
       <customproperties>
-        <property value="png" key="atlasRasterFormat"/>
+        <property key="atlasRasterFormat" value="png"/>
       </customproperties>
-      <Atlas coverageLayerSource="/home/tim/Documents/GunRunMaps/GIS base files and routes/marshal overviews.shp" coverageLayerProvider="ogr" hideCoverage="1" coverageLayer="marshal_overviews_shp20160930210331241" filterFeatures="0" sortKey="page" pageNameExpression="&quot;page&quot;" sortFeatures="1" enabled="1" coverageLayerName="marshal overviews.shp" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1"/>
+      <Atlas filenamePattern="'output_'||@atlas_featurenumber" sortKey="page" sortAscending="1" sortFeatures="1" enabled="1" coverageLayer="marshal_overviews_shp20160930210331241" hideCoverage="1" pageNameExpression="&quot;page&quot;" coverageLayerProvider="ogr" coverageLayerName="marshal overviews.shp" coverageLayerSource="/home/tim/Documents/Projects/2018/Gun Run/Maps/GIS base files and routes/marshal overviews.shp" filterFeatures="0"/>
     </Layout>
-    <Layout name="Start &amp; Finish Backgrounds" printResolution="300" worldFileMap="" units="mm">
-      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
-      <Grid offsetX="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetY="0"/>
+    <Layout worldFileMap="" printResolution="300" name="Start &amp; Finish Backgrounds" units="mm">
+      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
+      <Grid offsetY="0" offsetUnits="mm" resolution="10" offsetX="0" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" type="fill" alpha="1" clip_to_extent="1">
-          <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+        <symbol type="fill" clip_to_extent="1" name="" alpha="1">
+          <layer class="SimpleFill" enabled="1" pass="0" 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"/>
@@ -9481,22 +9454,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 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 position="0,0,mm" frameJoinStyle="miter" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" visibility="1" opacity="1" type="65638" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" background="true" groupUuid="" positionOnPage="0,0,mm" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" excludeFromExports="0" positionLock="false" zValue="0" blendMode="0" size="297,210,mm">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem zValue="0" background="true" type="65638" frameJoinStyle="miter" size="297,210,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="0,0,mm" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" excludeFromExports="0" position="0,0,mm" itemRotation="0" positionLock="false" id="" blendMode="0">
+          <FrameColor green="0" blue="0" red="0" alpha="255"/>
+          <BackgroundColor green="255" blue="255" red="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/>
@@ -9504,99 +9477,99 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem position="286.027,2,mm" northOffset="0" resizeMode="0" frameJoinStyle="miter" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" visibility="1" opacity="1" file="arrows/NorthArrow_11.svg" type="65640" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" background="false" groupUuid="" positionOnPage="286.027,2,mm" itemRotation="0" anchorPoint="0" svgBorderWidth="0.2" referencePoint="0" pictureWidth="8.71429" frame="false" id="" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" excludeFromExports="0" svgBorderColor="0,0,0,255" positionLock="true" zValue="4" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" northMode="0" blendMode="0" pictureRotation="0" size="9.45865,11,mm" pictureHeight="11">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="4" svgFillColor="255,255,255,255" background="false" type="65640" frameJoinStyle="miter" pictureRotation="0" size="9.45865,11,mm" groupUuid="" outlineWidthM="0.3,mm" svgBorderColor="0,0,0,255" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="286.027,2,mm" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" excludeFromExports="0" position="286.027,2,mm" northOffset="0" pictureHeight="11" svgBorderWidth="0.2" itemRotation="0" positionLock="true" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" northMode="0" resizeMode="0" file="arrows/NorthArrow_11.svg" id="" blendMode="0" pictureWidth="8.71429" anchorPoint="0">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option 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 position="285.027,205.886,mm" frameJoinStyle="miter" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" visibility="1" opacity="1" valign="64" type="65641" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" background="false" groupUuid="" positionOnPage="285.027,205.886,mm" marginY="1" itemRotation="270" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" halign="1" excludeFromExports="0" positionLock="true" zValue="3" labelText="[%upper( &quot;area&quot; )%]" blendMode="0" size="142.543,10.3185,mm" htmlState="0" marginX="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="3" marginY="1" background="false" type="65641" frameJoinStyle="miter" size="142.543,10.3185,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" labelText="[%upper( &quot;area&quot; )%]" referencePoint="0" valign="64" visibility="1" positionOnPage="285.027,205.886,mm" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" htmlState="0" excludeFromExports="0" position="285.027,205.886,mm" itemRotation="270" positionLock="true" halign="1" id="" blendMode="0" marginX="1">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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 description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" red="0" green="0"/>
+        <FontColor green="0" blue="0" red="0"/>
       </LayoutItem>
-      <LayoutItem positionLock="true" outlineWidthM="0.3,mm" groupUuid="" labelBarSpace="3" referencePoint="0" type="65646" outlineWidth="0.3" itemRotation="0" style="Single Box" size="128.795,16.2165,mm" excludeFromExports="0" maxBarWidth="150" boxContentSpace="1" segmentMillimeters="23.069" numSegments="4" lineJoinStyle="miter" alignment="0" frameJoinStyle="miter" opacity="1" id="" numUnitsPerSegment="100" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" position="7,189.669,mm" visibility="1" zValue="2" numMapUnitsPerScaleBarUnit="1" segmentSizeMode="1" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" unitType="meters" positionOnPage="7,189.669,mm" lineCapStyle="square" blendMode="0" numSegmentsLeft="2" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" height="3" frame="false" minBarWidth="50" unitLabel="m" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" referencePoint="0" lineCapStyle="square" numSegments="4" unitLabel="m" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" groupUuid="" maxBarWidth="150" id="" positionLock="true" blendMode="0" background="false" frameJoinStyle="miter" size="128.795,16.2165,mm" opacity="1" segmentMillimeters="23.069" numSegmentsLeft="2" labelBarSpace="3" boxContentSpace="1" position="7,189.669,mm" positionOnPage="7,189.669,mm" visibility="1" zValue="2" numMapUnitsPerScaleBarUnit="1" height="3" numUnitsPerSegment="100" style="Single Box" frame="false" type="65646" excludeFromExports="0" alignment="0" outlineWidthM="0.3,mm" minBarWidth="50" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" unitType="meters" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" outlineWidth="0.3" segmentSizeMode="1" lineJoinStyle="miter">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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 blendMode="0" textOpacity="1" fontSizeUnit="Point" namedStyle="" fontSize="12" fontUnderline="0" fontLetterSpacing="0" fontStrikeout="0" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" fontWeight="50" fontItalic="0" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontCapitals="0">
-          <text-buffer bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeType="0" shapeSizeUnit="MM" shapeDraw="0" shapeJoinStyle="64" shapeOpacity="1" shapeSVGFile="" shapeOffsetUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetY="0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+        <text-style multilineHeight="1" fontWordSpacing="0" fontItalic="0" fontUnderline="0" blendMode="0" namedStyle="" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" fontSize="12" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOpacity="1" fontCapitals="0" fontLetterSpacing="0">
+          <text-buffer bufferNoFill="1" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <background shapeOffsetUnit="MM" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiY="0" shapeType="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeDraw="0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiUnit="MM" shapeOpacity="1"/>
+          <shadow shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.7" shadowOffsetAngle="135" shadowRadius="1.5" shadowBlendMode="6" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100"/>
         </text-style>
-        <fillColor alpha="255" blue="0" red="0" green="0"/>
-        <fillColor2 alpha="255" blue="255" red="255" green="255"/>
-        <strokeColor alpha="255" blue="0" red="0" green="0"/>
+        <fillColor green="0" blue="0" red="0" alpha="255"/>
+        <fillColor2 green="255" blue="255" red="255" alpha="255"/>
+        <strokeColor green="0" blue="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem position="7,5.5,mm" frameJoinStyle="miter" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" visibility="1" opacity="1" type="65639" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" background="false" groupUuid="" positionOnPage="7,5.5,mm" mapRotation="0" followPreset="false" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" excludeFromExports="0" positionLock="false" zValue="1" keepLayerSet="false" blendMode="0" size="278.027,180.318,mm" followPresetName="" drawCanvasItems="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="1" background="false" type="65639" frameJoinStyle="miter" size="278.027,180.318,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="7,5.5,mm" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" keepLayerSet="false" excludeFromExports="0" position="7,5.5,mm" itemRotation="0" mapRotation="0" positionLock="false" drawCanvasItems="false" followPresetName="" id="" followPreset="false" blendMode="0">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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="angle" 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="angle"/>
+                  <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="2049960.64797807228751481" ymin="-4016466.86311593884602189" xmin="2048510.00142486742697656" ymax="-4015526.02756694238632917"/>
+        <Extent ymin="-4016466.86311593884602189" xmin="2048510.00142486742697656" xmax="2049960.64797807228751481" ymax="-4015526.02756694238632917"/>
         <LayerSet/>
-        <ComposerMapGrid bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" gridFrameWidth="2" leftAnnotationDisplay="3" bottomAnnotationDirection="0" bottomAnnotationDisplay="3" topAnnotationDisplay="3" unit="1" gridFramePenThickness="0.5" frameAnnotationDistance="1" annotationPrecision="3" showAnnotation="0" annotationFormat="4" topAnnotationPosition="1" rightAnnotationPosition="1" annotationFontColor="0,0,0,255" frameFillColor1="255,255,255,255" topAnnotationDirection="0" gridFrameStyle="0" intervalX="5" bottomFrameDivisions="0" rightAnnotationDirection="0" gridStyle="0" topFrameDivisions="0" leftAnnotationDirection="0" show="0" rightFrameDivisions="0" name="Grid 1" offsetX="0" annotationExpression="" leftAnnotationPosition="1" crossLength="3" blendMode="0" rightAnnotationDisplay="3" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" intervalY="5" leftFrameDivisions="0" gridFrameSideFlags="15" offsetY="0">
+        <ComposerMapGrid crossLength="3" annotationExpression="" topFrameDivisions="0" offsetX="0" leftAnnotationPosition="1" rightAnnotationPosition="1" gridFramePenThickness="0.5" topAnnotationPosition="1" bottomFrameDivisions="0" leftFrameDivisions="0" bottomAnnotationDirection="0" blendMode="0" annotationFormat="4" gridFrameStyle="0" topAnnotationDisplay="3" bottomAnnotationPosition="1" gridFrameWidth="2" show="0" rightAnnotationDirection="0" unit="1" gridFrameSideFlags="15" intervalY="5" bottomAnnotationDisplay="3" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" leftAnnotationDirection="0" annotationFontColor="0,0,0,255" rightFrameDivisions="0" frameFillColor2="0,0,0,255" showAnnotation="0" intervalX="5" frameAnnotationDistance="1" offsetY="0" leftAnnotationDisplay="3" rightAnnotationDisplay="3" gridStyle="0" annotationPrecision="3" name="Grid 1" frameFillColor1="255,255,255,255" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}">
           <lineStyle>
-            <symbol name="" type="line" alpha="1" clip_to_extent="1">
-              <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+            <symbol type="line" clip_to_extent="1" name="" alpha="1">
+              <layer class="SimpleLine" enabled="1" pass="0" locked="0">
                 <prop v="square" k="capstyle"/>
                 <prop v="5;2" k="customdash"/>
                 <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -9614,17 +9587,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 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="" type="marker" alpha="1" clip_to_extent="1">
-              <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
+            <symbol type="marker" clip_to_extent="1" name="" alpha="1">
+              <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
                 <prop v="0" k="angle"/>
                 <prop v="0,0,0,255" k="color"/>
                 <prop v="1" k="horizontal_anchor_point"/>
@@ -9645,9 +9618,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 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>
@@ -9665,15 +9638,15 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
           <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="1" margin="0" scalingMode="2"/>
+        <AtlasMap margin="0" atlasDriven="1" scalingMode="2"/>
       </LayoutItem>
-      <LayoutMultiFrame wrapBehavior="0" showUniqueRowsOnly="0" resizeMode="0" gridStrokeWidth="0.5" templateUuid="{737c2bb8-5b53-425d-82dc-60beaf900cd9}" headerHAlignment="0" showEmptyRows="0" showGrid="1" type="65649" gridColor="0,0,0,255" uuid="{737c2bb8-5b53-425d-82dc-60beaf900cd9}" maxFeatures="30" horizontalGrid="1" emptyTableMessage="" headerMode="0" headerFontColor="0,0,0,255" relationId="" showOnlyVisibleFeatures="0" contentFontColor="0,0,0,255" cellMargin="1" featureFilter="" verticalGrid="1" backgroundColor="255,255,255,255" filterToAtlasIntersection="0" source="0" filterFeatures="false" wrapString="" emptyTableMode="0">
+      <LayoutMultiFrame type="65649" source="0" showGrid="1" gridColor="0,0,0,255" showUniqueRowsOnly="0" emptyTableMessage="" wrapBehavior="0" headerFontColor="0,0,0,255" contentFontColor="0,0,0,255" cellMargin="1" headerMode="0" horizontalGrid="1" showEmptyRows="0" showOnlyVisibleFeatures="0" featureFilter="" uuid="{737c2bb8-5b53-425d-82dc-60beaf900cd9}" templateUuid="{737c2bb8-5b53-425d-82dc-60beaf900cd9}" wrapString="" maxFeatures="30" headerHAlignment="0" relationId="" emptyTableMode="0" gridStrokeWidth="0.5" resizeMode="0" filterFeatures="false" verticalGrid="1" backgroundColor="255,255,255,255" filterToAtlasIntersection="0">
         <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/>
@@ -9682,28 +9655,28 @@ def my_form_open(dialog, layer, feature):
         <contentFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
         <displayColumns/>
         <cellStyles>
-          <oddColumns cellBackgroundColor="255,255,255,255" enabled="0"/>
-          <evenColumns cellBackgroundColor="255,255,255,255" enabled="0"/>
-          <oddRows cellBackgroundColor="255,255,255,255" enabled="0"/>
-          <evenRows cellBackgroundColor="255,255,255,255" enabled="0"/>
-          <firstColumn cellBackgroundColor="255,255,255,255" enabled="0"/>
-          <lastColumn cellBackgroundColor="255,255,255,255" enabled="0"/>
-          <headerRow cellBackgroundColor="255,255,255,255" enabled="0"/>
-          <firstRow cellBackgroundColor="255,255,255,255" enabled="0"/>
-          <lastRow cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <oddColumns enabled="0" cellBackgroundColor="255,255,255,255"/>
+          <evenColumns enabled="0" cellBackgroundColor="255,255,255,255"/>
+          <oddRows enabled="0" cellBackgroundColor="255,255,255,255"/>
+          <evenRows enabled="0" cellBackgroundColor="255,255,255,255"/>
+          <firstColumn enabled="0" cellBackgroundColor="255,255,255,255"/>
+          <lastColumn enabled="0" cellBackgroundColor="255,255,255,255"/>
+          <headerRow enabled="0" cellBackgroundColor="255,255,255,255"/>
+          <firstRow enabled="0" cellBackgroundColor="255,255,255,255"/>
+          <lastRow enabled="0" cellBackgroundColor="255,255,255,255"/>
         </cellStyles>
       </LayoutMultiFrame>
       <customproperties>
-        <property value="png" key="atlasRasterFormat"/>
+        <property key="atlasRasterFormat" value="png"/>
       </customproperties>
-      <Atlas hideCoverage="1" coverageLayer="" filterFeatures="0" sortKey="area" pageNameExpression="&quot;area&quot;" sortFeatures="1" enabled="1" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1"/>
+      <Atlas filenamePattern="'output_'||@atlas_featurenumber" sortKey="area" sortAscending="1" sortFeatures="1" enabled="1" coverageLayer="" hideCoverage="1" pageNameExpression="&quot;area&quot;" filterFeatures="0"/>
     </Layout>
-    <Layout name="Fencing" printResolution="300" worldFileMap="" units="mm">
-      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
-      <Grid offsetX="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetY="0"/>
+    <Layout worldFileMap="" printResolution="300" name="Fencing" units="mm">
+      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
+      <Grid offsetY="0" offsetUnits="mm" resolution="10" offsetX="0" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" type="fill" alpha="1" clip_to_extent="1">
-          <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+        <symbol type="fill" clip_to_extent="1" name="" alpha="1">
+          <layer class="SimpleFill" enabled="1" pass="0" 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"/>
@@ -9717,22 +9690,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 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 position="0,0,mm" frameJoinStyle="miter" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" visibility="1" opacity="1" type="65638" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" background="true" groupUuid="" positionOnPage="0,0,mm" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" excludeFromExports="0" positionLock="false" zValue="0" blendMode="0" size="297,210,mm">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem zValue="0" background="true" type="65638" frameJoinStyle="miter" size="297,210,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="0,0,mm" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" excludeFromExports="0" position="0,0,mm" itemRotation="0" positionLock="false" id="" blendMode="0">
+          <FrameColor green="0" blue="0" red="0" alpha="255"/>
+          <BackgroundColor green="255" blue="255" red="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/>
@@ -9740,105 +9713,105 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem position="6.76779,190.27,mm" frameJoinStyle="miter" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" visibility="1" opacity="1" valign="64" type="65641" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" background="false" groupUuid="" positionOnPage="6.76779,190.27,mm" marginY="1" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" halign="1" excludeFromExports="0" positionLock="true" zValue="9" labelText="FENCING: [% &quot;name&quot; %]" blendMode="0" size="148.46,7.36972,mm" htmlState="0" marginX="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="9" marginY="1" background="false" type="65641" frameJoinStyle="miter" size="148.46,7.36972,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" labelText="FENCING: [% &quot;name&quot; %]" referencePoint="0" valign="64" visibility="1" positionOnPage="6.76779,190.27,mm" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" htmlState="0" excludeFromExports="0" position="6.76779,190.27,mm" itemRotation="0" positionLock="true" halign="1" id="" blendMode="0" marginX="1">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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 description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
-        <FontColor blue="0" red="0" green="0"/>
+        <FontColor green="0" blue="0" red="0"/>
       </LayoutItem>
-      <LayoutItem position="6.76779,198.083,mm" frameJoinStyle="miter" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" visibility="1" opacity="1" valign="32" type="65641" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" background="false" groupUuid="" positionOnPage="6.76779,198.083,mm" marginY="1" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" halign="1" excludeFromExports="0" positionLock="true" zValue="8" labelText="Page [% &quot;group&quot; %]" blendMode="0" size="16.2476,7.80192,mm" htmlState="0" marginX="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="8" marginY="1" background="false" type="65641" frameJoinStyle="miter" size="16.2476,7.80192,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" labelText="Page [% &quot;group&quot; %]" referencePoint="0" valign="32" visibility="1" positionOnPage="6.76779,198.083,mm" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" htmlState="0" excludeFromExports="0" position="6.76779,198.083,mm" itemRotation="0" positionLock="true" halign="1" id="" blendMode="0" marginX="1">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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 description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" red="0" green="0"/>
+        <FontColor green="0" blue="0" red="0"/>
       </LayoutItem>
-      <LayoutItem position="211.295,197.64,mm" frameJoinStyle="miter" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" visibility="1" opacity="1" valign="32" type="65641" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" background="false" groupUuid="" positionOnPage="211.295,197.64,mm" marginY="1" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" halign="2" excludeFromExports="0" positionLock="true" zValue="7" labelText="REVISION 3.0" blendMode="0" size="27.7839,7.51682,mm" htmlState="0" marginX="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="7" marginY="1" background="false" type="65641" frameJoinStyle="miter" size="27.7839,7.51682,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" labelText="REVISION 3.0" referencePoint="0" valign="32" visibility="1" positionOnPage="211.295,197.64,mm" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" htmlState="0" excludeFromExports="0" position="211.295,197.64,mm" itemRotation="0" positionLock="true" halign="2" id="" blendMode="0" marginX="1">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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 description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" red="0" green="0"/>
+        <FontColor green="0" blue="0" red="0"/>
       </LayoutItem>
-      <LayoutItem position="182.723,190.271,mm" frameJoinStyle="miter" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" visibility="1" opacity="1" valign="64" type="65641" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" background="false" groupUuid="" positionOnPage="182.723,190.271,mm" marginY="1" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" halign="2" excludeFromExports="0" positionLock="true" zValue="6" labelText="Sunday, 14 October 2018" blendMode="0" size="56.3557,7.36902,mm" htmlState="0" marginX="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="6" marginY="1" background="false" type="65641" frameJoinStyle="miter" size="56.3557,7.36902,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" labelText="Sunday, 14 October 2018" referencePoint="0" valign="64" visibility="1" positionOnPage="182.723,190.271,mm" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" htmlState="0" excludeFromExports="0" position="182.723,190.271,mm" itemRotation="0" positionLock="true" halign="2" id="" blendMode="0" marginX="1">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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 description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" red="0" green="0"/>
+        <FontColor green="0" blue="0" red="0"/>
       </LayoutItem>
-      <LayoutItem position="243.098,175.353,mm" northOffset="0" resizeMode="0" frameJoinStyle="miter" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" visibility="1" opacity="1" file="../Gun_Run_Logo_2018.png" type="65640" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" background="false" groupUuid="" positionOnPage="243.098,175.353,mm" itemRotation="0" anchorPoint="8" svgBorderWidth="0.2" referencePoint="0" pictureWidth="49.3143" frame="false" id="" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" excludeFromExports="0" svgBorderColor="0,0,0,255" positionLock="true" zValue="5" mapUuid="" northMode="0" blendMode="0" pictureRotation="0" size="49.3143,29.8354,mm" pictureHeight="29.0084">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="5" svgFillColor="255,255,255,255" background="false" type="65640" frameJoinStyle="miter" pictureRotation="0" size="49.3143,29.8354,mm" groupUuid="" outlineWidthM="0.3,mm" svgBorderColor="0,0,0,255" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="243.098,175.353,mm" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" excludeFromExports="0" position="243.098,175.353,mm" northOffset="0" pictureHeight="29.0084" svgBorderWidth="0.2" itemRotation="0" positionLock="true" mapUuid="" northMode="0" resizeMode="0" file="../Gun_Run_Logo_2018.png" id="" blendMode="0" pictureWidth="49.3143" anchorPoint="8">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option 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 position="6.91779,197.79,mm" shapeType="1" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" visibility="1" opacity="1" type="65643" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" background="false" groupUuid="" positionOnPage="6.91779,197.79,mm" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" excludeFromExports="0" positionLock="true" zValue="4" blendMode="0" size="232.01,0.14328,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="4" background="false" type="65643" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" size="232.01,0.14328,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="6.91779,197.79,mm" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" shapeType="1" excludeFromExports="0" position="6.91779,197.79,mm" itemRotation="0" positionLock="true" id="" blendMode="0">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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="" type="fill" alpha="1" clip_to_extent="1">
-          <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+        <symbol type="fill" clip_to_extent="1" name="" alpha="1">
+          <layer class="SimpleFill" enabled="1" pass="0" 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"/>
@@ -9852,45 +9825,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 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 positionLock="true" outlineWidthM="0.3,mm" groupUuid="" labelBarSpace="1" referencePoint="0" type="65646" outlineWidth="0.2" itemRotation="0" style="Double Box" size="97.7059,15.8378,mm" excludeFromExports="0" maxBarWidth="100" boxContentSpace="0.2" segmentMillimeters="28.6853" numSegments="2" lineJoinStyle="round" alignment="0" frameJoinStyle="miter" opacity="1" id="" numUnitsPerSegment="100" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" position="6.76779,2.8482,mm" visibility="1" zValue="3" numMapUnitsPerScaleBarUnit="1" segmentSizeMode="1" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" unitType="meters" positionOnPage="6.76779,2.8482,mm" lineCapStyle="square" blendMode="0" numSegmentsLeft="2" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" height="2" frame="false" minBarWidth="25" unitLabel="m" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" referencePoint="0" lineCapStyle="square" numSegments="2" unitLabel="m" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" groupUuid="" maxBarWidth="100" id="" positionLock="true" blendMode="0" background="false" frameJoinStyle="miter" size="97.7059,15.8378,mm" opacity="1" segmentMillimeters="28.6853" numSegmentsLeft="2" labelBarSpace="1" boxContentSpace="0.2" position="6.76779,2.8482,mm" positionOnPage="6.76779,2.8482,mm" visibility="1" zValue="3" numMapUnitsPerScaleBarUnit="1" height="2" numUnitsPerSegment="100" style="Double Box" frame="false" type="65646" excludeFromExports="0" alignment="0" outlineWidthM="0.3,mm" minBarWidth="25" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" unitType="meters" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" outlineWidth="0.2" segmentSizeMode="1" lineJoinStyle="round">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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 blendMode="0" textOpacity="1" fontSizeUnit="Point" namedStyle="" fontSize="12" fontUnderline="0" fontLetterSpacing="0" fontStrikeout="0" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" fontWeight="50" fontItalic="0" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontCapitals="0">
-          <text-buffer bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeType="0" shapeSizeUnit="MM" shapeDraw="0" shapeJoinStyle="64" shapeOpacity="1" shapeSVGFile="" shapeOffsetUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetY="0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+        <text-style multilineHeight="1" fontWordSpacing="0" fontItalic="0" fontUnderline="0" blendMode="0" namedStyle="" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" fontSize="12" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOpacity="1" fontCapitals="0" fontLetterSpacing="0">
+          <text-buffer bufferNoFill="1" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <background shapeOffsetUnit="MM" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiY="0" shapeType="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeDraw="0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiUnit="MM" shapeOpacity="1"/>
+          <shadow shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.7" shadowOffsetAngle="135" shadowRadius="1.5" shadowBlendMode="6" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100"/>
         </text-style>
-        <fillColor alpha="255" blue="0" red="0" green="0"/>
-        <fillColor2 alpha="255" blue="255" red="255" green="255"/>
-        <strokeColor alpha="255" blue="0" red="0" green="0"/>
+        <fillColor green="0" blue="0" red="0" alpha="255"/>
+        <fillColor2 green="255" blue="255" red="255" alpha="255"/>
+        <strokeColor green="0" blue="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem positionLock="true" outlineWidthM="0.3,mm" splitLayer="0" groupUuid="" lineSpacing="1" titleAlignment="1" referencePoint="0" type="65642" itemRotation="0" wrapChar="" size="38.1563,54.6,mm" excludeFromExports="0" wmsLegendHeight="25" symbolHeight="4" legendFilterByAtlas="0" frameJoinStyle="miter" opacity="1" id="" wmsLegendWidth="50" title="" symbolWidth="7" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" rasterBorderColor="0,0,0,255" position="9.94906,16.8614,mm" visibility="1" rasterBorderWidth="0" rasterBorder="1" zValue="2" equalColumnWidth="1" fontColor="#000000" columnSpace="2" positionOnPage="9.94906,16.8614,mm" columnCount="1" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" blendMode="0" resizeToContents="0" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" frame="true" boxSpace="2" background="true">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem lineSpacing="1" itemRotation="0" referencePoint="0" equalColumnWidth="1" splitLayer="0" wmsLegendHeight="25" groupUuid="" id="" title="" symbolWidth="7" positionLock="true" blendMode="0" background="true" boxSpace="2" rasterBorderColor="0,0,0,255" frameJoinStyle="miter" rasterBorderWidth="0" titleAlignment="1" size="38.1563,54.6,mm" opacity="1" position="9.94906,16.8614,mm" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" wrapChar="" positionOnPage="9.94906,16.8614,mm" resizeToContents="0" symbolHeight="4" visibility="1" zValue="2" columnSpace="2" frame="true" type="65642" wmsLegendWidth="50" rasterBorder="1" legendFilterByAtlas="0" columnCount="1" excludeFromExports="0" outlineWidthM="0.3,mm" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" fontColor="#000000" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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/>
@@ -9908,78 +9881,78 @@ def my_form_open(dialog, layer, feature):
           <style name="symbol" marginTop="2.5">
             <styleFont description="Myriad Pro,9,-1,5,50,0,0,0,0,0" style=""/>
           </style>
-          <style name="symbolLabel" marginTop="2" marginLeft="2">
+          <style name="symbolLabel" marginLeft="2" marginTop="2">
             <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties/>
-          <layer-tree-group name="Fencing and Cones" expanded="1" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" name="Fencing and Cones" expanded="1">
             <customproperties/>
-            <layer-tree-layer name="fencing" source="./fencing.shp" providerKey="ogr" expanded="1" checked="Qt::Checked" id="fencing_504d8fa2_bdeb_4951_b151_966d5d257666">
+            <layer-tree-layer id="fencing_504d8fa2_bdeb_4951_b151_966d5d257666" checked="Qt::Checked" source="./fencing.shp" providerKey="ogr" name="fencing" expanded="1">
               <customproperties>
-                <property value="{6f66f64e-a034-49f3-a480-0837e467ccae}" key="expandedLegendNodes"/>
-                <property value="0,1,2" key="legend/node-order"/>
-                <property value="hidden" key="legend/title-style"/>
+                <property key="expandedLegendNodes" value="{6f66f64e-a034-49f3-a480-0837e467ccae}"/>
+                <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" expanded="1" checked="Qt::Unchecked">
+          <layer-tree-group checked="Qt::Unchecked" name="Routes" expanded="1">
             <customproperties/>
-            <layer-tree-layer name="all_routes" source="./all_routes.shp" providerKey="ogr" expanded="1" checked="Qt::Checked" id="all_routes20170907054841602">
+            <layer-tree-layer id="all_routes20170907054841602" checked="Qt::Checked" source="./all_routes.shp" providerKey="ogr" name="all_routes" expanded="1">
               <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 position="6.76779,9.35102,mm" frameJoinStyle="miter" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" visibility="1" opacity="0.9" type="65639" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" background="false" groupUuid="" positionOnPage="6.76779,9.35102,mm" mapRotation="0" followPreset="true" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" excludeFromExports="0" positionLock="true" zValue="1" keepLayerSet="false" blendMode="0" size="283.418,180.92,mm" followPresetName="Fencing" drawCanvasItems="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="1" background="false" type="65639" frameJoinStyle="miter" size="283.418,180.92,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="0.9" referencePoint="0" visibility="1" positionOnPage="6.76779,9.35102,mm" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" keepLayerSet="false" excludeFromExports="0" position="6.76779,9.35102,mm" itemRotation="0" mapRotation="0" positionLock="true" drawCanvasItems="false" followPresetName="Fencing" id="" followPreset="true" blendMode="0">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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="2049213.73264891747385263" ymin="-4016344.46716123353689909" xmin="2048024.4991738498210907" ymax="-4015585.32066458929330111"/>
+        <Extent ymin="-4016344.46716123353689909" xmin="2048024.4991738498210907" xmax="2049213.73264891747385263" ymax="-4015585.32066458929330111"/>
         <LayerSet/>
-        <ComposerMapGrid bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" gridFrameWidth="2" leftAnnotationDisplay="3" bottomAnnotationDirection="0" bottomAnnotationDisplay="3" topAnnotationDisplay="3" unit="1" gridFramePenThickness="0.5" frameAnnotationDistance="1" annotationPrecision="3" showAnnotation="0" annotationFormat="4" topAnnotationPosition="1" rightAnnotationPosition="1" annotationFontColor="0,0,0,255" frameFillColor1="255,255,255,255" topAnnotationDirection="0" gridFrameStyle="0" intervalX="5" bottomFrameDivisions="0" rightAnnotationDirection="0" gridStyle="0" topFrameDivisions="0" leftAnnotationDirection="0" show="0" rightFrameDivisions="0" name="Grid 1" offsetX="0" annotationExpression="" leftAnnotationPosition="1" crossLength="3" blendMode="0" rightAnnotationDisplay="3" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" intervalY="5" leftFrameDivisions="0" gridFrameSideFlags="15" offsetY="0">
+        <ComposerMapGrid crossLength="3" annotationExpression="" topFrameDivisions="0" offsetX="0" leftAnnotationPosition="1" rightAnnotationPosition="1" gridFramePenThickness="0.5" topAnnotationPosition="1" bottomFrameDivisions="0" leftFrameDivisions="0" bottomAnnotationDirection="0" blendMode="0" annotationFormat="4" gridFrameStyle="0" topAnnotationDisplay="3" bottomAnnotationPosition="1" gridFrameWidth="2" show="0" rightAnnotationDirection="0" unit="1" gridFrameSideFlags="15" intervalY="5" bottomAnnotationDisplay="3" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" leftAnnotationDirection="0" annotationFontColor="0,0,0,255" rightFrameDivisions="0" frameFillColor2="0,0,0,255" showAnnotation="0" intervalX="5" frameAnnotationDistance="1" offsetY="0" leftAnnotationDisplay="3" rightAnnotationDisplay="3" gridStyle="0" annotationPrecision="3" name="Grid 1" frameFillColor1="255,255,255,255" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}">
           <lineStyle>
-            <symbol name="" type="line" alpha="1" clip_to_extent="1">
-              <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+            <symbol type="line" clip_to_extent="1" name="" alpha="1">
+              <layer class="SimpleLine" enabled="1" pass="0" locked="0">
                 <prop v="square" k="capstyle"/>
                 <prop v="5;2" k="customdash"/>
                 <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -9997,17 +9970,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 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="" type="marker" alpha="1" clip_to_extent="1">
-              <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
+            <symbol type="marker" clip_to_extent="1" name="" alpha="1">
+              <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
                 <prop v="0" k="angle"/>
                 <prop v="0,0,0,255" k="color"/>
                 <prop v="1" k="horizontal_anchor_point"/>
@@ -10028,9 +10001,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 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>
@@ -10048,15 +10021,15 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
           <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="1" margin="0.40000000000000002" scalingMode="2"/>
+        <AtlasMap margin="0.40000000000000002" atlasDriven="1" scalingMode="2"/>
       </LayoutItem>
-      <LayoutMultiFrame wrapBehavior="0" showUniqueRowsOnly="0" resizeMode="0" gridStrokeWidth="0.5" templateUuid="{43340fd2-8050-4790-8e1c-aa5a6eed94bb}" headerHAlignment="0" showEmptyRows="0" showGrid="1" type="65649" gridColor="0,0,0,255" uuid="{43340fd2-8050-4790-8e1c-aa5a6eed94bb}" maxFeatures="30" horizontalGrid="1" emptyTableMessage="" headerMode="0" headerFontColor="0,0,0,255" relationId="" showOnlyVisibleFeatures="0" contentFontColor="0,0,0,255" cellMargin="1" featureFilter="" verticalGrid="1" backgroundColor="255,255,255,255" filterToAtlasIntersection="0" source="0" filterFeatures="false" wrapString="" emptyTableMode="0">
+      <LayoutMultiFrame type="65649" source="0" showGrid="1" gridColor="0,0,0,255" showUniqueRowsOnly="0" emptyTableMessage="" wrapBehavior="0" headerFontColor="0,0,0,255" contentFontColor="0,0,0,255" cellMargin="1" headerMode="0" horizontalGrid="1" showEmptyRows="0" showOnlyVisibleFeatures="0" featureFilter="" uuid="{43340fd2-8050-4790-8e1c-aa5a6eed94bb}" templateUuid="{43340fd2-8050-4790-8e1c-aa5a6eed94bb}" wrapString="" maxFeatures="30" headerHAlignment="0" relationId="" emptyTableMode="0" gridStrokeWidth="0.5" resizeMode="0" filterFeatures="false" verticalGrid="1" backgroundColor="255,255,255,255" filterToAtlasIntersection="0">
         <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/>
@@ -10065,41 +10038,41 @@ def my_form_open(dialog, layer, feature):
         <contentFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
         <displayColumns/>
         <cellStyles>
-          <oddColumns cellBackgroundColor="255,255,255,255" enabled="0"/>
-          <evenColumns cellBackgroundColor="255,255,255,255" enabled="0"/>
-          <oddRows cellBackgroundColor="255,255,255,255" enabled="0"/>
-          <evenRows cellBackgroundColor="255,255,255,255" enabled="0"/>
-          <firstColumn cellBackgroundColor="255,255,255,255" enabled="0"/>
-          <lastColumn cellBackgroundColor="255,255,255,255" enabled="0"/>
-          <headerRow cellBackgroundColor="255,255,255,255" enabled="0"/>
-          <firstRow cellBackgroundColor="255,255,255,255" enabled="0"/>
-          <lastRow cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <oddColumns enabled="0" cellBackgroundColor="255,255,255,255"/>
+          <evenColumns enabled="0" cellBackgroundColor="255,255,255,255"/>
+          <oddRows enabled="0" cellBackgroundColor="255,255,255,255"/>
+          <evenRows enabled="0" cellBackgroundColor="255,255,255,255"/>
+          <firstColumn enabled="0" cellBackgroundColor="255,255,255,255"/>
+          <lastColumn enabled="0" cellBackgroundColor="255,255,255,255"/>
+          <headerRow enabled="0" cellBackgroundColor="255,255,255,255"/>
+          <firstRow enabled="0" cellBackgroundColor="255,255,255,255"/>
+          <lastRow enabled="0" cellBackgroundColor="255,255,255,255"/>
         </cellStyles>
       </LayoutMultiFrame>
-      <LayoutMultiFrame evaluateExpressions="true" templateUuid="{01484c91-0284-48d9-8117-8626ca23e6c1}" type="65648" html="" useSmartBreaks="true" maxBreakDistance="10" uuid="{01484c91-0284-48d9-8117-8626ca23e6c1}" contentMode="1" url="" resizeMode="0" stylesheet="" stylesheetEnabled="false">
+      <LayoutMultiFrame evaluateExpressions="true" useSmartBreaks="true" type="65648" stylesheet="" uuid="{01484c91-0284-48d9-8117-8626ca23e6c1}" templateUuid="{01484c91-0284-48d9-8117-8626ca23e6c1}" maxBreakDistance="10" stylesheetEnabled="false" html="" resizeMode="0" contentMode="1" url="">
         <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="png" key="atlasRasterFormat"/>
-        <property value="true" key="rasterize"/>
+        <property key="atlasRasterFormat" value="png"/>
+        <property key="rasterize" value="true"/>
       </customproperties>
-      <Atlas coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20fencing%20GROUP%20BY%20%22group%22&amp;geometry=geometry:3:0" coverageLayerProvider="virtual" hideCoverage="1" coverageLayer="fence_groups_b08dad12_5ae6_4ba8_b737_e74b37bd274c" filterFeatures="0" sortKey="group" pageNameExpression="&quot;name&quot;" sortFeatures="1" enabled="1" coverageLayerName="fence_groups" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1"/>
+      <Atlas filenamePattern="'output_'||@atlas_featurenumber" sortKey="group" sortAscending="1" sortFeatures="1" enabled="1" coverageLayer="fence_groups_b08dad12_5ae6_4ba8_b737_e74b37bd274c" hideCoverage="1" pageNameExpression="&quot;name&quot;" coverageLayerProvider="virtual" coverageLayerName="fence_groups" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20fencing%20GROUP%20BY%20%22group%22&amp;geometry=geometry:3:0" filterFeatures="0"/>
     </Layout>
-    <Layout name="Access Roads" printResolution="192" worldFileMap="" units="mm">
-      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
-      <Grid offsetX="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetY="0"/>
+    <Layout worldFileMap="" printResolution="192" name="Access Roads" units="mm">
+      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
+      <Grid offsetY="0" offsetUnits="mm" resolution="10" offsetX="0" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" type="fill" alpha="1" clip_to_extent="1">
-          <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+        <symbol type="fill" clip_to_extent="1" name="" alpha="1">
+          <layer class="SimpleFill" enabled="1" pass="0" 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"/>
@@ -10113,40 +10086,56 @@ 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 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 position="0,0,mm" frameJoinStyle="miter" templateUuid="{e7a46ede-6ed1-40d7-9752-ba4364902d22}" visibility="1" opacity="1" type="65638" uuid="{e7a46ede-6ed1-40d7-9752-ba4364902d22}" background="true" groupUuid="" positionOnPage="0,0,mm" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" excludeFromExports="0" positionLock="false" zValue="0" blendMode="0" size="297,210,mm">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem zValue="0" background="true" type="65638" frameJoinStyle="miter" size="297,210,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="0,0,mm" uuid="{e7a46ede-6ed1-40d7-9752-ba4364902d22}" templateUuid="{e7a46ede-6ed1-40d7-9752-ba4364902d22}" excludeFromExports="0" position="0,0,mm" itemRotation="0" positionLock="false" id="" blendMode="0">
+          <FrameColor green="0" blue="0" red="0" alpha="255"/>
+          <BackgroundColor green="255" blue="255" red="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" units="mm" orientation="2" position="0"/>
+          <Guide page="0" position="0" units="mm" orientation="2"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem positionLock="true" outlineWidthM="0.3,mm" splitLayer="0" groupUuid="" lineSpacing="1" titleAlignment="1" referencePoint="0" type="65642" itemRotation="0" wrapChar="" size="34.45,27.8,mm" excludeFromExports="0" wmsLegendHeight="25" symbolHeight="4" legendFilterByAtlas="0" frameJoinStyle="miter" opacity="1" id="" wmsLegendWidth="50" title="" symbolWidth="7" templateUuid="{ef1ab7a2-aa35-40d9-a9c1-feff185d19f4}" rasterBorderColor="0,0,0,255" position="249.711,156.015,mm" visibility="1" rasterBorderWidth="0" rasterBorder="1" zValue="8" equalColumnWidth="0" fontColor="#000000" columnSpace="2" positionOnPage="249.711,156.015,mm" columnCount="1" map_uuid="{6abeaf6e-4f52-413a-a7ff-23ce2850a84c}" blendMode="0" resizeToContents="1" uuid="{ef1ab7a2-aa35-40d9-a9c1-feff185d19f4}" frame="true" boxSpace="2" background="true">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="185" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="8" marginY="1" background="false" type="65641" frameJoinStyle="miter" size="110.769,6.8714,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" labelText="ACCESS ROADS FOR RESIDENTS" referencePoint="0" valign="64" visibility="1" positionOnPage="8.71559,188.218,mm" uuid="{01e42ab4-6e28-4fb2-b1a1-06b256ff505b}" templateUuid="{01e42ab4-6e28-4fb2-b1a1-06b256ff505b}" htmlState="0" excludeFromExports="0" position="8.71559,188.218,mm" itemRotation="0" positionLock="true" halign="1" id="" blendMode="0" marginX="1">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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 description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
+        <FontColor green="0" blue="0" red="0"/>
+      </LayoutItem>
+      <LayoutItem lineSpacing="1" itemRotation="0" referencePoint="0" equalColumnWidth="0" splitLayer="0" wmsLegendHeight="25" groupUuid="" id="" title="" symbolWidth="7" positionLock="true" blendMode="0" background="true" boxSpace="2" rasterBorderColor="0,0,0,255" frameJoinStyle="miter" rasterBorderWidth="0" titleAlignment="1" size="34.45,27.8,mm" opacity="1" position="249.711,156.015,mm" map_uuid="{6abeaf6e-4f52-413a-a7ff-23ce2850a84c}" wrapChar="" positionOnPage="249.711,156.015,mm" resizeToContents="1" symbolHeight="4" visibility="1" zValue="8" columnSpace="2" frame="true" type="65642" wmsLegendWidth="50" rasterBorder="1" legendFilterByAtlas="0" columnCount="1" excludeFromExports="0" outlineWidthM="0.3,mm" uuid="{ef1ab7a2-aa35-40d9-a9c1-feff185d19f4}" fontColor="#000000" templateUuid="{ef1ab7a2-aa35-40d9-a9c1-feff185d19f4}">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="255" alpha="185"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option type="QString" name="name" value=""/>
+              <Option name="properties"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
@@ -10164,106 +10153,90 @@ def my_form_open(dialog, layer, feature):
           <style name="symbol" marginTop="2.5">
             <styleFont description="Myriad Pro,9,-1,5,50,0,0,0,0,0" style=""/>
           </style>
-          <style name="symbolLabel" marginTop="2" marginLeft="2">
+          <style name="symbolLabel" marginLeft="2" marginTop="2">
             <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties/>
-          <layer-tree-group name="Residents Access" expanded="1" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" name="Residents Access" expanded="1">
             <customproperties/>
-            <layer-tree-layer name="residents_access_roads" source="./residents_access_roads.shp" providerKey="ogr" expanded="1" checked="Qt::Checked" id="residents_access_roads_a7a1b453_729e_4ac7_bb64_95381b84aa35">
+            <layer-tree-layer id="residents_access_roads_a7a1b453_729e_4ac7_bb64_95381b84aa35" checked="Qt::Checked" source="./residents_access_roads.shp" providerKey="ogr" name="residents_access_roads" expanded="1">
               <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 position="8.71559,188.218,mm" frameJoinStyle="miter" templateUuid="{01e42ab4-6e28-4fb2-b1a1-06b256ff505b}" visibility="1" opacity="1" valign="64" type="65641" uuid="{01e42ab4-6e28-4fb2-b1a1-06b256ff505b}" background="false" groupUuid="" positionOnPage="8.71559,188.218,mm" marginY="1" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" halign="1" excludeFromExports="0" positionLock="true" zValue="8" labelText="ACCESS ROADS FOR RESIDENTS" blendMode="0" size="110.769,6.8714,mm" htmlState="0" marginX="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="6" marginY="1" background="false" type="65641" frameJoinStyle="miter" size="27.7839,6.8714,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" labelText="REVISION 1.0" referencePoint="0" valign="32" visibility="1" positionOnPage="221.927,188.418,mm" uuid="{8ccb6d0c-ddd6-4cad-aadd-4083b1b576f7}" templateUuid="{8ccb6d0c-ddd6-4cad-aadd-4083b1b576f7}" htmlState="0" excludeFromExports="0" position="221.927,188.418,mm" itemRotation="0" positionLock="true" halign="2" id="" blendMode="0" marginX="1">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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>
-          </dataDefinedProperties>
-          <customproperties/>
-        </LayoutObject>
-        <LabelFont description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" red="0" green="0"/>
-      </LayoutItem>
-      <LayoutItem position="221.927,188.418,mm" frameJoinStyle="miter" templateUuid="{8ccb6d0c-ddd6-4cad-aadd-4083b1b576f7}" visibility="1" opacity="1" valign="32" type="65641" uuid="{8ccb6d0c-ddd6-4cad-aadd-4083b1b576f7}" background="false" groupUuid="" positionOnPage="221.927,188.418,mm" marginY="1" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" halign="2" excludeFromExports="0" positionLock="true" zValue="6" labelText="REVISION 1.0" blendMode="0" size="27.7839,6.8714,mm" htmlState="0" marginX="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" red="0" green="0"/>
+        <FontColor green="0" blue="0" red="0"/>
       </LayoutItem>
-      <LayoutItem position="198.04,195.289,mm" frameJoinStyle="miter" templateUuid="{3bbaa5f9-89ac-48d3-a353-2300ae2ee77a}" visibility="1" opacity="1" valign="64" type="65641" uuid="{3bbaa5f9-89ac-48d3-a353-2300ae2ee77a}" background="false" groupUuid="" positionOnPage="198.04,195.289,mm" marginY="1" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" halign="2" excludeFromExports="0" positionLock="true" zValue="5" labelText="Sunday, 14 October 2018" blendMode="0" size="51.6706,6.60801,mm" htmlState="0" marginX="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="5" marginY="1" background="false" type="65641" frameJoinStyle="miter" size="51.6706,6.60801,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" labelText="Sunday, 14 October 2018" referencePoint="0" valign="64" visibility="1" positionOnPage="198.04,195.289,mm" uuid="{3bbaa5f9-89ac-48d3-a353-2300ae2ee77a}" templateUuid="{3bbaa5f9-89ac-48d3-a353-2300ae2ee77a}" htmlState="0" excludeFromExports="0" position="198.04,195.289,mm" itemRotation="0" positionLock="true" halign="2" id="" blendMode="0" marginX="1">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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 description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" red="0" green="0"/>
+        <FontColor green="0" blue="0" red="0"/>
       </LayoutItem>
-      <LayoutItem position="258.483,187.425,mm" northOffset="0" resizeMode="0" frameJoinStyle="miter" templateUuid="{2cfcbf86-f98d-4d23-aa32-aeea01173940}" visibility="1" opacity="1" file="../Gun_Run_Logo_2018.png" type="65640" uuid="{2cfcbf86-f98d-4d23-aa32-aeea01173940}" background="false" groupUuid="" positionOnPage="258.483,187.425,mm" itemRotation="0" anchorPoint="4" svgBorderWidth="0.2" referencePoint="0" pictureWidth="29.7021" frame="false" id="" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" excludeFromExports="0" svgBorderColor="0,0,0,255" positionLock="true" zValue="4" mapUuid="" northMode="0" blendMode="0" pictureRotation="0" size="29.7523,17.4718,mm" pictureHeight="17.4718">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="4" svgFillColor="255,255,255,255" background="false" type="65640" frameJoinStyle="miter" pictureRotation="0" size="29.7523,17.4718,mm" groupUuid="" outlineWidthM="0.3,mm" svgBorderColor="0,0,0,255" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="258.483,187.425,mm" uuid="{2cfcbf86-f98d-4d23-aa32-aeea01173940}" templateUuid="{2cfcbf86-f98d-4d23-aa32-aeea01173940}" excludeFromExports="0" position="258.483,187.425,mm" northOffset="0" pictureHeight="17.4718" svgBorderWidth="0.2" itemRotation="0" positionLock="true" mapUuid="" northMode="0" resizeMode="0" file="../Gun_Run_Logo_2018.png" id="" blendMode="0" pictureWidth="29.7021" anchorPoint="4">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option 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 position="8.86559,195.239,mm" shapeType="1" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" templateUuid="{7a78f7dc-95f1-4b1c-a72d-cb0ca03341de}" visibility="1" opacity="1" type="65643" uuid="{7a78f7dc-95f1-4b1c-a72d-cb0ca03341de}" background="false" groupUuid="" positionOnPage="8.86559,195.239,mm" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" excludeFromExports="0" positionLock="true" zValue="3" blendMode="0" size="240.695,0.1,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="3" background="false" type="65643" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" size="240.695,0.1,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="8.86559,195.239,mm" uuid="{7a78f7dc-95f1-4b1c-a72d-cb0ca03341de}" templateUuid="{7a78f7dc-95f1-4b1c-a72d-cb0ca03341de}" shapeType="1" excludeFromExports="0" position="8.86559,195.239,mm" itemRotation="0" positionLock="true" id="" blendMode="0">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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="" type="fill" alpha="1" clip_to_extent="1">
-          <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+        <symbol type="fill" clip_to_extent="1" name="" alpha="1">
+          <layer class="SimpleFill" enabled="1" pass="0" 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"/>
@@ -10277,59 +10250,59 @@ 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 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 position="8.86559,6.09761,mm" frameJoinStyle="miter" templateUuid="{6abeaf6e-4f52-413a-a7ff-23ce2850a84c}" visibility="1" opacity="1" type="65639" uuid="{6abeaf6e-4f52-413a-a7ff-23ce2850a84c}" background="false" groupUuid="" positionOnPage="8.86559,6.09761,mm" mapRotation="0" followPreset="true" itemRotation="0" referencePoint="0" frame="true" id="" outlineWidthM="0.3,mm" excludeFromExports="0" positionLock="true" zValue="2" keepLayerSet="false" blendMode="0" size="67.7828,163.668,mm" followPresetName="Access Routes" drawCanvasItems="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="2" background="false" type="65639" frameJoinStyle="miter" size="67.7828,163.668,mm" groupUuid="" outlineWidthM="0.3,mm" frame="true" opacity="1" referencePoint="0" visibility="1" positionOnPage="8.86559,6.09761,mm" uuid="{6abeaf6e-4f52-413a-a7ff-23ce2850a84c}" templateUuid="{6abeaf6e-4f52-413a-a7ff-23ce2850a84c}" keepLayerSet="false" excludeFromExports="0" position="8.86559,6.09761,mm" itemRotation="0" mapRotation="0" positionLock="true" drawCanvasItems="false" followPresetName="Access Routes" id="" followPreset="true" blendMode="0">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="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" ymin="-4021465.24033112963661551" xmin="2045187.64490581233985722" ymax="-4017906.13508340576663613"/>
+        <Extent ymin="-4021465.24033112963661551" xmin="2045187.64490581233985722" xmax="2046661.64490731596015394" ymax="-4017906.13508340576663613"/>
         <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>
@@ -10343,10 +10316,10 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" gridFrameWidth="2" leftAnnotationDisplay="0" bottomAnnotationDirection="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" unit="0" gridFramePenThickness="0.5" frameAnnotationDistance="1" annotationPrecision="3" showAnnotation="0" annotationFormat="0" topAnnotationPosition="1" rightAnnotationPosition="1" annotationFontColor="0,0,0,255" frameFillColor1="255,255,255,255" topAnnotationDirection="0" gridFrameStyle="0" intervalX="0" bottomFrameDivisions="0" rightAnnotationDirection="0" gridStyle="0" topFrameDivisions="0" leftAnnotationDirection="0" show="0" rightFrameDivisions="0" name="Grid 1" offsetX="0" annotationExpression="" leftAnnotationPosition="1" crossLength="3" blendMode="0" rightAnnotationDisplay="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" intervalY="0" leftFrameDivisions="0" gridFrameSideFlags="15" offsetY="0">
+        <ComposerMapGrid crossLength="3" annotationExpression="" topFrameDivisions="0" offsetX="0" leftAnnotationPosition="1" rightAnnotationPosition="1" gridFramePenThickness="0.5" topAnnotationPosition="1" bottomFrameDivisions="0" leftFrameDivisions="0" bottomAnnotationDirection="0" blendMode="0" annotationFormat="0" gridFrameStyle="0" topAnnotationDisplay="0" bottomAnnotationPosition="1" gridFrameWidth="2" show="0" rightAnnotationDirection="0" unit="0" gridFrameSideFlags="15" intervalY="0" bottomAnnotationDisplay="0" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" leftAnnotationDirection="0" annotationFontColor="0,0,0,255" rightFrameDivisions="0" frameFillColor2="0,0,0,255" showAnnotation="0" intervalX="0" frameAnnotationDistance="1" offsetY="0" leftAnnotationDisplay="0" rightAnnotationDisplay="0" gridStyle="0" annotationPrecision="3" name="Grid 1" frameFillColor1="255,255,255,255" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}">
           <lineStyle>
-            <symbol name="" type="line" alpha="1" clip_to_extent="1">
-              <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+            <symbol type="line" clip_to_extent="1" name="" alpha="1">
+              <layer class="SimpleLine" enabled="1" pass="0" locked="0">
                 <prop v="square" k="capstyle"/>
                 <prop v="5;2" k="customdash"/>
                 <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -10364,17 +10337,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 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="" type="marker" alpha="1" clip_to_extent="1">
-              <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
+            <symbol type="marker" clip_to_extent="1" name="" alpha="1">
+              <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
                 <prop v="0" k="angle"/>
                 <prop v="0,0,0,255" k="color"/>
                 <prop v="1" k="horizontal_anchor_point"/>
@@ -10395,9 +10368,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 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>
@@ -10405,43 +10378,43 @@ def my_form_open(dialog, layer, feature):
           </markerStyle>
           <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" margin="0.05" scalingMode="2"/>
+        <AtlasMap margin="0.05" atlasDriven="0" scalingMode="2"/>
       </LayoutItem>
-      <LayoutItem position="13.1173,10.4109,mm" frameJoinStyle="miter" templateUuid="{e6d5cba2-adb8-4057-b9c6-f66d2bf54203}" visibility="1" opacity="1" type="65639" uuid="{e6d5cba2-adb8-4057-b9c6-f66d2bf54203}" background="true" groupUuid="" positionOnPage="13.1173,10.4109,mm" mapRotation="0" followPreset="true" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" excludeFromExports="0" positionLock="true" zValue="1" keepLayerSet="false" blendMode="0" size="275.118,177.014,mm" followPresetName="Access Routes" drawCanvasItems="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="1" background="true" type="65639" frameJoinStyle="miter" size="275.118,177.014,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="13.1173,10.4109,mm" uuid="{e6d5cba2-adb8-4057-b9c6-f66d2bf54203}" templateUuid="{e6d5cba2-adb8-4057-b9c6-f66d2bf54203}" keepLayerSet="false" excludeFromExports="0" position="13.1173,10.4109,mm" itemRotation="0" mapRotation="0" positionLock="true" drawCanvasItems="false" followPresetName="Access Routes" id="" followPreset="true" blendMode="0">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="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" ymin="-4019029.07624835893511772" xmin="2044625.64756297133862972" ymax="-4015136.43659120844677091"/>
+        <Extent ymin="-4019029.07624835893511772" xmin="2044625.64756297133862972" xmax="2050675.64756914228200912" ymax="-4015136.43659120844677091"/>
         <LayerSet/>
-        <ComposerMapGrid bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" gridFrameWidth="2" leftAnnotationDisplay="0" bottomAnnotationDirection="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" unit="0" gridFramePenThickness="0.5" frameAnnotationDistance="1" annotationPrecision="3" showAnnotation="0" annotationFormat="0" topAnnotationPosition="1" rightAnnotationPosition="1" annotationFontColor="0,0,0,255" frameFillColor1="255,255,255,255" topAnnotationDirection="0" gridFrameStyle="0" intervalX="0" bottomFrameDivisions="0" rightAnnotationDirection="0" gridStyle="0" topFrameDivisions="0" leftAnnotationDirection="0" show="0" rightFrameDivisions="0" name="Grid 1" offsetX="0" annotationExpression="" leftAnnotationPosition="1" crossLength="3" blendMode="0" rightAnnotationDisplay="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" intervalY="0" leftFrameDivisions="0" gridFrameSideFlags="15" offsetY="0">
+        <ComposerMapGrid crossLength="3" annotationExpression="" topFrameDivisions="0" offsetX="0" leftAnnotationPosition="1" rightAnnotationPosition="1" gridFramePenThickness="0.5" topAnnotationPosition="1" bottomFrameDivisions="0" leftFrameDivisions="0" bottomAnnotationDirection="0" blendMode="0" annotationFormat="0" gridFrameStyle="0" topAnnotationDisplay="0" bottomAnnotationPosition="1" gridFrameWidth="2" show="0" rightAnnotationDirection="0" unit="0" gridFrameSideFlags="15" intervalY="0" bottomAnnotationDisplay="0" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" leftAnnotationDirection="0" annotationFontColor="0,0,0,255" rightFrameDivisions="0" frameFillColor2="0,0,0,255" showAnnotation="0" intervalX="0" frameAnnotationDistance="1" offsetY="0" leftAnnotationDisplay="0" rightAnnotationDisplay="0" gridStyle="0" annotationPrecision="3" name="Grid 1" frameFillColor1="255,255,255,255" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}">
           <lineStyle>
-            <symbol name="" type="line" alpha="1" clip_to_extent="1">
-              <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+            <symbol type="line" clip_to_extent="1" name="" alpha="1">
+              <layer class="SimpleLine" enabled="1" pass="0" locked="0">
                 <prop v="square" k="capstyle"/>
                 <prop v="5;2" k="customdash"/>
                 <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -10459,17 +10432,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 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="" type="marker" alpha="1" clip_to_extent="1">
-              <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
+            <symbol type="marker" clip_to_extent="1" name="" alpha="1">
+              <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
                 <prop v="0" k="angle"/>
                 <prop v="0,0,0,255" k="color"/>
                 <prop v="1" k="horizontal_anchor_point"/>
@@ -10490,9 +10463,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 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>
@@ -10500,26 +10473,26 @@ def my_form_open(dialog, layer, feature):
           </markerStyle>
           <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
       </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 coverageLayerSource="/home/tim/Documents/GunRunMaps/GIS base files and routes/residents_access.shp" coverageLayerProvider="ogr" hideCoverage="0" coverageLayer="residents_access_12d1da3e_b4fe_4986_b6af_fb68f68c5a89" filterFeatures="0" pageNameExpression="&quot;type&quot;" sortFeatures="0" enabled="1" coverageLayerName="residents_access" filenamePattern="'Gun Run 2018 - Residents Access'"/>
+      <Atlas filenamePattern="'Gun Run 2018 - Residents Access'" sortFeatures="0" enabled="1" coverageLayer="residents_access_12d1da3e_b4fe_4986_b6af_fb68f68c5a89" hideCoverage="0" pageNameExpression="&quot;type&quot;" coverageLayerProvider="ogr" coverageLayerName="residents_access" coverageLayerSource="/home/tim/Documents/Projects/2018/Gun Run/Maps/GIS base files and routes/residents_access.shp" filterFeatures="0"/>
     </Layout>
-    <Layout name="Ask Me" printResolution="192" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" units="mm">
-      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
-      <Grid offsetX="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetY="0"/>
+    <Layout worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" printResolution="192" name="Ask Me" units="mm">
+      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
+      <Grid offsetY="0" offsetUnits="mm" resolution="10" offsetX="0" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" type="fill" alpha="1" clip_to_extent="1">
-          <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+        <symbol type="fill" clip_to_extent="1" name="" alpha="1">
+          <layer class="SimpleFill" enabled="1" pass="0" 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"/>
@@ -10533,72 +10506,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 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 position="0,0,mm" frameJoinStyle="miter" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" visibility="1" opacity="1" type="65638" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" background="true" groupUuid="" positionOnPage="0,0,mm" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" excludeFromExports="0" positionLock="false" zValue="0" blendMode="0" size="297,210,mm">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem zValue="0" background="true" type="65638" frameJoinStyle="miter" size="297,210,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="0,0,mm" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" excludeFromExports="0" position="0,0,mm" itemRotation="0" positionLock="false" id="" blendMode="0">
+          <FrameColor green="0" blue="0" red="0" alpha="255"/>
+          <BackgroundColor green="255" blue="255" red="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" units="mm" orientation="2" position="0"/>
+          <Guide page="0" position="0" units="mm" orientation="2"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem position="7.9389,188.218,mm" frameJoinStyle="miter" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" visibility="1" opacity="1" valign="64" type="65641" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" background="false" groupUuid="" positionOnPage="7.9389,188.218,mm" marginY="1" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" halign="1" excludeFromExports="0" positionLock="false" zValue="8" labelText="Directions to Start" blendMode="0" size="48.2923,7.071,mm" htmlState="0" marginX="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="8" marginY="1" background="false" type="65641" frameJoinStyle="miter" size="83.9998,7.071,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" labelText="Directions to Start of Race" referencePoint="0" valign="64" visibility="1" positionOnPage="7.9389,188.218,mm" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" htmlState="0" excludeFromExports="0" position="7.9389,188.218,mm" itemRotation="0" positionLock="true" halign="1" id="" blendMode="0" marginX="1">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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 description="Myriad Pro,12,-1,5,50,0,0,0,0,0" style=""/>
-        <FontColor blue="0" red="0" green="0"/>
+        <FontColor green="0" blue="0" red="0"/>
       </LayoutItem>
-      <LayoutItem position="7.93888,195.489,mm" frameJoinStyle="miter" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" visibility="1" opacity="1" valign="32" type="65641" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" background="false" groupUuid="" positionOnPage="7.93888,195.489,mm" marginY="1" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" halign="1" excludeFromExports="0" positionLock="false" zValue="7" labelText="Gun Run 2018" blendMode="0" size="48.2923,6.60801,mm" htmlState="0" marginX="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="7" marginY="1" background="false" type="65641" frameJoinStyle="miter" size="48.2923,6.60801,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" labelText="Gun Run 2018" referencePoint="0" valign="32" visibility="1" positionOnPage="7.93888,195.489,mm" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" htmlState="0" excludeFromExports="0" position="7.93888,195.489,mm" itemRotation="0" positionLock="true" halign="1" id="" blendMode="0" marginX="1">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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 description="Myriad Pro,12,-1,5,50,0,0,0,0,0" style=""/>
-        <FontColor blue="0" red="0" green="0"/>
+        <FontColor green="0" blue="0" red="0"/>
       </LayoutItem>
-      <LayoutItem positionLock="true" outlineWidthM="0.3,mm" splitLayer="0" groupUuid="" lineSpacing="1" titleAlignment="1" referencePoint="0" type="65642" itemRotation="0" wrapChar="" size="43.9781,72,mm" excludeFromExports="0" wmsLegendHeight="25" symbolHeight="4" legendFilterByAtlas="0" frameJoinStyle="miter" opacity="1" id="" wmsLegendWidth="50" title="" symbolWidth="7" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" rasterBorderColor="0,0,0,255" position="10.096,10.8563,mm" visibility="1" rasterBorderWidth="0" rasterBorder="1" zValue="6" equalColumnWidth="0" fontColor="#000000" columnSpace="2" positionOnPage="10.096,10.8563,mm" columnCount="1" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" blendMode="0" resizeToContents="0" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" frame="false" boxSpace="2" background="true">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem lineSpacing="1" itemRotation="0" referencePoint="0" equalColumnWidth="0" splitLayer="0" wmsLegendHeight="25" groupUuid="" id="" title="" symbolWidth="7" positionLock="true" blendMode="0" background="true" boxSpace="2" rasterBorderColor="0,0,0,255" frameJoinStyle="round" rasterBorderWidth="0" titleAlignment="1" size="53.2969,71,mm" opacity="1" position="10.096,10.8563,mm" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" wrapChar="" positionOnPage="10.096,10.8563,mm" resizeToContents="1" symbolHeight="4" visibility="1" zValue="6" columnSpace="2" frame="true" type="65642" wmsLegendWidth="50" rasterBorder="1" legendFilterByAtlas="0" columnCount="1" excludeFromExports="0" outlineWidthM="0.3,mm" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" fontColor="#000000" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}">
+        <FrameColor green="139" blue="139" red="139" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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/>
@@ -10616,106 +10589,106 @@ def my_form_open(dialog, layer, feature):
           <style name="symbol" marginTop="2.5">
             <styleFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0" style=""/>
           </style>
-          <style name="symbolLabel" marginTop="2" marginLeft="2">
+          <style name="symbolLabel" marginLeft="2" marginTop="2">
             <styleFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0" style=""/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties/>
-          <layer-tree-group name="Ask Me" expanded="1" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" name="Ask Me" expanded="1">
             <customproperties>
-              <property value="hidden" key="legend/title-style"/>
+              <property key="legend/title-style" value="hidden"/>
             </customproperties>
-            <layer-tree-layer name="poi_labels" source="../../../poi_labels.shp" providerKey="ogr" expanded="1" checked="Qt::Checked" id="poi_labels_59d3855d_466f_419c_8119_94b9ad7c140d">
+            <layer-tree-layer id="poi_labels_59d3855d_466f_419c_8119_94b9ad7c140d" checked="Qt::Checked" source="./poi_labels.shp" providerKey="ogr" name="poi_labels" expanded="1">
               <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 Closure" 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 Closure"/>
+                <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" source="../../../directions_to_start.shp" providerKey="ogr" expanded="1" checked="Qt::Checked" id="directions_to_start_cf338b4b_1403_45e8_b11f_47b48dd39657">
+            <layer-tree-layer id="directions_to_start_cf338b4b_1403_45e8_b11f_47b48dd39657" checked="Qt::Checked" source="./directions_to_start.shp" providerKey="ogr" name="directions_to_start" expanded="1">
               <customproperties>
-                <property value="To 21KM start" key="legend/label-0"/>
-                <property value="To 10KM start" key="legend/label-1"/>
-                <property value="To 5KM start" 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 position="228.202,188.218,mm" frameJoinStyle="miter" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" visibility="1" opacity="1" valign="32" type="65641" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" background="false" groupUuid="" positionOnPage="228.202,188.218,mm" marginY="1" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" halign="2" excludeFromExports="0" positionLock="true" zValue="5" labelText="REVISION 1.0" blendMode="0" size="27.7839,6.8714,mm" htmlState="0" marginX="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="5" marginY="1" background="false" type="65641" frameJoinStyle="miter" size="27.7839,6.8714,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" labelText="REVISION 1.1" referencePoint="0" valign="32" visibility="1" positionOnPage="228.202,188.218,mm" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" htmlState="0" excludeFromExports="0" position="228.202,188.218,mm" itemRotation="0" positionLock="true" halign="2" id="" blendMode="0" marginX="1">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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 description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" red="0" green="0"/>
+        <FontColor green="0" blue="0" red="0"/>
       </LayoutItem>
-      <LayoutItem position="204.316,195.489,mm" frameJoinStyle="miter" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" visibility="1" opacity="1" valign="64" type="65641" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" background="false" groupUuid="" positionOnPage="204.316,195.489,mm" marginY="1" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" halign="2" excludeFromExports="0" positionLock="true" zValue="4" labelText="Sunday, 14 October 2018" blendMode="0" size="51.6706,6.60801,mm" htmlState="0" marginX="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="4" marginY="1" background="false" type="65641" frameJoinStyle="miter" size="51.6706,6.60801,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" labelText="Sunday, 14 October 2018" referencePoint="0" valign="64" visibility="1" positionOnPage="204.316,195.489,mm" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" htmlState="0" excludeFromExports="0" position="204.316,195.489,mm" itemRotation="0" positionLock="true" halign="2" id="" blendMode="0" marginX="1">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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 description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" red="0" green="0"/>
+        <FontColor green="0" blue="0" red="0"/>
       </LayoutItem>
-      <LayoutItem position="258.483,187.425,mm" northOffset="0" resizeMode="0" frameJoinStyle="miter" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" visibility="1" opacity="1" file="../Gun_Run_Logo_2018.png" type="65640" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" background="false" groupUuid="" positionOnPage="258.483,187.425,mm" itemRotation="0" anchorPoint="4" svgBorderWidth="0.2" referencePoint="0" pictureWidth="29.7021" frame="false" id="" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" excludeFromExports="0" svgBorderColor="0,0,0,255" positionLock="true" zValue="3" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" northMode="0" blendMode="0" pictureRotation="0" size="29.7523,17.4718,mm" pictureHeight="17.4718">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="3" svgFillColor="255,255,255,255" background="false" type="65640" frameJoinStyle="miter" pictureRotation="0" size="29.7523,17.4718,mm" groupUuid="" outlineWidthM="0.3,mm" svgBorderColor="0,0,0,255" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="258.483,187.425,mm" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" excludeFromExports="0" position="258.483,187.425,mm" northOffset="0" pictureHeight="17.4718" svgBorderWidth="0.2" itemRotation="0" positionLock="true" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" northMode="0" resizeMode="0" file="../Gun_Run_Logo_2018.png" id="" blendMode="0" pictureWidth="29.7021" anchorPoint="4">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option 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 position="8.08888,195.239,mm" shapeType="1" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" visibility="1" opacity="1" type="65643" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" background="false" groupUuid="" positionOnPage="8.08888,195.239,mm" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" excludeFromExports="0" positionLock="true" zValue="2" blendMode="0" size="247.747,0.1,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="2" background="false" type="65643" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" size="247.747,0.1,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="8.08888,195.239,mm" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" shapeType="1" excludeFromExports="0" position="8.08888,195.239,mm" itemRotation="0" positionLock="true" id="" blendMode="0">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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="" type="fill" alpha="1" clip_to_extent="1">
-          <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+        <symbol type="fill" clip_to_extent="1" name="" alpha="1">
+          <layer class="SimpleFill" enabled="1" pass="0" 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"/>
@@ -10729,49 +10702,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 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 position="7.93888,6.411,mm" frameJoinStyle="miter" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" visibility="1" opacity="1" type="65639" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" background="true" groupUuid="" positionOnPage="7.93888,6.411,mm" mapRotation="0" followPreset="true" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" excludeFromExports="0" positionLock="true" zValue="1" keepLayerSet="false" blendMode="0" size="280.297,177.014,mm" followPresetName="Ask Me" drawCanvasItems="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="1" background="true" type="65639" frameJoinStyle="miter" size="280.297,177.014,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="7.93888,6.411,mm" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" keepLayerSet="false" excludeFromExports="0" position="7.93888,6.411,mm" itemRotation="0" mapRotation="0" positionLock="true" drawCanvasItems="false" followPresetName="Ask Me" id="" followPreset="true" blendMode="0">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="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" ymin="-4016655.25382941775023937" xmin="2047764.97328699217177927" ymax="-4015152.22678980929777026"/>
+        <Extent ymin="-4016655.25382941775023937" xmin="2047764.97328699217177927" xmax="2050144.97328941966407001" ymax="-4015152.22678980929777026"/>
         <LayerSet/>
-        <ComposerMapGrid bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" gridFrameWidth="2" leftAnnotationDisplay="0" bottomAnnotationDirection="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" unit="0" gridFramePenThickness="0.5" frameAnnotationDistance="1" annotationPrecision="3" showAnnotation="0" annotationFormat="0" topAnnotationPosition="1" rightAnnotationPosition="1" annotationFontColor="0,0,0,255" frameFillColor1="255,255,255,255" topAnnotationDirection="0" gridFrameStyle="0" intervalX="0" bottomFrameDivisions="0" rightAnnotationDirection="0" gridStyle="0" topFrameDivisions="0" leftAnnotationDirection="0" show="0" rightFrameDivisions="0" name="Grid 1" offsetX="0" annotationExpression="" leftAnnotationPosition="1" crossLength="3" blendMode="0" rightAnnotationDisplay="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" intervalY="0" leftFrameDivisions="0" gridFrameSideFlags="15" offsetY="0">
+        <ComposerMapGrid crossLength="3" annotationExpression="" topFrameDivisions="0" offsetX="0" leftAnnotationPosition="1" rightAnnotationPosition="1" gridFramePenThickness="0.5" topAnnotationPosition="1" bottomFrameDivisions="0" leftFrameDivisions="0" bottomAnnotationDirection="0" blendMode="0" annotationFormat="0" gridFrameStyle="0" topAnnotationDisplay="0" bottomAnnotationPosition="1" gridFrameWidth="2" show="0" rightAnnotationDirection="0" unit="0" gridFrameSideFlags="15" intervalY="0" bottomAnnotationDisplay="0" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" leftAnnotationDirection="0" annotationFontColor="0,0,0,255" rightFrameDivisions="0" frameFillColor2="0,0,0,255" showAnnotation="0" intervalX="0" frameAnnotationDistance="1" offsetY="0" leftAnnotationDisplay="0" rightAnnotationDisplay="0" gridStyle="0" annotationPrecision="3" name="Grid 1" frameFillColor1="255,255,255,255" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}">
           <lineStyle>
-            <symbol name="" type="line" alpha="1" clip_to_extent="1">
-              <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+            <symbol type="line" clip_to_extent="1" name="" alpha="1">
+              <layer class="SimpleLine" enabled="1" pass="0" locked="0">
                 <prop v="square" k="capstyle"/>
                 <prop v="5;2" k="customdash"/>
                 <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -10789,17 +10762,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 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="" type="marker" alpha="1" clip_to_extent="1">
-              <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
+            <symbol type="marker" clip_to_extent="1" name="" alpha="1">
+              <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
                 <prop v="0" k="angle"/>
                 <prop v="0,0,0,255" k="color"/>
                 <prop v="1" k="horizontal_anchor_point"/>
@@ -10820,9 +10793,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 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>
@@ -10830,19 +10803,19 @@ def my_form_open(dialog, layer, feature):
           </markerStyle>
           <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
       </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 coverageLayerSource="/home/tim/directions_to_start.shp" coverageLayerProvider="ogr" hideCoverage="0" coverageLayer="directions_to_start_cf338b4b_1403_45e8_b11f_47b48dd39657" filterFeatures="0" pageNameExpression="" sortFeatures="0" enabled="0" coverageLayerName="directions_to_start" filenamePattern="'Gun Run 2018 - '||&quot;RouteLen&quot;||'KM rev '"/>
+      <Atlas filenamePattern="'Gun Run 2018 - '||&quot;RouteLen&quot;||'KM rev '" sortFeatures="0" enabled="0" coverageLayer="directions_to_start_cf338b4b_1403_45e8_b11f_47b48dd39657" hideCoverage="0" pageNameExpression="" coverageLayerProvider="ogr" coverageLayerName="directions_to_start" coverageLayerSource="/home/tim/Documents/Projects/2018/Gun Run/Maps/GIS base files and routes/directions_to_start.shp" filterFeatures="0"/>
     </Layout>
   </Layouts>
 </qgis>
diff --git a/GIS base files and routes/Gun Run.qgs~ b/GIS base files and routes/Gun Run.qgs~
index f8d242f..77ba206 100644
--- a/GIS base files and routes/Gun Run.qgs~	
+++ b/GIS base files and routes/Gun Run.qgs~	
@@ -1,5 +1,5 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis version="3.2.3-Bonn" projectname="Gun Run">
+<qgis projectname="Gun Run" version="3.2.3-Bonn">
   <homePath path=""/>
   <title>Gun Run</title>
   <autotransaction active="0"/>
@@ -19,126 +19,126 @@
   </projectCrs>
   <layer-tree-group>
     <customproperties/>
-    <layer-tree-group name="Marshals" expanded="1" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" name="Marshals" expanded="1">
       <customproperties/>
-      <layer-tree-layer name="marshal_positions" source="./marshal_positions.shp" providerKey="ogr" expanded="1" checked="Qt::Checked" id="marshal_positions20160930121322287">
+      <layer-tree-layer id="marshal_positions20160930121322287" checked="Qt::Checked" source="./marshal_positions.shp" providerKey="ogr" name="marshal_positions" expanded="1">
         <customproperties>
           <property key="expandedLegendNodes"/>
-          <property value="1" key="showFeatureCount"/>
+          <property key="showFeatureCount" value="1"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="extra_security" source="./extra_security.shp" providerKey="ogr" expanded="1" checked="Qt::Checked" id="extra_security20170921130834191">
+      <layer-tree-layer id="extra_security20170921130834191" checked="Qt::Checked" source="./extra_security.shp" providerKey="ogr" name="extra_security" expanded="1">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="marshals_by_position" source="file:///home/tim/Documents/GunRunMaps/GIS%20base%20files%20and%20routes/marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" providerKey="delimitedtext" expanded="1" checked="Qt::Unchecked" id="marshals_by_position20161003112326575">
+      <layer-tree-layer id="marshals_by_position20161003112326575" checked="Qt::Unchecked" source="file:///home/tim/Documents/Projects/2018/Gun%20Run/Maps/GIS%20base%20files%20and%20routes/marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" providerKey="delimitedtext" name="marshals_by_position" expanded="1">
         <customproperties/>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Fencing and Cones" expanded="1" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" name="Fencing and Cones" expanded="1">
       <customproperties/>
-      <layer-tree-layer name="fencing" source="./fencing.shp" providerKey="ogr" expanded="1" checked="Qt::Unchecked" id="fencing_504d8fa2_bdeb_4951_b151_966d5d257666">
+      <layer-tree-layer id="fencing_504d8fa2_bdeb_4951_b151_966d5d257666" checked="Qt::Unchecked" source="./fencing.shp" providerKey="ogr" name="fencing" expanded="1">
         <customproperties>
-          <property value="{6f66f64e-a034-49f3-a480-0837e467ccae}" key="expandedLegendNodes"/>
-          <property value="0" key="showFeatureCount"/>
+          <property key="expandedLegendNodes" value="{6f66f64e-a034-49f3-a480-0837e467ccae}"/>
+          <property key="showFeatureCount" value="0"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="fence_groups" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20fencing%20GROUP%20BY%20%22group%22&amp;geometry=geometry:3:0" providerKey="virtual" expanded="1" checked="Qt::Unchecked" id="fence_groups_b08dad12_5ae6_4ba8_b737_e74b37bd274c">
+      <layer-tree-layer id="fence_groups_b08dad12_5ae6_4ba8_b737_e74b37bd274c" checked="Qt::Unchecked" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20fencing%20GROUP%20BY%20%22group%22&amp;geometry=geometry:3:0" providerKey="virtual" name="fence_groups" expanded="1">
         <customproperties/>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Routes" expanded="1" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" name="Routes" expanded="1">
       <customproperties/>
-      <layer-tree-group name="Markers" expanded="1" checked="Qt::Checked">
+      <layer-tree-group checked="Qt::Checked" name="Markers" expanded="1">
         <customproperties/>
-        <layer-tree-layer name="route_markers" 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={398ffcc6-a2bd-4f79-ba19-25286f57e9d3}" providerKey="memory" expanded="1" checked="Qt::Checked" id="route_markers_a5e14af7_58c2_4a9e_8e4a_d8d9a41d2bb6">
+        <layer-tree-layer id="route_markers_a5e14af7_58c2_4a9e_8e4a_d8d9a41d2bb6" checked="Qt::Checked" 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={ccad2081-c52c-4b2f-9125-1eae975a686e}" providerKey="memory" name="route_markers" expanded="1">
           <customproperties>
-            <property value="1" key="showFeatureCount"/>
+            <property key="showFeatureCount" value="1"/>
           </customproperties>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-layer name="all_routes" source="./all_routes.shp" providerKey="ogr" expanded="1" checked="Qt::Checked" id="all_routes20170907054841602">
+      <layer-tree-layer id="all_routes20170907054841602" checked="Qt::Checked" source="./all_routes.shp" providerKey="ogr" name="all_routes" expanded="1">
         <customproperties>
-          <property value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" key="expandedLegendNodes"/>
-          <property value="1" key="overview"/>
-          <property value="0" key="showFeatureCount"/>
+          <property key="expandedLegendNodes" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
+          <property key="overview" value="1"/>
+          <property key="showFeatureCount" value="0"/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Feeding Stations" expanded="1" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" name="Feeding Stations" expanded="1">
       <customproperties/>
-      <layer-tree-layer name="water_tables" source="./water_tables.shp" providerKey="ogr" expanded="1" checked="Qt::Checked" id="water_tables20170921142016467">
+      <layer-tree-layer id="water_tables20170921142016467" checked="Qt::Checked" source="./water_tables.shp" providerKey="ogr" name="water_tables" expanded="1">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Ask Me" expanded="1" checked="Qt::Checked">
+    <layer-tree-group checked="Qt::Checked" name="Ask Me" expanded="1">
       <customproperties/>
-      <layer-tree-layer name="poi_labels" source="../../../poi_labels.shp" providerKey="ogr" expanded="1" checked="Qt::Checked" id="poi_labels_59d3855d_466f_419c_8119_94b9ad7c140d">
+      <layer-tree-layer id="poi_labels_59d3855d_466f_419c_8119_94b9ad7c140d" checked="Qt::Checked" source="./poi_labels.shp" providerKey="ogr" name="poi_labels" expanded="1">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-layer name="directions_to_start" source="../../../directions_to_start.shp" providerKey="ogr" expanded="1" checked="Qt::Checked" id="directions_to_start_cf338b4b_1403_45e8_b11f_47b48dd39657">
+      <layer-tree-layer id="directions_to_start_cf338b4b_1403_45e8_b11f_47b48dd39657" checked="Qt::Checked" source="./directions_to_start.shp" providerKey="ogr" name="directions_to_start" expanded="1">
         <customproperties>
-          <property value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" key="expandedLegendNodes"/>
+          <property key="expandedLegendNodes" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="OSM data" expanded="1" checked="Qt::Checked">
+    <layer-tree-group checked="Qt::Checked" name="OSM data" expanded="1">
       <customproperties/>
-      <layer-tree-layer name="osm_roads" source="./osm_roads.shp" providerKey="ogr" expanded="0" checked="Qt::Checked" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18">
+      <layer-tree-layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" checked="Qt::Checked" source="./osm_roads.shp" providerKey="ogr" name="osm_roads" expanded="0">
         <customproperties>
           <property key="expandedLegendNodes"/>
-          <property value="1" key="showFeatureCount"/>
+          <property key="showFeatureCount" value="1"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="osm_places" source="./osm_places.shp" providerKey="ogr" expanded="1" checked="Qt::Checked" id="osm_places20160930221519937">
+      <layer-tree-layer id="osm_places20160930221519937" checked="Qt::Checked" source="./osm_places.shp" providerKey="ogr" name="osm_places" expanded="1">
         <customproperties>
           <property key="expandedLegendNodes"/>
-          <property value="1" key="overview"/>
-          <property value="1" key="showFeatureCount"/>
+          <property key="overview" value="1"/>
+          <property key="showFeatureCount" value="1"/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Marshal pages" expanded="1" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" name="Marshal pages" expanded="1">
       <customproperties/>
-      <layer-tree-layer name="marshal overviews.shp" source="./marshal overviews.shp" providerKey="ogr" expanded="1" checked="Qt::Unchecked" id="marshal_overviews_shp20160930210331241">
+      <layer-tree-layer id="marshal_overviews_shp20160930210331241" checked="Qt::Unchecked" source="./marshal overviews.shp" providerKey="ogr" name="marshal overviews.shp" expanded="1">
         <customproperties/>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Residents Access" expanded="1" checked="Qt::Checked">
+    <layer-tree-group checked="Qt::Checked" name="Residents Access" expanded="1">
       <customproperties/>
-      <layer-tree-layer name="residents_access_roads" source="./residents_access_roads.shp" providerKey="ogr" expanded="1" checked="Qt::Unchecked" id="residents_access_roads_a7a1b453_729e_4ac7_bb64_95381b84aa35">
+      <layer-tree-layer id="residents_access_roads_a7a1b453_729e_4ac7_bb64_95381b84aa35" checked="Qt::Unchecked" source="./residents_access_roads.shp" providerKey="ogr" name="residents_access_roads" expanded="1">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="residents_access" source="./residents_access.shp" providerKey="ogr" expanded="1" checked="Qt::Unchecked" id="residents_access_12d1da3e_b4fe_4986_b6af_fb68f68c5a89">
+      <layer-tree-layer id="residents_access_12d1da3e_b4fe_4986_b6af_fb68f68c5a89" checked="Qt::Unchecked" source="./residents_access.shp" providerKey="ogr" name="residents_access" expanded="1">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Start and Finish pages" expanded="1" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" name="Start and Finish pages" expanded="1">
       <customproperties/>
     </layer-tree-group>
-    <layer-tree-group name="Elevation" expanded="0" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" name="Elevation" expanded="0">
       <customproperties/>
-      <layer-tree-layer name="capetownelevation-1m" source="./capetownelevation-1m.shp" providerKey="ogr" expanded="1" checked="Qt::Unchecked" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1">
+      <layer-tree-layer id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" checked="Qt::Unchecked" source="./capetownelevation-1m.shp" providerKey="ogr" name="capetownelevation-1m" expanded="1">
         <customproperties>
-          <property value="1" key="showFeatureCount"/>
+          <property key="showFeatureCount" value="1"/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Map" expanded="1" checked="Qt::Checked">
+    <layer-tree-group checked="Qt::Checked" name="Map" expanded="1">
       <customproperties/>
-      <layer-tree-layer name="Outlines" 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" expanded="0" checked="Qt::Checked" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d">
+      <layer-tree-layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" 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" providerKey="wms" name="Outlines" expanded="0">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="GDAL-City of Cape Town 2015 Aerial" source="./GDAL-City of Cape Town 2015 Aerial.xml" providerKey="gdal" expanded="1" checked="Qt::Unchecked" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970">
+      <layer-tree-layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" checked="Qt::Unchecked" source="./GDAL-City of Cape Town 2015 Aerial.xml" providerKey="gdal" name="GDAL-City of Cape Town 2015 Aerial" expanded="1">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
@@ -164,33 +164,33 @@
       <item>poi_labels_59d3855d_466f_419c_8119_94b9ad7c140d</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings unit="1" type="1" intersection-snapping="0" mode="3" enabled="0" tolerance="10">
+  <snapping-settings mode="3" type="1" enabled="0" tolerance="10" unit="1" intersection-snapping="0">
     <individual-layer-settings>
-      <layer-setting type="1" units="1" id="directions_to_start_cf338b4b_1403_45e8_b11f_47b48dd39657" enabled="0" tolerance="12"/>
-      <layer-setting type="1" units="1" id="residents_access_12d1da3e_b4fe_4986_b6af_fb68f68c5a89" enabled="0" tolerance="12"/>
-      <layer-setting type="1" units="1" id="poi_labels_59d3855d_466f_419c_8119_94b9ad7c140d" enabled="0" tolerance="12"/>
-      <layer-setting type="1" units="1" id="residents_access_roads_a7a1b453_729e_4ac7_bb64_95381b84aa35" enabled="0" tolerance="12"/>
-      <layer-setting type="2" units="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" enabled="1" tolerance="20"/>
-      <layer-setting type="2" units="2" id="water_tables20170921142016467" enabled="0" tolerance="0"/>
-      <layer-setting type="2" units="1" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" enabled="0" tolerance="12"/>
-      <layer-setting type="2" units="2" id="marshal_positions20160930121322287" enabled="0" tolerance="0"/>
-      <layer-setting type="2" units="2" id="all_routes20170907054841602" enabled="0" tolerance="0"/>
-      <layer-setting type="2" units="2" id="extra_security20170921130834191" enabled="0" tolerance="0"/>
-      <layer-setting type="2" units="1" id="fencing_504d8fa2_bdeb_4951_b151_966d5d257666" enabled="0" tolerance="12"/>
-      <layer-setting type="2" units="2" id="marshal_overviews_shp20160930210331241" enabled="0" tolerance="0"/>
-      <layer-setting type="2" units="2" id="osm_places20160930221519937" enabled="0" tolerance="0"/>
-      <layer-setting type="2" units="1" id="route_markers_a5e14af7_58c2_4a9e_8e4a_d8d9a41d2bb6" enabled="0" tolerance="12"/>
-      <layer-setting type="1" units="1" id="fence_groups_b08dad12_5ae6_4ba8_b737_e74b37bd274c" enabled="0" tolerance="12"/>
+      <layer-setting id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" type="2" enabled="0" tolerance="12" units="1"/>
+      <layer-setting id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" type="2" enabled="1" tolerance="20" units="1"/>
+      <layer-setting id="osm_places20160930221519937" type="2" enabled="0" tolerance="0" units="2"/>
+      <layer-setting id="fence_groups_b08dad12_5ae6_4ba8_b737_e74b37bd274c" type="1" enabled="0" tolerance="12" units="1"/>
+      <layer-setting id="residents_access_12d1da3e_b4fe_4986_b6af_fb68f68c5a89" type="1" enabled="0" tolerance="12" units="1"/>
+      <layer-setting id="residents_access_roads_a7a1b453_729e_4ac7_bb64_95381b84aa35" type="1" enabled="0" tolerance="12" units="1"/>
+      <layer-setting id="marshal_positions20160930121322287" type="2" enabled="0" tolerance="0" units="2"/>
+      <layer-setting id="poi_labels_59d3855d_466f_419c_8119_94b9ad7c140d" type="1" enabled="0" tolerance="12" units="1"/>
+      <layer-setting id="marshal_overviews_shp20160930210331241" type="2" enabled="0" tolerance="0" units="2"/>
+      <layer-setting id="fencing_504d8fa2_bdeb_4951_b151_966d5d257666" type="2" enabled="0" tolerance="12" units="1"/>
+      <layer-setting id="directions_to_start_cf338b4b_1403_45e8_b11f_47b48dd39657" type="1" enabled="0" tolerance="12" units="1"/>
+      <layer-setting id="water_tables20170921142016467" type="2" enabled="0" tolerance="0" units="2"/>
+      <layer-setting id="route_markers_a5e14af7_58c2_4a9e_8e4a_d8d9a41d2bb6" type="2" enabled="0" tolerance="12" units="1"/>
+      <layer-setting id="all_routes20170907054841602" type="2" enabled="0" tolerance="0" units="2"/>
+      <layer-setting id="extra_security20170921130834191" type="2" enabled="0" tolerance="0" units="2"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
-  <mapcanvas name="theMapCanvas" annotationsVisible="1">
+  <mapcanvas annotationsVisible="1" name="theMapCanvas">
     <units>meters</units>
     <extent>
-      <xmin>2049878.85097376676276326</xmin>
-      <ymin>-4015736.72967215161770582</ymin>
-      <xmax>2049934.92197273438796401</xmax>
-      <ymax>-4015705.33556932490319014</ymax>
+      <xmin>2049153.38593701319769025</xmin>
+      <ymin>-4016183.04424226796254516</ymin>
+      <xmax>2050349.56724830390885472</xmax>
+      <ymax>-4015513.30338196223601699</ymax>
     </extent>
     <rotation>0</rotation>
     <destinationsrs>
@@ -208,116 +208,116 @@
     <rendermaptile>0</rendermaptile>
   </mapcanvas>
   <legend updateDrawingOrder="true">
-    <legendgroup name="Marshals" open="true" checked="Qt::Unchecked">
-      <legendlayer name="marshal_positions" open="true" drawingOrder="-1" showFeatureCount="1" checked="Qt::Checked">
+    <legendgroup checked="Qt::Unchecked" open="true" name="Marshals">
+      <legendlayer showFeatureCount="1" checked="Qt::Checked" drawingOrder="-1" open="true" name="marshal_positions">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="marshal_positions20160930121322287"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="marshal_positions20160930121322287"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="extra_security" open="true" drawingOrder="-1" showFeatureCount="0" checked="Qt::Checked">
+      <legendlayer showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" open="true" name="extra_security">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="extra_security20170921130834191"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="extra_security20170921130834191"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="marshals_by_position" open="true" drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked">
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" open="true" name="marshals_by_position">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="marshals_by_position20161003112326575"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="marshals_by_position20161003112326575"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Fencing and Cones" open="true" checked="Qt::Unchecked">
-      <legendlayer name="fencing" open="true" drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked">
+    <legendgroup checked="Qt::Unchecked" open="true" name="Fencing and Cones">
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" open="true" name="fencing">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="fencing_504d8fa2_bdeb_4951_b151_966d5d257666"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="fencing_504d8fa2_bdeb_4951_b151_966d5d257666"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="fence_groups" open="true" drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked">
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" open="true" name="fence_groups">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="fence_groups_b08dad12_5ae6_4ba8_b737_e74b37bd274c"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="fence_groups_b08dad12_5ae6_4ba8_b737_e74b37bd274c"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Routes" open="true" checked="Qt::Unchecked">
-      <legendgroup name="Markers" open="true" checked="Qt::Checked">
-        <legendlayer name="route_markers" open="true" drawingOrder="-1" showFeatureCount="1" checked="Qt::Checked">
+    <legendgroup checked="Qt::Unchecked" open="true" name="Routes">
+      <legendgroup checked="Qt::Checked" open="true" name="Markers">
+        <legendlayer showFeatureCount="1" checked="Qt::Checked" drawingOrder="-1" open="true" name="route_markers">
           <filegroup hidden="false" open="true">
-            <legendlayerfile isInOverview="0" visible="0" layerid="route_markers_a5e14af7_58c2_4a9e_8e4a_d8d9a41d2bb6"/>
+            <legendlayerfile visible="0" isInOverview="0" layerid="route_markers_a5e14af7_58c2_4a9e_8e4a_d8d9a41d2bb6"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendlayer name="all_routes" open="true" drawingOrder="-1" showFeatureCount="0" checked="Qt::Checked">
+      <legendlayer showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" open="true" name="all_routes">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="1" visible="0" layerid="all_routes20170907054841602"/>
+          <legendlayerfile visible="0" isInOverview="1" layerid="all_routes20170907054841602"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Feeding Stations" open="true" checked="Qt::Unchecked">
-      <legendlayer name="water_tables" open="true" drawingOrder="-1" showFeatureCount="0" checked="Qt::Checked">
+    <legendgroup checked="Qt::Unchecked" open="true" name="Feeding Stations">
+      <legendlayer showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" open="true" name="water_tables">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="water_tables20170921142016467"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="water_tables20170921142016467"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Ask Me" open="true" checked="Qt::Checked">
-      <legendlayer name="poi_labels" open="true" drawingOrder="-1" showFeatureCount="0" checked="Qt::Checked">
+    <legendgroup checked="Qt::Checked" open="true" name="Ask Me">
+      <legendlayer showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" open="true" name="poi_labels">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="1" layerid="poi_labels_59d3855d_466f_419c_8119_94b9ad7c140d"/>
+          <legendlayerfile visible="1" isInOverview="0" layerid="poi_labels_59d3855d_466f_419c_8119_94b9ad7c140d"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="directions_to_start" open="true" drawingOrder="-1" showFeatureCount="0" checked="Qt::Checked">
+      <legendlayer showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" open="true" name="directions_to_start">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="1" layerid="directions_to_start_cf338b4b_1403_45e8_b11f_47b48dd39657"/>
+          <legendlayerfile visible="1" isInOverview="0" layerid="directions_to_start_cf338b4b_1403_45e8_b11f_47b48dd39657"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="OSM data" open="true" checked="Qt::Checked">
-      <legendlayer name="osm_roads" open="false" drawingOrder="-1" showFeatureCount="1" checked="Qt::Checked">
+    <legendgroup checked="Qt::Checked" open="true" name="OSM data">
+      <legendlayer showFeatureCount="1" checked="Qt::Checked" drawingOrder="-1" open="false" name="osm_roads">
         <filegroup hidden="false" open="false">
-          <legendlayerfile isInOverview="0" visible="1" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+          <legendlayerfile visible="1" isInOverview="0" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="osm_places" open="true" drawingOrder="-1" showFeatureCount="1" checked="Qt::Checked">
+      <legendlayer showFeatureCount="1" checked="Qt::Checked" drawingOrder="-1" open="true" name="osm_places">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="1" visible="1" layerid="osm_places20160930221519937"/>
+          <legendlayerfile visible="1" isInOverview="1" layerid="osm_places20160930221519937"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Marshal pages" open="true" checked="Qt::Unchecked">
-      <legendlayer name="marshal overviews.shp" open="true" drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked">
+    <legendgroup checked="Qt::Unchecked" open="true" name="Marshal pages">
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" open="true" name="marshal overviews.shp">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="marshal_overviews_shp20160930210331241"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="marshal_overviews_shp20160930210331241"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Residents Access" open="true" checked="Qt::Checked">
-      <legendlayer name="residents_access_roads" open="true" drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked">
+    <legendgroup checked="Qt::Checked" open="true" name="Residents Access">
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" open="true" name="residents_access_roads">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="residents_access_roads_a7a1b453_729e_4ac7_bb64_95381b84aa35"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="residents_access_roads_a7a1b453_729e_4ac7_bb64_95381b84aa35"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="residents_access" open="true" drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked">
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" open="true" name="residents_access">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="residents_access_12d1da3e_b4fe_4986_b6af_fb68f68c5a89"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="residents_access_12d1da3e_b4fe_4986_b6af_fb68f68c5a89"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Start and Finish pages" open="true" checked="Qt::Unchecked"/>
-    <legendgroup name="Elevation" open="false" checked="Qt::Unchecked">
-      <legendlayer name="capetownelevation-1m" open="true" drawingOrder="-1" showFeatureCount="1" checked="Qt::Unchecked">
+    <legendgroup checked="Qt::Unchecked" open="true" name="Start and Finish pages"/>
+    <legendgroup checked="Qt::Unchecked" open="false" name="Elevation">
+      <legendlayer showFeatureCount="1" checked="Qt::Unchecked" drawingOrder="-1" open="true" name="capetownelevation-1m">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Map" open="true" checked="Qt::Checked">
-      <legendlayer name="Outlines" open="false" drawingOrder="-1" showFeatureCount="0" checked="Qt::Checked">
+    <legendgroup checked="Qt::Checked" open="true" name="Map">
+      <legendlayer showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" open="false" name="Outlines">
         <filegroup hidden="false" open="false">
-          <legendlayerfile isInOverview="0" visible="1" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+          <legendlayerfile visible="1" isInOverview="0" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="GDAL-City of Cape Town 2015 Aerial" open="true" drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked">
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" open="true" name="GDAL-City of Cape Town 2015 Aerial">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
@@ -325,7 +325,7 @@
   <mapViewDocks/>
   <mapViewDocks3D/>
   <projectlayers>
-    <maplayer maxScale="100000" refreshOnNotifyMessage="" type="raster" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" autoRefreshTime="0" minScale="1e+8">
+    <maplayer autoRefreshEnabled="0" refreshOnNotifyMessage="" type="raster" autoRefreshTime="0" minScale="1e+8" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" maxScale="100000">
       <extent>
         <xmin>-20037508.33999999985098839</xmin>
         <ymin>-20037508.33999999985098839</ymin>
@@ -378,11 +378,11 @@
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxz="0" minx="0" dimensions="2" maxx="0" crs="" maxy="0" miny="0" minz="0"/>
+          <spatial maxz="0" maxx="0" minx="0" crs="" miny="0" maxy="0" dimensions="2" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -392,22 +392,22 @@
         </extent>
       </resourceMetadata>
       <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>
       <provider>gdal</provider>
       <noData>
-        <noDataList bandNo="1" useSrcNoData="0"/>
-        <noDataList bandNo="2" useSrcNoData="0"/>
-        <noDataList bandNo="3" useSrcNoData="0"/>
+        <noDataList useSrcNoData="0" bandNo="1"/>
+        <noDataList useSrcNoData="0" bandNo="2"/>
+        <noDataList useSrcNoData="0" bandNo="3"/>
       </noData>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
       </map-layer-style-manager>
       <pipe>
-        <rasterrenderer alphaBand="-1" blueBand="3" type="multibandcolor" opacity="1" redBand="1" greenBand="2">
+        <rasterrenderer type="multibandcolor" alphaBand="-1" greenBand="2" blueBand="3" opacity="0.75" redBand="1">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -418,13 +418,13 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast contrast="0" brightness="0"/>
-        <huesaturation colorizeOn="0" colorizeStrength="100" colorizeBlue="128" saturation="0" grayscaleMode="0" colorizeRed="255" colorizeGreen="128"/>
+        <brightnesscontrast brightness="0" contrast="0"/>
+        <huesaturation colorizeGreen="128" colorizeBlue="128" colorizeRed="255" colorizeOn="0" grayscaleMode="0" colorizeStrength="100" saturation="0"/>
         <rasterresampler maxOversampling="2"/>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer maxScale="0" refreshOnNotifyMessage="" type="raster" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" autoRefreshTime="0" minScale="1e+8">
+    <maplayer autoRefreshEnabled="0" refreshOnNotifyMessage="" type="raster" autoRefreshTime="0" minScale="1e+8" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" maxScale="0">
       <extent>
         <xmin>-20037508.34278924390673637</xmin>
         <ymin>-20037508.62692910060286522</ymin>
@@ -481,7 +481,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxz="0" minx="0" dimensions="2" maxx="0" crs="" maxy="0" miny="0" minz="0"/>
+          <spatial maxz="0" maxx="0" minx="0" crs="" miny="0" maxy="0" dimensions="2" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -491,20 +491,20 @@
         </extent>
       </resourceMetadata>
       <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>
       <provider>wms</provider>
       <noData>
-        <noDataList bandNo="1" useSrcNoData="0"/>
+        <noDataList useSrcNoData="0" bandNo="1"/>
       </noData>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
       </map-layer-style-manager>
       <pipe>
-        <rasterrenderer alphaBand="-1" type="singlebandcolordata" band="1" opacity="1">
+        <rasterrenderer type="singlebandcolordata" alphaBand="-1" band="1" opacity="0.75">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -515,13 +515,13 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast contrast="0" brightness="0"/>
-        <huesaturation colorizeOn="0" colorizeStrength="100" colorizeBlue="128" saturation="0" grayscaleMode="0" colorizeRed="255" colorizeGreen="128"/>
+        <brightnesscontrast brightness="0" contrast="0"/>
+        <huesaturation colorizeGreen="128" colorizeBlue="128" colorizeRed="255" colorizeOn="0" grayscaleMode="0" colorizeStrength="100" saturation="0"/>
         <rasterresampler maxOversampling="2"/>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer maxScale="100000" refreshOnNotifyMessage="" geometry="Line" simplifyLocal="1" simplifyDrawingHints="0" type="vector" simplifyMaxScale="1" simplifyAlgorithm="0" labelsEnabled="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshEnabled="0" autoRefreshTime="0" minScale="1e+8" readOnly="0">
+    <maplayer autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" simplifyLocal="1" autoRefreshTime="0" readOnly="0" geometry="Line" labelsEnabled="0" minScale="1e+8" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" maxScale="100000" simplifyMaxScale="1" simplifyAlgorithm="0" simplifyDrawingHints="0">
       <extent>
         <xmin>18.37527226735897301</xmin>
         <ymin>-33.94586066151139647</ymin>
@@ -578,7 +578,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxz="0" minx="0" dimensions="2" maxx="0" crs="" maxy="0" miny="0" minz="0"/>
+          <spatial maxz="0" maxx="0" minx="0" crs="" miny="0" maxy="0" dimensions="2" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -597,17 +597,17 @@
         <map-layer-style name="default"/>
       </map-layer-style-manager>
       <auxiliaryLayer/>
-      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 symbollevels="0" type="RuleRenderer" enableorderby="0" forceraster="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule description="Only show when active in Atlas" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone|spac|constr)' )" key="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" symbol="0" label="Active">
-            <rule description="Only show when active in Atlas" filter="&quot;Distance&quot; = '21KM'" key="{13a555f1-0140-4584-9ca0-a5c3268249fa}" symbol="1" label="21KM"/>
-            <rule description="Only show when active in Atlas" filter="&quot;Distance&quot; = '10KM'" key="{3047fdca-b9ef-4659-af1a-dbbd7cd48473}" symbol="2" label="10KM"/>
-            <rule description="Only show when active in Atlas" filter="&quot;Distance&quot; = '5KM'" key="{915c5fda-fe09-44ca-bed3-6346c6df4966}" symbol="3" label="5KM"/>
+          <rule label="Active" description="Only show when active in Atlas" symbol="0" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone|spac|constr)' )" key="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}">
+            <rule label="21KM" description="Only show when active in Atlas" symbol="1" filter="&quot;Distance&quot; = '21KM'" key="{13a555f1-0140-4584-9ca0-a5c3268249fa}"/>
+            <rule label="10KM" description="Only show when active in Atlas" symbol="2" filter="&quot;Distance&quot; = '10KM'" key="{3047fdca-b9ef-4659-af1a-dbbd7cd48473}"/>
+            <rule label="5KM" description="Only show when active in Atlas" symbol="3" filter="&quot;Distance&quot; = '5KM'" key="{915c5fda-fe09-44ca-bed3-6346c6df4966}"/>
           </rule>
         </rules>
         <symbols>
-          <symbol name="0" type="line" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="MarkerLine" pass="0" enabled="1">
+          <symbol type="line" clip_to_extent="1" name="0" alpha="1">
+            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
               <prop v="1000" k="interval"/>
               <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
               <prop v="MapUnit" k="interval_unit"/>
@@ -621,13 +621,13 @@
               <prop v="1" k="rotate"/>
               <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" type="marker" alpha="1" clip_to_extent="1">
-                <layer locked="0" class="FilledMarker" pass="0" enabled="1">
+              <symbol type="marker" clip_to_extent="1" name="@0@0" alpha="1">
+                <layer class="FilledMarker" enabled="1" pass="0" locked="0">
                   <prop v="0" k="angle"/>
                   <prop v="0,0,0,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -642,13 +642,13 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <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" type="fill" alpha="1" clip_to_extent="1">
-                    <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+                  <symbol type="fill" clip_to_extent="1" name="@@0@0@0" alpha="1">
+                    <layer class="SimpleFill" enabled="1" pass="0" 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="bevel" k="joinstyle"/>
@@ -662,9 +662,9 @@
                       <prop v="solid" k="style"/>
                       <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>
@@ -672,7 +672,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -690,15 +690,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 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" type="line" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="MarkerLine" pass="0" enabled="1">
+          <symbol type="line" clip_to_extent="1" name="1" alpha="1">
+            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
               <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"/>
@@ -712,24 +712,24 @@
               <prop v="1" k="rotate"/>
               <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="CASE &#xa;WHEN attribute( @atlas_feature , 'type' ) = 'marshal' THEN '200,0' &#xa;WHEN regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr)' ) THEN  @map_scale * '.04' &#xa;ELSE '500,0'&#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="interval">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="CASE &#xa;WHEN attribute( @atlas_feature , 'type' ) = 'marshal' THEN '200,0' &#xa;WHEN regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr)' ) THEN  @map_scale * '.04' &#xa;ELSE '500,0'&#xa;END"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="CASE &#xa;WHEN attribute( @atlas_feature , 'type' ) = 'marshal' THEN '100,0' &#xa;WHEN regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr)' ) THEN  @map_scale * '.02' &#xa;ELSE '250,0'&#xa;END" 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="CASE &#xa;WHEN attribute( @atlas_feature , 'type' ) = 'marshal' THEN '100,0' &#xa;WHEN regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr)' ) THEN  @map_scale * '.02' &#xa;ELSE '250,0'&#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>
-              <symbol name="@1@0" type="marker" alpha="1" clip_to_extent="1">
-                <layer locked="0" class="FilledMarker" pass="0" enabled="1">
+              <symbol type="marker" clip_to_extent="1" name="@1@0" alpha="1">
+                <layer class="FilledMarker" enabled="1" pass="0" locked="0">
                   <prop v="0" k="angle"/>
                   <prop v="210,32,39,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -744,13 +744,13 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <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" type="fill" alpha="1" clip_to_extent="1">
-                    <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+                  <symbol type="fill" clip_to_extent="1" name="@@1@0@0" alpha="1">
+                    <layer class="SimpleFill" enabled="1" pass="0" 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"/>
@@ -764,9 +764,9 @@
                       <prop v="solid" k="style"/>
                       <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>
@@ -774,7 +774,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -792,13 +792,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 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 locked="0" class="MarkerLine" pass="0" enabled="1">
+            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
               <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"/>
@@ -812,13 +812,13 @@
               <prop v="1" k="rotate"/>
               <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" type="marker" alpha="1" clip_to_extent="1">
-                <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
+              <symbol type="marker" clip_to_extent="1" name="@1@2" alpha="1">
+                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
                   <prop v="0" k="angle"/>
                   <prop v="210,32,39,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -839,15 +839,15 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <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 locked="0" class="MarkerLine" pass="0" enabled="1">
+            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
               <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"/>
@@ -861,13 +861,13 @@
               <prop v="1" k="rotate"/>
               <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" type="marker" alpha="1" clip_to_extent="1">
-                <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
+              <symbol type="marker" clip_to_extent="1" name="@1@3" alpha="1">
+                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
                   <prop v="0" k="angle"/>
                   <prop v="210,32,39,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -888,17 +888,17 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <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" type="line" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="MarkerLine" pass="0" enabled="1">
+          <symbol type="line" clip_to_extent="1" name="2" alpha="1">
+            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
               <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"/>
@@ -912,24 +912,24 @@
               <prop v="1" k="rotate"/>
               <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="CASE &#xa;WHEN attribute( @atlas_feature , 'type' ) = 'marshal' THEN '200,0' &#xa;WHEN regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr)' ) THEN  @map_scale * '.04' &#xa;ELSE '500,0'&#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="interval">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="CASE &#xa;WHEN attribute( @atlas_feature , 'type' ) = 'marshal' THEN '200,0' &#xa;WHEN regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr)' ) THEN  @map_scale * '.04' &#xa;ELSE '500,0'&#xa;END"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="CASE &#xa;WHEN attribute( @atlas_feature , 'type' ) = 'marshal' THEN '100,0' &#xa;WHEN regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr)' ) THEN  @map_scale * '.02' &#xa;ELSE '250,0'&#xa;END" 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="CASE &#xa;WHEN attribute( @atlas_feature , 'type' ) = 'marshal' THEN '100,0' &#xa;WHEN regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr)' ) THEN  @map_scale * '.02' &#xa;ELSE '250,0'&#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>
-              <symbol name="@2@0" type="marker" alpha="1" clip_to_extent="1">
-                <layer locked="0" class="FilledMarker" pass="0" enabled="1">
+              <symbol type="marker" clip_to_extent="1" name="@2@0" alpha="1">
+                <layer class="FilledMarker" enabled="1" pass="0" locked="0">
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -944,13 +944,13 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <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" type="fill" alpha="1" clip_to_extent="1">
-                    <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+                  <symbol type="fill" clip_to_extent="1" name="@@2@0@0" alpha="1">
+                    <layer class="SimpleFill" enabled="1" pass="0" 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"/>
@@ -964,9 +964,9 @@
                       <prop v="solid" k="style"/>
                       <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>
@@ -974,7 +974,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -992,13 +992,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 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 locked="0" class="MarkerLine" pass="0" enabled="1">
+            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
               <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"/>
@@ -1012,13 +1012,13 @@
               <prop v="1" k="rotate"/>
               <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" type="marker" alpha="1" clip_to_extent="1">
-                <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
+              <symbol type="marker" clip_to_extent="1" name="@2@2" alpha="1">
+                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -1039,15 +1039,15 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <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 locked="0" class="MarkerLine" pass="0" enabled="1">
+            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
               <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"/>
@@ -1061,13 +1061,13 @@
               <prop v="1" k="rotate"/>
               <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" type="marker" alpha="1" clip_to_extent="1">
-                <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
+              <symbol type="marker" clip_to_extent="1" name="@2@3" alpha="1">
+                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -1088,17 +1088,17 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <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" type="line" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="MarkerLine" pass="0" enabled="1">
+          <symbol type="line" clip_to_extent="1" name="3" alpha="1">
+            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
               <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"/>
@@ -1112,24 +1112,24 @@
               <prop v="1" k="rotate"/>
               <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="CASE &#xa;WHEN attribute( @atlas_feature , 'type' ) = 'marshal' THEN '200,0' &#xa;WHEN regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr)' ) THEN  @map_scale * '.04' &#xa;ELSE '500,0'&#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="interval">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="CASE &#xa;WHEN attribute( @atlas_feature , 'type' ) = 'marshal' THEN '200,0' &#xa;WHEN regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr)' ) THEN  @map_scale * '.04' &#xa;ELSE '500,0'&#xa;END"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="CASE &#xa;WHEN attribute( @atlas_feature , 'type' ) = 'marshal' THEN '100,0' &#xa;WHEN regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr)' ) THEN  @map_scale * '.02' &#xa;ELSE '250,0'&#xa;END" 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="CASE &#xa;WHEN attribute( @atlas_feature , 'type' ) = 'marshal' THEN '100,0' &#xa;WHEN regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr)' ) THEN  @map_scale * '.02' &#xa;ELSE '250,0'&#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>
-              <symbol name="@3@0" type="marker" alpha="1" clip_to_extent="1">
-                <layer locked="0" class="FilledMarker" pass="0" enabled="1">
+              <symbol type="marker" clip_to_extent="1" name="@3@0" alpha="1">
+                <layer class="FilledMarker" enabled="1" pass="0" locked="0">
                   <prop v="0" k="angle"/>
                   <prop v="145,211,55,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -1144,13 +1144,13 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <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" type="fill" alpha="1" clip_to_extent="1">
-                    <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+                  <symbol type="fill" clip_to_extent="1" name="@@3@0@0" alpha="1">
+                    <layer class="SimpleFill" enabled="1" pass="0" 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"/>
@@ -1164,9 +1164,9 @@
                       <prop v="solid" k="style"/>
                       <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>
@@ -1174,7 +1174,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" pass="0" enabled="1">
+            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
               <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"/>
@@ -1188,13 +1188,13 @@
               <prop v="1" k="rotate"/>
               <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" type="marker" alpha="1" clip_to_extent="1">
-                <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
+              <symbol type="marker" clip_to_extent="1" name="@3@1" alpha="1">
+                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
                   <prop v="0" k="angle"/>
                   <prop v="145,211,55,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -1215,15 +1215,15 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <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 locked="0" class="MarkerLine" pass="0" enabled="1">
+            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
               <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"/>
@@ -1237,13 +1237,13 @@
               <prop v="1" k="rotate"/>
               <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" type="marker" alpha="1" clip_to_extent="1">
-                <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
+              <symbol type="marker" clip_to_extent="1" name="@3@2" alpha="1">
+                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
                   <prop v="0" k="angle"/>
                   <prop v="145,211,55,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -1264,15 +1264,15 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <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 locked="0" class="SimpleLine" pass="0" enabled="1">
+            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -1290,9 +1290,9 @@
               <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 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>
@@ -1303,26 +1303,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 height="15" lineSizeType="MM" opacity="1" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" backgroundAlpha="255" maxScaleDenominator="1e+8" diagramOrientation="Up" width="15" scaleDependency="Area" minimumSize="0" backgroundColor="#ffffff" enabled="0" barWidth="5" penColor="#000000" minScaleDenominator="100000" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penAlpha="255" penWidth="0" sizeType="MM">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" rotationOffset="270" penColor="#000000" backgroundAlpha="255" opacity="1" minScaleDenominator="100000" lineSizeType="MM" diagramOrientation="Up" barWidth="5" maxScaleDenominator="1e+8" minimumSize="0" width="15" height="15" scaleBasedVisibility="0" labelPlacementMethod="XHeight" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundColor="#ffffff">
           <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" field="" label=""/>
+          <attribute label="" color="#000000" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="2" obstacle="0" zIndex="0" placement="2" showAll="1" priority="0">
+      <DiagramLayerSettings priority="0" dist="0" zIndex="0" showAll="1" linePlacementFlags="2" obstacle="0" placement="2">
         <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>
@@ -1331,8 +1331,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>
@@ -1341,8 +1341,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>
@@ -1351,8 +1351,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>
@@ -1361,8 +1361,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>
@@ -1371,8 +1371,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>
@@ -1381,8 +1381,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>
@@ -1391,8 +1391,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>
@@ -1401,8 +1401,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>
@@ -1411,8 +1411,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>
@@ -1421,79 +1421,79 @@
           <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 name="" index="0" field="Name"/>
-        <alias name="" index="1" field="descriptio"/>
-        <alias name="" index="2" field="timestamp"/>
-        <alias name="" index="3" field="begin"/>
-        <alias name="" index="4" field="end"/>
-        <alias name="" index="5" field="Distance"/>
-        <alias name="" index="6" field="RouteLen"/>
-        <alias name="" index="7" field="length_m"/>
-        <alias name="" index="8" field="length_km"/>
-        <alias name="" index="9" field="Source"/>
+        <alias field="Name" index="0" name=""/>
+        <alias field="descriptio" index="1" name=""/>
+        <alias field="timestamp" index="2" name=""/>
+        <alias field="begin" index="3" name=""/>
+        <alias field="end" index="4" name=""/>
+        <alias field="Distance" index="5" name=""/>
+        <alias field="RouteLen" index="6" name=""/>
+        <alias field="length_m" index="7" name=""/>
+        <alias field="length_km" index="8" name=""/>
+        <alias field="Source" index="9" name=""/>
       </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 field="Name" expression="" applyOnUpdate="0"/>
+        <default field="descriptio" expression="" applyOnUpdate="0"/>
+        <default field="timestamp" expression="" applyOnUpdate="0"/>
+        <default field="begin" expression="" applyOnUpdate="0"/>
+        <default field="end" expression="" applyOnUpdate="0"/>
+        <default field="Distance" expression="" applyOnUpdate="0"/>
+        <default field="RouteLen" expression="" applyOnUpdate="0"/>
+        <default field="length_m" expression="" applyOnUpdate="0"/>
+        <default field="length_km" expression="" applyOnUpdate="0"/>
+        <default field="Source" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="Name" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="descriptio" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="timestamp" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="begin" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="end" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="Distance" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="RouteLen" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="length_m" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="length_km" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="Source" notnull_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="Name" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="descriptio" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="timestamp" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="begin" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="end" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="Distance" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="RouteLen" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="length_m" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="length_km" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="Source" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="Name"/>
-        <constraint exp="" desc="" field="descriptio"/>
-        <constraint exp="" desc="" field="timestamp"/>
-        <constraint exp="" desc="" field="begin"/>
-        <constraint exp="" desc="" field="end"/>
-        <constraint exp="" desc="" field="Distance"/>
-        <constraint exp="" desc="" field="RouteLen"/>
-        <constraint exp="" desc="" field="length_m"/>
-        <constraint exp="" desc="" field="length_km"/>
-        <constraint exp="" desc="" 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>
       <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;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;Name&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <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="-1"/>
-          <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"/>
+          <column type="field" hidden="0" name="Name" width="-1"/>
+          <column type="field" hidden="0" name="descriptio" width="-1"/>
+          <column type="field" hidden="0" name="timestamp" width="-1"/>
+          <column type="field" hidden="0" name="begin" width="-1"/>
+          <column type="field" hidden="0" name="end" width="-1"/>
+          <column type="field" hidden="0" name="Distance" width="-1"/>
+          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" hidden="0" name="RouteLen" width="-1"/>
+          <column type="field" hidden="0" name="length_m" width="-1"/>
+          <column type="field" hidden="0" name="length_km" width="-1"/>
+          <column type="field" hidden="0" name="Source" width="-1"/>
         </columns>
       </attributetableconfig>
       <editform tolerant="1">.</editform>
@@ -1520,28 +1520,28 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="Distance" editable="1"/>
-        <field name="Name" editable="1"/>
-        <field name="RouteLen" editable="1"/>
-        <field name="Source" editable="1"/>
-        <field name="begin" editable="1"/>
-        <field name="descriptio" editable="1"/>
-        <field name="end" editable="1"/>
-        <field name="length_km" editable="1"/>
-        <field name="length_m" editable="1"/>
-        <field name="timestamp" editable="1"/>
+        <field editable="1" name="Distance"/>
+        <field editable="1" name="Name"/>
+        <field editable="1" name="RouteLen"/>
+        <field editable="1" name="Source"/>
+        <field editable="1" name="begin"/>
+        <field editable="1" name="descriptio"/>
+        <field editable="1" name="end"/>
+        <field editable="1" name="length_km"/>
+        <field editable="1" name="length_m"/>
+        <field editable="1" name="timestamp"/>
       </editable>
       <labelOnTop>
-        <field name="Distance" labelOnTop="0"/>
-        <field name="Name" labelOnTop="0"/>
-        <field name="RouteLen" labelOnTop="0"/>
-        <field name="Source" labelOnTop="0"/>
-        <field name="begin" labelOnTop="0"/>
-        <field name="descriptio" labelOnTop="0"/>
-        <field name="end" labelOnTop="0"/>
-        <field name="length_km" labelOnTop="0"/>
-        <field name="length_m" labelOnTop="0"/>
-        <field name="timestamp" labelOnTop="0"/>
+        <field labelOnTop="0" name="Distance"/>
+        <field labelOnTop="0" name="Name"/>
+        <field labelOnTop="0" name="RouteLen"/>
+        <field labelOnTop="0" name="Source"/>
+        <field labelOnTop="0" name="begin"/>
+        <field labelOnTop="0" name="descriptio"/>
+        <field labelOnTop="0" name="end"/>
+        <field labelOnTop="0" name="length_km"/>
+        <field labelOnTop="0" name="length_m"/>
+        <field labelOnTop="0" name="timestamp"/>
       </labelOnTop>
       <widgets/>
       <conditionalstyles>
@@ -1552,7 +1552,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" refreshOnNotifyMessage="" geometry="Line" simplifyLocal="1" simplifyDrawingHints="1" type="vector" simplifyMaxScale="1" simplifyAlgorithm="0" labelsEnabled="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshEnabled="0" autoRefreshTime="0" minScale="1e+8" readOnly="0">
+    <maplayer autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" simplifyLocal="1" autoRefreshTime="0" readOnly="0" geometry="Line" labelsEnabled="0" minScale="1e+8" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" maxScale="0" simplifyMaxScale="1" simplifyAlgorithm="0" simplifyDrawingHints="1">
       <extent>
         <xmin>17.99958333333333371</xmin>
         <ymin>-34.00041666666666629</ymin>
@@ -1611,10 +1611,10 @@ def my_form_open(dialog, layer, feature):
         <map-layer-style name="default"/>
       </map-layer-style-manager>
       <auxiliaryLayer/>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 symbollevels="0" type="singleSymbol" enableorderby="0" forceraster="0">
         <symbols>
-          <symbol name="0" type="line" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+          <symbol type="line" clip_to_extent="1" name="0" alpha="1">
+            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -1632,9 +1632,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 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>
@@ -1671,31 +1671,31 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="ID"/>
-        <alias name="" index="1" field="height"/>
-        <alias name="" index="2" field="elevation"/>
+        <alias field="ID" index="0" name=""/>
+        <alias field="height" index="1" name=""/>
+        <alias field="elevation" index="2" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="ID"/>
-        <default expression="" applyOnUpdate="0" field="height"/>
-        <default expression="" applyOnUpdate="0" field="elevation"/>
+        <default field="ID" expression="" applyOnUpdate="0"/>
+        <default field="height" expression="" applyOnUpdate="0"/>
+        <default field="elevation" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="ID" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="height" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="elevation" notnull_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="ID" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="height" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="elevation" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="ID"/>
-        <constraint exp="" desc="" field="height"/>
-        <constraint exp="" desc="" field="elevation"/>
+        <constraint desc="" field="ID" exp=""/>
+        <constraint desc="" field="height" exp=""/>
+        <constraint desc="" field="elevation" exp=""/>
       </constraintExpressions>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <editform tolerant="1"></editform>
@@ -1716,15 +1716,15 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="100000" refreshOnNotifyMessage="" geometry="Line" simplifyLocal="1" simplifyDrawingHints="0" type="vector" simplifyMaxScale="1" simplifyAlgorithm="0" labelsEnabled="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshEnabled="0" autoRefreshTime="0" minScale="1e+8" readOnly="0">
+    <maplayer autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" simplifyLocal="1" autoRefreshTime="0" readOnly="0" geometry="Line" labelsEnabled="0" minScale="1e+8" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" maxScale="100000" simplifyMaxScale="1" simplifyAlgorithm="0" simplifyDrawingHints="0">
       <extent>
         <xmin>2049179.2943323424551636</xmin>
-        <ymin>-4016190.97196918446570635</ymin>
-        <xmax>2050080.14731159014627337</xmax>
+        <ymin>-4016491.81700840592384338</ymin>
+        <xmax>2050085.35016213171184063</xmax>
         <ymax>-4015316.96170271467417479</ymax>
       </extent>
       <id>directions_to_start_cf338b4b_1403_45e8_b11f_47b48dd39657</id>
-      <datasource>../../../directions_to_start.shp</datasource>
+      <datasource>./directions_to_start.shp</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -1773,7 +1773,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxz="0" minx="0" dimensions="2" maxx="0" crs="" maxy="0" miny="0" minz="0"/>
+          <spatial maxz="0" maxx="0" minx="0" crs="" miny="0" maxy="0" dimensions="2" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -1792,96 +1792,69 @@ def my_form_open(dialog, layer, feature):
         <map-layer-style name="default"/>
       </map-layer-style-manager>
       <auxiliaryLayer/>
-      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 symbollevels="0" type="RuleRenderer" enableorderby="0" forceraster="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule description="Only show when active in Atlas" filter="&quot;distance&quot; = '21KM'" key="{85adf11b-f941-44b6-8847-c828ab845cdc}" symbol="0" label="21KM"/>
-          <rule description="Only show when active in Atlas" filter="&quot;distance&quot; = '10KM'" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" symbol="1" label="10KM"/>
-          <rule description="Only show when active in Atlas" filter="&quot;distance&quot; = '5KM'" key="{cf733f0f-ab72-441e-b213-841aa39c1671}" symbol="2" label="5KM"/>
+          <rule label="21KM" description="Only show when active in Atlas" symbol="0" filter="&quot;distance&quot; = '21KM'" key="{85adf11b-f941-44b6-8847-c828ab845cdc}"/>
+          <rule label="10KM" description="Only show when active in Atlas" symbol="1" filter="&quot;distance&quot; = '10KM'" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}"/>
+          <rule label="5KM" description="Only show when active in Atlas" symbol="2" filter="&quot;distance&quot; = '5KM'" key="{cf733f0f-ab72-441e-b213-841aa39c1671}"/>
         </rules>
         <symbols>
-          <symbol name="0" type="line" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="MarkerLine" pass="0" enabled="1">
-              <prop v="500" k="interval"/>
+          <symbol type="line" clip_to_extent="1" name="0" alpha="1">
+            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
+              <prop v="3" k="interval"/>
               <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MapUnit" k="interval_unit"/>
+              <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="MapUnit" k="offset_along_line_unit"/>
+              <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="1" k="rotate"/>
               <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>
-                    <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>
-                  </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@0@0" type="marker" alpha="1" clip_to_extent="1">
-                <layer locked="0" class="FilledMarker" pass="0" enabled="1">
+              <symbol type="marker" clip_to_extent="1" name="@0@0" alpha="1">
+                <layer class="SimpleMarker" enabled="1" pass="0" 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="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
+                  <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"/>
                   <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" type="fill" alpha="1" clip_to_extent="1">
-                    <layer locked="0" class="SimpleFill" pass="0" enabled="1">
-                      <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="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
-                          <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
-                        </Option>
-                      </data_defined_properties>
-                    </layer>
-                  </symbol>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" pass="0" enabled="1">
-              <prop v="500" k="interval"/>
+            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
+              <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="250" k="offset_along_line"/>
+              <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"/>
@@ -1890,24 +1863,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="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="CASE &#xa;WHEN attribute( @atlas_feature , 'type' ) = 'marshal' THEN '200,0' &#xa;WHEN regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr)' ) THEN  @map_scale * '.04' &#xa;ELSE '500,0'&#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="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="true" type="bool"/>
-                      <Option name="expression" value="CASE &#xa;WHEN attribute( @atlas_feature , 'type' ) = 'marshal' THEN '100,0' &#xa;WHEN regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr)' ) THEN  @map_scale * '.02' &#xa;ELSE '250,0'&#xa;END" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <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" type="marker" alpha="1" clip_to_extent="1">
-                <layer locked="0" class="FilledMarker" pass="0" enabled="1">
+              <symbol type="marker" clip_to_extent="1" name="@0@1" alpha="1">
+                <layer class="FilledMarker" enabled="1" pass="0" locked="0">
                   <prop v="0" k="angle"/>
                   <prop v="210,32,39,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -1916,19 +1889,19 @@ def my_form_open(dialog, layer, feature):
                   <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="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"/>
                   <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" type="fill" alpha="1" clip_to_extent="1">
-                    <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+                  <symbol type="fill" clip_to_extent="1" name="@@0@1@0" alpha="1">
+                    <layer class="SimpleFill" enabled="1" pass="0" 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"/>
@@ -1936,15 +1909,15 @@ def my_form_open(dialog, layer, feature):
                       <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="no" k="outline_style"/>
                       <prop v="0" k="outline_width"/>
                       <prop v="MM" k="outline_width_unit"/>
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option 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>
@@ -1952,16 +1925,16 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
+            <layer class="SimpleLine" enabled="1" pass="0" 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="bevel" k="joinstyle"/>
+              <prop v="miter" 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="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"/>
@@ -1970,83 +1943,83 @@ def my_form_open(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 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" type="line" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="MarkerLine" pass="0" enabled="1">
+          <symbol type="line" clip_to_extent="1" name="1" alpha="1">
+            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
               <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="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="MapUnit" k="offset_along_line_unit"/>
+              <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="MM" k="offset_unit"/>
               <prop v="lastvertex" k="placement"/>
               <prop v="1" k="rotate"/>
               <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" type="marker" alpha="1" clip_to_extent="1">
-                <layer locked="0" class="FilledMarker" pass="0" enabled="1">
+              <symbol type="marker" clip_to_extent="1" name="@1@0" alpha="1">
+                <layer class="FilledMarker" enabled="1" pass="0" 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="MM" k="offset_unit"/>
                   <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
+                  <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"/>
                   <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" type="fill" alpha="1" clip_to_extent="1">
-                    <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+                  <symbol type="fill" clip_to_extent="1" name="@@1@0@0" alpha="1">
+                    <layer class="SimpleFill" enabled="1" pass="0" 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="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="26,0,201,0" k="outline_color"/>
+                      <prop v="103,34,144,255" k="outline_color"/>
                       <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
+                      <prop v="0.5" k="outline_width"/>
                       <prop v="MM" k="outline_width_unit"/>
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option 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>
@@ -2054,59 +2027,59 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" pass="0" enabled="1">
-              <prop v="500" k="interval"/>
+            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
+              <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="MM" k="interval_unit"/>
               <prop v="0" k="offset"/>
-              <prop v="250" k="offset_along_line"/>
+              <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="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="MM" k="offset_unit"/>
               <prop v="interval" k="placement"/>
               <prop v="1" k="rotate"/>
               <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="CASE &#xa;WHEN attribute( @atlas_feature , 'type' ) = 'marshal' THEN '200,0' &#xa;WHEN regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr)' ) THEN  @map_scale * '.04' &#xa;ELSE '500,0'&#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="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="true" type="bool"/>
-                      <Option name="expression" value="CASE &#xa;WHEN attribute( @atlas_feature , 'type' ) = 'marshal' THEN '100,0' &#xa;WHEN regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr)' ) THEN  @map_scale * '.02' &#xa;ELSE '250,0'&#xa;END" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <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" type="marker" alpha="1" clip_to_extent="1">
-                <layer locked="0" class="FilledMarker" pass="0" enabled="1">
+              <symbol type="marker" clip_to_extent="1" name="@1@1" alpha="1">
+                <layer class="FilledMarker" enabled="1" pass="0" 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="MM" k="offset_unit"/>
                   <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
+                  <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"/>
                   <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" type="fill" alpha="1" clip_to_extent="1">
-                    <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+                  <symbol type="fill" clip_to_extent="1" name="@@1@1@0" alpha="1">
+                    <layer class="SimpleFill" enabled="1" pass="0" 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"/>
@@ -2114,15 +2087,15 @@ def my_form_open(dialog, layer, feature):
                       <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="no" k="outline_style"/>
                       <prop v="0" k="outline_width"/>
                       <prop v="MM" k="outline_width_unit"/>
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option 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>
@@ -2130,33 +2103,33 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
+            <layer class="SimpleLine" enabled="1" pass="0" 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="MM" k="customdash_unit"/>
               <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
+              <prop v="miter" 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="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="MM" k="offset_unit"/>
               <prop v="0" k="use_custom_dash"/>
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option 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" type="line" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="MarkerLine" pass="0" enabled="1">
+          <symbol type="line" clip_to_extent="1" name="2" alpha="1">
+            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
               <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"/>
@@ -2170,61 +2143,61 @@ 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="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" type="marker" alpha="1" clip_to_extent="1">
-                <layer locked="0" class="FilledMarker" pass="0" enabled="1">
+              <symbol type="marker" clip_to_extent="1" name="@2@0" alpha="1">
+                <layer class="FilledMarker" enabled="1" pass="0" locked="0">
                   <prop v="0" k="angle"/>
-                  <prop v="145,211,55,255" k="color"/>
+                  <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="2" k="size"/>
+                  <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"/>
                   <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" type="fill" alpha="1" clip_to_extent="1">
-                    <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+                  <symbol type="fill" clip_to_extent="1" name="@@2@0@0" alpha="1">
+                    <layer class="SimpleFill" enabled="1" pass="0" 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="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="26,0,201,0" k="outline_color"/>
+                      <prop v="69,100,25,255" k="outline_color"/>
                       <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
+                      <prop v="0.5" k="outline_width"/>
                       <prop v="MM" k="outline_width_unit"/>
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option 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>
@@ -2232,12 +2205,12 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" pass="0" enabled="1">
-              <prop v="500" k="interval"/>
+            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
+              <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="250" k="offset_along_line"/>
+              <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"/>
@@ -2246,61 +2219,61 @@ 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="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="CASE &#xa;WHEN attribute( @atlas_feature , 'type' ) = 'marshal' THEN '200,0' &#xa;WHEN regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr)' ) THEN  @map_scale * '.04' &#xa;ELSE '500,0'&#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="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="true" type="bool"/>
-                      <Option name="expression" value="CASE &#xa;WHEN attribute( @atlas_feature , 'type' ) = 'marshal' THEN '100,0' &#xa;WHEN regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr)' ) THEN  @map_scale * '.02' &#xa;ELSE '250,0'&#xa;END" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <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" type="marker" alpha="1" clip_to_extent="1">
-                <layer locked="0" class="FilledMarker" pass="0" enabled="1">
+              <symbol type="marker" clip_to_extent="1" name="@2@1" alpha="1">
+                <layer class="FilledMarker" enabled="1" pass="0" locked="0">
                   <prop v="0" k="angle"/>
-                  <prop v="145,211,55,255" k="color"/>
+                  <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="2" k="size"/>
+                  <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"/>
                   <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" type="fill" alpha="1" clip_to_extent="1">
-                    <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+                  <symbol type="fill" clip_to_extent="1" name="@@2@1@0" alpha="1">
+                    <layer class="SimpleFill" enabled="1" pass="0" 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="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="solid" k="outline_style"/>
+                      <prop v="no" k="outline_style"/>
                       <prop v="0" k="outline_width"/>
                       <prop v="MM" k="outline_width_unit"/>
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option 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>
@@ -2308,16 +2281,16 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
+            <layer class="SimpleLine" enabled="1" pass="0" 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="bevel" k="joinstyle"/>
-              <prop v="145,211,55,255" k="line_color"/>
+              <prop v="miter" k="joinstyle"/>
+              <prop v="69,100,25,255" k="line_color"/>
               <prop v="solid" k="line_style"/>
-              <prop v="0.5" k="line_width"/>
+              <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"/>
@@ -2326,9 +2299,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 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>
@@ -2339,26 +2312,26 @@ def my_form_open(dialog, layer, feature):
         </orderby>
       </renderer-v2>
       <customproperties>
-        <property value="id" 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 height="15" lineSizeType="MM" opacity="1" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" backgroundAlpha="255" maxScaleDenominator="1e+8" diagramOrientation="Up" width="15" scaleDependency="Area" minimumSize="0" backgroundColor="#ffffff" enabled="0" barWidth="5" penColor="#000000" minScaleDenominator="100000" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penAlpha="255" penWidth="0" sizeType="MM">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" rotationOffset="270" penColor="#000000" backgroundAlpha="255" opacity="1" minScaleDenominator="100000" lineSizeType="MM" diagramOrientation="Up" barWidth="5" maxScaleDenominator="1e+8" minimumSize="0" width="15" height="15" scaleBasedVisibility="0" labelPlacementMethod="XHeight" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundColor="#ffffff">
           <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" field="" label=""/>
+          <attribute label="" color="#000000" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="2" obstacle="0" zIndex="0" placement="2" showAll="1" priority="0">
+      <DiagramLayerSettings priority="0" dist="0" zIndex="0" showAll="1" linePlacementFlags="2" obstacle="0" placement="2">
         <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>
@@ -2374,39 +2347,39 @@ 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 name="" index="0" field="id"/>
-        <alias name="" index="1" field="Distance"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="Distance" index="1" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="Distance"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="Distance" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="id" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="Distance" notnull_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="Distance" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="Distance"/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="Distance" exp=""/>
       </constraintExpressions>
       <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;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;Distance&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <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"/>
+          <column type="field" hidden="0" name="Distance" width="-1"/>
+          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" hidden="0" name="id" width="-1"/>
         </columns>
       </attributetableconfig>
       <editform tolerant="1">.</editform>
@@ -2433,30 +2406,30 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="Distance" editable="1"/>
-        <field name="Name" editable="1"/>
-        <field name="RouteLen" editable="1"/>
-        <field name="Source" editable="1"/>
-        <field name="begin" editable="1"/>
-        <field name="descriptio" editable="1"/>
-        <field name="end" editable="1"/>
-        <field name="id" editable="1"/>
-        <field name="length_km" editable="1"/>
-        <field name="length_m" editable="1"/>
-        <field name="timestamp" editable="1"/>
+        <field editable="1" name="Distance"/>
+        <field editable="1" name="Name"/>
+        <field editable="1" name="RouteLen"/>
+        <field editable="1" name="Source"/>
+        <field editable="1" name="begin"/>
+        <field editable="1" name="descriptio"/>
+        <field editable="1" name="end"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="length_km"/>
+        <field editable="1" name="length_m"/>
+        <field editable="1" name="timestamp"/>
       </editable>
       <labelOnTop>
-        <field name="Distance" labelOnTop="0"/>
-        <field name="Name" labelOnTop="0"/>
-        <field name="RouteLen" labelOnTop="0"/>
-        <field name="Source" labelOnTop="0"/>
-        <field name="begin" labelOnTop="0"/>
-        <field name="descriptio" labelOnTop="0"/>
-        <field name="end" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="length_km" labelOnTop="0"/>
-        <field name="length_m" labelOnTop="0"/>
-        <field name="timestamp" labelOnTop="0"/>
+        <field labelOnTop="0" name="Distance"/>
+        <field labelOnTop="0" name="Name"/>
+        <field labelOnTop="0" name="RouteLen"/>
+        <field labelOnTop="0" name="Source"/>
+        <field labelOnTop="0" name="begin"/>
+        <field labelOnTop="0" name="descriptio"/>
+        <field labelOnTop="0" name="end"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="length_km"/>
+        <field labelOnTop="0" name="length_m"/>
+        <field labelOnTop="0" name="timestamp"/>
       </labelOnTop>
       <widgets/>
       <conditionalstyles>
@@ -2467,7 +2440,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="100000" refreshOnNotifyMessage="" geometry="Point" simplifyLocal="1" simplifyDrawingHints="0" type="vector" simplifyMaxScale="1" simplifyAlgorithm="0" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshEnabled="0" autoRefreshTime="0" minScale="1e+8" readOnly="0">
+    <maplayer autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" simplifyLocal="1" autoRefreshTime="0" readOnly="0" geometry="Point" labelsEnabled="1" minScale="1e+8" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" maxScale="100000" simplifyMaxScale="1" simplifyAlgorithm="0" simplifyDrawingHints="0">
       <extent>
         <xmin>18.38517016505928936</xmin>
         <ymin>-33.91987011678683217</ymin>
@@ -2526,10 +2499,10 @@ def my_form_open(dialog, layer, feature):
         <map-layer-style name="default"/>
       </map-layer-style-manager>
       <auxiliaryLayer/>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 symbollevels="0" type="singleSymbol" enableorderby="0" forceraster="0">
         <symbols>
-          <symbol name="0" type="marker" alpha="0.796078" clip_to_extent="1">
-            <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
+          <symbol type="marker" clip_to_extent="1" name="0" alpha="0.796078">
+            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
               <prop v="0" k="angle"/>
               <prop v="227,0,185,255" k="color"/>
               <prop v="1" k="horizontal_anchor_point"/>
@@ -2550,15 +2523,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="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>
@@ -2571,87 +2544,87 @@ def my_form_open(dialog, layer, feature):
         <rules key="{de1ff1b5-a53a-4841-835f-57785b684a9d}">
           <rule description="Show in marshal maps" filter="'marshal' = attribute( $atlasfeature , 'type' )" key="{9ea624c1-7179-4746-8777-84b8008475a1}">
             <settings>
-              <text-style fontWordSpacing="0" useSubstitutions="0" fontCapitals="0" isExpression="0" fontSizeUnit="Point" fontUnderline="0" previewBkgrdColor="#ffffff" fontFamily="Myriad Pro" fontSize="8" multilineHeight="1" fontItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fieldName="position" textColor="0,0,0,255" textOpacity="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0" fontStrikeout="0" fontWeight="63">
-                <text-buffer bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="0" bufferDraw="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeType="3" shapeSizeUnit="MM" shapeDraw="1" shapeJoinStyle="64" shapeOpacity="1" shapeSVGFile="" shapeOffsetUnit="MM" shapeSizeY="0.2" shapeRotation="0" shapeSizeX="0.2" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeOffsetY="0" shapeRadiiUnit="MM" shapeBorderWidth="0.4" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="8" fontCapitals="0" fontSizeUnit="Point" useSubstitutions="0" isExpression="0" fontItalic="0" fontStrikeout="0" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" fieldName="position" textOpacity="1" textColor="0,0,0,255" fontWeight="63" fontUnderline="0" multilineHeight="1" namedStyle="Semibold" fontLetterSpacing="0" fontWordSpacing="0" blendMode="0">
+                <text-buffer bufferNoFill="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <background shapeOffsetUnit="MM" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiY="0" shapeType="3" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeSizeX="0.2" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.4" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.2" shapeDraw="1" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiUnit="MM" shapeOpacity="1"/>
+                <shadow shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.7" shadowOffsetAngle="135" shadowRadius="1.5" shadowBlendMode="6" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100"/>
                 <substitutions/>
               </text-style>
-              <text-format decimals="3" addDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="0" wrapChar="" placeDirectionSymbol="0" plussign="0" formatNumbers="0"/>
-              <placement placementFlags="10" offsetType="0" centroidWhole="0" repeatDistanceUnits="MM" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" dist="0" yOffset="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="8" placement="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" xOffset="0" fitInPolygonOnly="0" centroidInside="0" maxCurvedCharAngleOut="-20" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" rotationAngle="0"/>
-              <rendering fontLimitPixelSize="0" labelPerPart="0" obstacle="1" zIndex="0" obstacleFactor="1" displayAll="1" maxNumLabels="2000" fontMaxPixelSize="10000" upsidedownLabels="0" limitNumLabels="0" scaleMin="1" minFeatureSize="0" drawLabels="1" mergeLines="0" scaleVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" decimals="3"/>
+              <placement quadOffset="4" offsetType="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="8" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceUnits="MM" offsetUnits="MapUnit" centroidWhole="0" maxCurvedCharAngleIn="20" centroidInside="0" xOffset="0" placement="1" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" yOffset="0" dist="0" distUnits="MM" repeatDistance="0"/>
+              <rendering displayAll="1" fontLimitPixelSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" labelPerPart="0" obstacle="1" scaleMin="1" limitNumLabels="0" maxNumLabels="2000" obstacleType="0" drawLabels="1" upsidedownLabels="0" fontMinPixelSize="3" minFeatureSize="0" scaleMax="10000000" scaleVisibility="0" zIndex="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="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 description="Show in marshal overview" filter="'marshal plan' = attribute( $atlasfeature , 'type' )" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}">
             <settings>
-              <text-style fontWordSpacing="0" useSubstitutions="0" fontCapitals="0" isExpression="0" fontSizeUnit="Point" fontUnderline="0" previewBkgrdColor="#ffffff" fontFamily="Myriad Pro" fontSize="4" multilineHeight="1" fontItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fieldName="position" textColor="227,0,185,255" textOpacity="0.9" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0" fontStrikeout="0" fontWeight="63">
-                <text-buffer bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="0" bufferDraw="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeType="3" shapeSizeUnit="MM" shapeDraw="1" shapeJoinStyle="64" shapeOpacity="0.5" shapeSVGFile="" shapeOffsetUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeOffsetY="0" shapeRadiiUnit="MM" shapeBorderWidth="0.1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="4" fontCapitals="0" fontSizeUnit="Point" useSubstitutions="0" isExpression="0" fontItalic="0" fontStrikeout="0" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" fieldName="position" textOpacity="0.9" textColor="227,0,185,255" fontWeight="63" fontUnderline="0" multilineHeight="1" namedStyle="Semibold" fontLetterSpacing="0" fontWordSpacing="0" blendMode="0">
+                <text-buffer bufferNoFill="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <background shapeOffsetUnit="MM" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiY="0" shapeType="3" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeSizeX="0" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.1" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeDraw="1" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiUnit="MM" shapeOpacity="0.5"/>
+                <shadow shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.7" shadowOffsetAngle="135" shadowRadius="1.5" shadowBlendMode="6" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100"/>
                 <substitutions/>
               </text-style>
-              <text-format decimals="3" addDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="0" wrapChar="" placeDirectionSymbol="0" plussign="0" formatNumbers="0"/>
-              <placement placementFlags="10" offsetType="0" centroidWhole="0" repeatDistanceUnits="MM" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" dist="1" yOffset="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="10" placement="6" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" xOffset="0" fitInPolygonOnly="0" centroidInside="0" maxCurvedCharAngleOut="-20" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" rotationAngle="0"/>
-              <rendering fontLimitPixelSize="0" labelPerPart="0" obstacle="0" zIndex="2" obstacleFactor="1" displayAll="1" maxNumLabels="2000" fontMaxPixelSize="10000" upsidedownLabels="0" limitNumLabels="0" scaleMin="1" minFeatureSize="0" drawLabels="1" mergeLines="0" scaleVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" decimals="3"/>
+              <placement quadOffset="4" offsetType="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="10" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceUnits="MM" offsetUnits="MapUnit" centroidWhole="0" maxCurvedCharAngleIn="20" centroidInside="0" xOffset="0" placement="6" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" yOffset="0" dist="1" distUnits="MM" repeatDistance="0"/>
+              <rendering displayAll="1" fontLimitPixelSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" labelPerPart="0" obstacle="0" scaleMin="1" limitNumLabels="0" maxNumLabels="2000" obstacleType="0" drawLabels="1" upsidedownLabels="0" fontMinPixelSize="3" minFeatureSize="0" scaleMax="10000000" scaleVisibility="0" zIndex="2"/>
               <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>
@@ -2659,160 +2632,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 height="15" lineSizeType="MM" opacity="1" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" backgroundAlpha="255" maxScaleDenominator="1e+8" diagramOrientation="Up" width="15" scaleDependency="Area" minimumSize="0" backgroundColor="#ffffff" enabled="0" barWidth="5" penColor="#000000" minScaleDenominator="100000" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penAlpha="255" penWidth="0" sizeType="MM">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" rotationOffset="270" penColor="#000000" backgroundAlpha="255" opacity="1" minScaleDenominator="100000" lineSizeType="MM" diagramOrientation="Up" barWidth="5" maxScaleDenominator="1e+8" minimumSize="0" width="15" height="15" scaleBasedVisibility="0" labelPlacementMethod="XHeight" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundColor="#ffffff">
           <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" field="" label=""/>
+          <attribute label="" color="#000000" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="10" obstacle="0" zIndex="0" placement="0" showAll="1" priority="0">
+      <DiagramLayerSettings priority="0" dist="0" zIndex="0" showAll="1" linePlacementFlags="10" obstacle="0" placement="0">
         <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>
@@ -2821,8 +2794,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>
@@ -2831,8 +2804,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>
@@ -2841,44 +2814,44 @@ 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 name="" index="0" field="id"/>
-        <alias name="" index="1" field="position"/>
-        <alias name="" index="2" field="type"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="position" index="1" name=""/>
+        <alias field="type" index="2" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="position"/>
-        <default expression="" applyOnUpdate="0" field="type"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="position" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="id" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="position" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="type" notnull_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="position" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="position"/>
-        <constraint exp="" desc="" field="type"/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="position" exp=""/>
+        <constraint desc="" field="type" exp=""/>
       </constraintExpressions>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;position&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;position&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <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 type="field" hidden="0" name="id" width="-1"/>
+          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" hidden="0" name="position" width="-1"/>
+          <column type="field" hidden="0" name="type" width="-1"/>
         </columns>
       </attributetableconfig>
       <editform tolerant="1">.</editform>
@@ -2952,7 +2925,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer maxScale="0" refreshOnNotifyMessage="" geometry="Polygon" simplifyLocal="1" simplifyDrawingHints="1" type="vector" simplifyMaxScale="1" simplifyAlgorithm="0" labelsEnabled="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshEnabled="0" autoRefreshTime="0" minScale="1e+8" readOnly="0">
+    <maplayer autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" simplifyLocal="1" autoRefreshTime="0" readOnly="0" geometry="Polygon" labelsEnabled="0" minScale="1e+8" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" maxScale="0" simplifyMaxScale="1" simplifyAlgorithm="0" simplifyDrawingHints="1">
       <extent>
         <xmin>2045688.58425209275446832</xmin>
         <ymin>-4021531.2146315616555512</ymin>
@@ -3009,7 +2982,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxz="0" minx="0" dimensions="2" maxx="0" crs="" maxy="0" miny="0" minz="0"/>
+          <spatial maxz="0" maxx="0" minx="0" crs="" miny="0" maxy="0" dimensions="2" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -3030,10 +3003,10 @@ def my_form_open(dialog, layer, feature):
         <map-layer-style name="default"/>
       </map-layer-style-manager>
       <auxiliaryLayer/>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 symbollevels="0" type="singleSymbol" enableorderby="0" forceraster="0">
         <symbols>
-          <symbol name="0" type="fill" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+          <symbol type="fill" clip_to_extent="1" name="0" alpha="1">
+            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="77,175,74,255" k="color"/>
               <prop v="bevel" k="joinstyle"/>
@@ -3047,9 +3020,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 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>
@@ -3059,26 +3032,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 height="15" lineSizeType="MM" opacity="1" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" backgroundAlpha="255" maxScaleDenominator="1e+8" diagramOrientation="Up" width="15" scaleDependency="Area" minimumSize="0" backgroundColor="#ffffff" enabled="0" barWidth="5" penColor="#000000" minScaleDenominator="0" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penAlpha="255" penWidth="0" sizeType="MM">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" rotationOffset="270" penColor="#000000" backgroundAlpha="255" opacity="1" minScaleDenominator="0" lineSizeType="MM" diagramOrientation="Up" barWidth="5" maxScaleDenominator="1e+8" minimumSize="0" width="15" height="15" scaleBasedVisibility="0" labelPlacementMethod="XHeight" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundColor="#ffffff">
           <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" field="" label=""/>
+          <attribute label="" color="#000000" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="18" obstacle="0" zIndex="0" placement="1" showAll="1" priority="0">
+      <DiagramLayerSettings priority="0" dist="0" zIndex="0" showAll="1" linePlacementFlags="18" obstacle="0" placement="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>
@@ -3134,56 +3107,56 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="group"/>
-        <alias name="" index="2" field="comment"/>
-        <alias name="" index="3" field="moveable"/>
-        <alias name="" index="4" field="type"/>
-        <alias name="" index="5" field="name"/>
-        <alias name="" index="6" field="hidden"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="group" index="1" name=""/>
+        <alias field="comment" index="2" name=""/>
+        <alias field="moveable" index="3" name=""/>
+        <alias field="type" index="4" name=""/>
+        <alias field="name" index="5" name=""/>
+        <alias field="hidden" index="6" name=""/>
       </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 field="id" expression="" applyOnUpdate="0"/>
+        <default field="group" expression="" applyOnUpdate="0"/>
+        <default field="comment" expression="" applyOnUpdate="0"/>
+        <default field="moveable" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="name" expression="" applyOnUpdate="0"/>
+        <default field="hidden" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="id" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="group" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="comment" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="moveable" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="type" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="name" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="hidden" notnull_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="group" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="comment" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="moveable" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="hidden" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="group"/>
-        <constraint exp="" desc="" field="comment"/>
-        <constraint exp="" desc="" field="moveable"/>
-        <constraint exp="" desc="" field="type"/>
-        <constraint exp="" desc="" field="name"/>
-        <constraint exp="" desc="" 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>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;group&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;group&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <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"/>
+          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" hidden="0" name="group" width="-1"/>
+          <column type="field" hidden="0" name="name" width="-1"/>
+          <column type="field" hidden="0" name="id" width="-1"/>
+          <column type="field" hidden="0" name="comment" width="-1"/>
+          <column type="field" hidden="0" name="moveable" width="-1"/>
+          <column type="field" hidden="0" name="type" width="-1"/>
+          <column type="field" hidden="0" name="hidden" width="-1"/>
         </columns>
       </attributetableconfig>
       <editform tolerant="1"></editform>
@@ -3210,20 +3183,20 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="comment" editable="1"/>
-        <field name="group" editable="1"/>
-        <field name="id" editable="1"/>
-        <field name="moveable" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="1" name="comment"/>
+        <field editable="1" name="group"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="moveable"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field name="comment" labelOnTop="0"/>
-        <field name="group" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="moveable" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="comment"/>
+        <field labelOnTop="0" name="group"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="moveable"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <widgets/>
       <conditionalstyles>
@@ -3234,7 +3207,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" refreshOnNotifyMessage="" geometry="Line" simplifyLocal="1" simplifyDrawingHints="1" type="vector" simplifyMaxScale="1" simplifyAlgorithm="0" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshEnabled="0" autoRefreshTime="0" minScale="1e+8" readOnly="0">
+    <maplayer autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" simplifyLocal="1" autoRefreshTime="0" readOnly="0" geometry="Line" labelsEnabled="1" minScale="1e+8" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" maxScale="0" simplifyMaxScale="1" simplifyAlgorithm="0" simplifyDrawingHints="1">
       <extent>
         <xmin>2045688.58425209275446832</xmin>
         <ymin>-4021531.2146315616555512</ymin>
@@ -3291,7 +3264,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxz="0" minx="0" dimensions="2" maxx="0" crs="" maxy="0" miny="0" minz="0"/>
+          <spatial maxz="0" maxx="0" minx="0" crs="" miny="0" maxy="0" dimensions="2" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -3310,17 +3283,17 @@ def my_form_open(dialog, layer, feature):
         <map-layer-style name="default"/>
       </map-layer-style-manager>
       <auxiliaryLayer/>
-      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="1" enableorderby="0">
+      <renderer-v2 symbollevels="1" type="RuleRenderer" enableorderby="0" forceraster="0">
         <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-          <rule filter="regexp_match(&quot;type&quot;, '^cone')" key="{b3b38ee9-c245-4839-b078-3b966a2a5c4e}" symbol="0" label="Cones"/>
-          <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1'" key="{9da1c54c-0ca9-4db9-a722-ce3f53ccd358}" symbol="1" label="Moveable fences"/>
-          <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1'" key="{bb4463e8-e33a-4475-878c-fd2d7b636418}" symbol="2" label="Fixed fences"/>
-          <rule filter="regexp_match(&quot;type&quot;, '^constr')" key="{bb4463e8-e33a-4475-878c-fd2d7b636418}" symbol="3" label="Construction"/>
-          <rule filter="is_layer_visible( 'fencing' )" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" symbol="4" label="Visible" checkstate="0"/>
+          <rule label="Cones" symbol="0" filter="regexp_match(&quot;type&quot;, '^cone')" key="{b3b38ee9-c245-4839-b078-3b966a2a5c4e}"/>
+          <rule label="Moveable fences" symbol="1" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1'" key="{9da1c54c-0ca9-4db9-a722-ce3f53ccd358}"/>
+          <rule label="Fixed fences" symbol="2" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1'" key="{bb4463e8-e33a-4475-878c-fd2d7b636418}"/>
+          <rule label="Construction" symbol="3" filter="regexp_match(&quot;type&quot;, '^constr')" key="{bb4463e8-e33a-4475-878c-fd2d7b636418}"/>
+          <rule checkstate="0" label="Visible" symbol="4" filter="is_layer_visible( 'fencing' )" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}"/>
         </rules>
         <symbols>
-          <symbol name="0" type="line" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+          <symbol type="line" clip_to_extent="1" name="0" alpha="1">
+            <layer class="SimpleLine" enabled="1" pass="0" 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"/>
@@ -3338,21 +3311,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="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" type="line" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+          <symbol type="line" clip_to_extent="1" name="1" alpha="1">
+            <layer class="SimpleLine" enabled="1" pass="0" 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"/>
@@ -3370,21 +3343,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="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" type="line" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+          <symbol type="line" clip_to_extent="1" name="2" alpha="1">
+            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -3402,21 +3375,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="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" type="line" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+          <symbol type="line" clip_to_extent="1" name="3" alpha="1">
+            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -3434,21 +3407,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="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" type="line" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+          <symbol type="line" clip_to_extent="1" name="4" alpha="1">
+            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -3466,9 +3439,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 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>
@@ -3479,40 +3452,40 @@ def my_form_open(dialog, layer, feature):
         <rules key="">
           <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="">
             <settings>
-              <text-style fontWordSpacing="0" useSubstitutions="0" fontCapitals="0" isExpression="0" fontSizeUnit="Point" fontUnderline="0" previewBkgrdColor="#ffffff" fontFamily="Myriad Pro" fontSize="11" multilineHeight="1" fontItalic="0" namedStyle="Regular" fontLetterSpacing="0" fieldName="comment" textColor="0,0,0,255" textOpacity="0.8" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0" fontStrikeout="0" fontWeight="50">
-                <text-buffer bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeType="0" shapeSizeUnit="MM" shapeDraw="1" shapeJoinStyle="128" shapeOpacity="0.6" shapeSVGFile="" shapeOffsetUnit="MM" shapeSizeY="1" shapeRotation="0" shapeSizeX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeRadiiX="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="255,0,0,255" shapeOffsetY="0" shapeRadiiUnit="MM" shapeBorderWidth="0.6" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="11" fontCapitals="0" fontSizeUnit="Point" useSubstitutions="0" isExpression="0" fontItalic="0" fontStrikeout="0" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" fieldName="comment" textOpacity="0.8" textColor="0,0,0,255" fontWeight="50" fontUnderline="0" multilineHeight="1" namedStyle="Regular" fontLetterSpacing="0" fontWordSpacing="0" blendMode="0">
+                <text-buffer bufferNoFill="1" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <background shapeOffsetUnit="MM" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="128" shapeRadiiY="1" shapeType="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeSizeX="1" shapeBorderColor="255,0,0,255" shapeBorderWidth="0.6" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeDraw="1" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiUnit="MM" shapeOpacity="0.6"/>
+                <shadow shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.7" shadowOffsetAngle="135" shadowRadius="1.5" shadowBlendMode="6" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100"/>
                 <substitutions/>
               </text-style>
-              <text-format decimals="3" addDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="4294967295" wrapChar="" placeDirectionSymbol="0" plussign="0" formatNumbers="0"/>
-              <placement placementFlags="2" offsetType="0" centroidWhole="0" repeatDistanceUnits="MM" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" dist="5" yOffset="0" offsetUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="5" placement="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" xOffset="0" fitInPolygonOnly="0" centroidInside="0" maxCurvedCharAngleOut="-25" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" rotationAngle="0"/>
-              <rendering fontLimitPixelSize="0" labelPerPart="1" obstacle="1" zIndex="0" obstacleFactor="1" displayAll="1" maxNumLabels="2000" fontMaxPixelSize="10000" upsidedownLabels="0" limitNumLabels="0" scaleMin="0" minFeatureSize="0" drawLabels="1" mergeLines="1" scaleVisibility="0" obstacleType="0" scaleMax="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="4294967295" decimals="3"/>
+              <placement quadOffset="4" offsetType="0" placementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="5" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceUnits="MM" offsetUnits="MM" centroidWhole="0" maxCurvedCharAngleIn="25" centroidInside="0" xOffset="0" placement="2" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" yOffset="0" dist="5" distUnits="MM" repeatDistance="0"/>
+              <rendering displayAll="1" fontLimitPixelSize="0" fontMaxPixelSize="10000" mergeLines="1" obstacleFactor="1" labelPerPart="1" obstacle="1" scaleMin="0" limitNumLabels="0" maxNumLabels="2000" obstacleType="0" drawLabels="1" upsidedownLabels="0" fontMinPixelSize="3" minFeatureSize="0" scaleMax="0" scaleVisibility="0" zIndex="0"/>
               <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="">
             <settings>
-              <text-style fontWordSpacing="0" useSubstitutions="0" fontCapitals="0" isExpression="1" fontSizeUnit="Point" fontUnderline="0" previewBkgrdColor="#ffffff" fontFamily="Myriad Pro" fontSize="11" multilineHeight="1" fontItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fieldName="round( $length, 0) || 'm'" textColor="0,0,0,255" textOpacity="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0" fontStrikeout="0" fontWeight="63">
-                <text-buffer bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeType="0" shapeSizeUnit="MM" shapeDraw="0" shapeJoinStyle="64" shapeOpacity="1" shapeSVGFile="" shapeOffsetUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetY="0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="11" fontCapitals="0" fontSizeUnit="Point" useSubstitutions="0" isExpression="1" fontItalic="0" fontStrikeout="0" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" fieldName="round( $length, 0) || 'm'" textOpacity="1" textColor="0,0,0,255" fontWeight="63" fontUnderline="0" multilineHeight="1" namedStyle="Semibold" fontLetterSpacing="0" fontWordSpacing="0" blendMode="0">
+                <text-buffer bufferNoFill="1" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <background shapeOffsetUnit="MM" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiY="0" shapeType="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeDraw="0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiUnit="MM" shapeOpacity="1"/>
+                <shadow shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.7" shadowOffsetAngle="135" shadowRadius="1.5" shadowBlendMode="6" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100"/>
                 <substitutions/>
               </text-style>
-              <text-format decimals="3" addDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="4294967295" wrapChar="" placeDirectionSymbol="0" plussign="0" formatNumbers="0"/>
-              <placement placementFlags="14" offsetType="0" centroidWhole="0" repeatDistanceUnits="MM" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" dist="1" yOffset="0" offsetUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="5" placement="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" xOffset="0" fitInPolygonOnly="0" centroidInside="0" maxCurvedCharAngleOut="-25" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" rotationAngle="0"/>
-              <rendering fontLimitPixelSize="0" labelPerPart="0" obstacle="1" zIndex="0" obstacleFactor="1" displayAll="0" maxNumLabels="2000" fontMaxPixelSize="10000" upsidedownLabels="0" limitNumLabels="0" scaleMin="0" minFeatureSize="0" drawLabels="1" mergeLines="0" scaleVisibility="0" obstacleType="0" scaleMax="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="4294967295" decimals="3"/>
+              <placement quadOffset="4" offsetType="0" placementFlags="14" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="5" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceUnits="MM" offsetUnits="MM" centroidWhole="0" maxCurvedCharAngleIn="25" centroidInside="0" xOffset="0" placement="2" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" yOffset="0" dist="1" distUnits="MM" repeatDistance="0"/>
+              <rendering displayAll="0" fontLimitPixelSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" labelPerPart="0" obstacle="1" scaleMin="0" limitNumLabels="0" maxNumLabels="2000" obstacleType="0" drawLabels="1" upsidedownLabels="0" fontMinPixelSize="3" minFeatureSize="0" scaleMax="0" scaleVisibility="0" zIndex="0"/>
               <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>
@@ -3520,26 +3493,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 height="15" lineSizeType="MM" opacity="1" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" backgroundAlpha="255" maxScaleDenominator="1e+8" diagramOrientation="Up" width="15" scaleDependency="Area" minimumSize="0" backgroundColor="#ffffff" enabled="0" barWidth="5" penColor="#000000" minScaleDenominator="0" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penAlpha="255" penWidth="0" sizeType="MM">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" rotationOffset="270" penColor="#000000" backgroundAlpha="255" opacity="1" minScaleDenominator="0" lineSizeType="MM" diagramOrientation="Up" barWidth="5" maxScaleDenominator="1e+8" minimumSize="0" width="15" height="15" scaleBasedVisibility="0" labelPlacementMethod="XHeight" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundColor="#ffffff">
           <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" field="" label=""/>
+          <attribute label="" color="#000000" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="18" obstacle="0" zIndex="0" placement="2" showAll="1" priority="0">
+      <DiagramLayerSettings priority="0" dist="0" zIndex="0" showAll="1" linePlacementFlags="18" obstacle="0" placement="2">
         <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>
@@ -3595,56 +3568,56 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="group"/>
-        <alias name="" index="2" field="comment"/>
-        <alias name="" index="3" field="moveable"/>
-        <alias name="" index="4" field="type"/>
-        <alias name="" index="5" field="name"/>
-        <alias name="" index="6" field="hidden"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="group" index="1" name=""/>
+        <alias field="comment" index="2" name=""/>
+        <alias field="moveable" index="3" name=""/>
+        <alias field="type" index="4" name=""/>
+        <alias field="name" index="5" name=""/>
+        <alias field="hidden" index="6" name=""/>
       </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 field="id" expression="" applyOnUpdate="0"/>
+        <default field="group" expression="" applyOnUpdate="0"/>
+        <default field="comment" expression="" applyOnUpdate="0"/>
+        <default field="moveable" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="name" expression="" applyOnUpdate="0"/>
+        <default field="hidden" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="id" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="group" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="comment" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="moveable" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="type" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="name" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="hidden" notnull_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="group" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="comment" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="moveable" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="hidden" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="group"/>
-        <constraint exp="" desc="" field="comment"/>
-        <constraint exp="" desc="" field="moveable"/>
-        <constraint exp="" desc="" field="type"/>
-        <constraint exp="" desc="" field="name"/>
-        <constraint exp="" desc="" 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>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;group&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;group&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <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="566"/>
-          <column name="hidden" hidden="0" type="field" width="-1"/>
+          <column type="field" hidden="0" name="id" width="-1"/>
+          <column type="field" hidden="0" name="group" width="-1"/>
+          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" hidden="0" name="comment" width="223"/>
+          <column type="field" hidden="0" name="moveable" width="-1"/>
+          <column type="field" hidden="0" name="type" width="-1"/>
+          <column type="field" hidden="0" name="name" width="566"/>
+          <column type="field" hidden="0" name="hidden" width="-1"/>
         </columns>
       </attributetableconfig>
       <editform tolerant="1"></editform>
@@ -3671,22 +3644,22 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <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"/>
+        <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"/>
       </editable>
       <labelOnTop>
-        <field name="comment" labelOnTop="0"/>
-        <field name="group" labelOnTop="0"/>
-        <field name="hidden" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="moveable" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="comment"/>
+        <field labelOnTop="0" name="group"/>
+        <field labelOnTop="0" name="hidden"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="moveable"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <widgets/>
       <conditionalstyles>
@@ -3697,7 +3670,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="100000" refreshOnNotifyMessage="" geometry="Polygon" simplifyLocal="1" simplifyDrawingHints="1" type="vector" simplifyMaxScale="1" simplifyAlgorithm="0" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshEnabled="0" autoRefreshTime="0" minScale="1e+8" readOnly="0">
+    <maplayer autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" simplifyLocal="1" autoRefreshTime="0" readOnly="0" geometry="Polygon" labelsEnabled="1" minScale="1e+8" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" maxScale="100000" simplifyMaxScale="1" simplifyAlgorithm="0" simplifyDrawingHints="1">
       <extent>
         <xmin>2044855.29280688124708831</xmin>
         <ymin>-4021659.23377959709614515</ymin>
@@ -3756,10 +3729,10 @@ def my_form_open(dialog, layer, feature):
         <map-layer-style name="default"/>
       </map-layer-style-manager>
       <auxiliaryLayer/>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 symbollevels="0" type="singleSymbol" enableorderby="0" forceraster="0">
         <symbols>
-          <symbol name="0" type="fill" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+          <symbol type="fill" clip_to_extent="1" name="0" alpha="1">
+            <layer class="SimpleFill" enabled="1" pass="0" 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"/>
@@ -3773,9 +3746,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 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>
@@ -3785,32 +3758,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 height="15" lineSizeType="MM" opacity="1" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" backgroundAlpha="255" maxScaleDenominator="1e+8" diagramOrientation="Up" width="15" scaleDependency="Area" minimumSize="0" backgroundColor="#ffffff" enabled="0" barWidth="5" penColor="#000000" minScaleDenominator="100000" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penAlpha="255" penWidth="0" sizeType="MM">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" rotationOffset="270" penColor="#000000" backgroundAlpha="255" opacity="1" minScaleDenominator="100000" lineSizeType="MM" diagramOrientation="Up" barWidth="5" maxScaleDenominator="1e+8" minimumSize="0" width="15" height="15" scaleBasedVisibility="0" labelPlacementMethod="XHeight" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundColor="#ffffff">
           <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" field="" label=""/>
+          <attribute label="" color="#000000" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="10" obstacle="0" zIndex="0" placement="0" showAll="1" priority="0">
+      <DiagramLayerSettings priority="0" dist="0" zIndex="0" showAll="1" linePlacementFlags="10" obstacle="0" placement="0">
         <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>
@@ -3819,8 +3792,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>
@@ -3829,8 +3802,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>
@@ -3839,44 +3812,44 @@ 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 name="" index="0" field="id"/>
-        <alias name="" index="1" field="type"/>
-        <alias name="" index="2" field="page"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="type" index="1" name=""/>
+        <alias field="page" index="2" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="type"/>
-        <default expression="" applyOnUpdate="0" field="page"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="page" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="id" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="type" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="page" notnull_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="page" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="type"/>
-        <constraint exp="" desc="" field="page"/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="page" exp=""/>
       </constraintExpressions>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <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"/>
+          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" hidden="0" name="id" width="-1"/>
+          <column type="field" hidden="0" name="type" width="-1"/>
+          <column type="field" hidden="0" name="page" width="-1"/>
         </columns>
       </attributetableconfig>
       <editform tolerant="1">.</editform>
@@ -3913,7 +3886,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="100000" refreshOnNotifyMessage="" geometry="Point" simplifyLocal="1" simplifyDrawingHints="0" type="vector" simplifyMaxScale="1" simplifyAlgorithm="0" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshEnabled="0" autoRefreshTime="0" minScale="1e+8" readOnly="0">
+    <maplayer autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" simplifyLocal="1" autoRefreshTime="0" readOnly="0" geometry="Point" labelsEnabled="1" minScale="1e+8" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" maxScale="100000" simplifyMaxScale="1" simplifyAlgorithm="0" simplifyDrawingHints="0">
       <extent>
         <xmin>2045521.3311831213068217</xmin>
         <ymin>-4021544.00370020139962435</ymin>
@@ -3970,7 +3943,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxz="0" minx="0" dimensions="2" maxx="0" crs="" maxy="0" miny="0" minz="0"/>
+          <spatial maxz="0" maxx="0" minx="0" crs="" miny="0" maxy="0" dimensions="2" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -3981,7 +3954,7 @@ def my_form_open(dialog, layer, feature):
       </resourceMetadata>
       <provider encoding="UTF-8">ogr</provider>
       <vectorjoins>
-        <join cascadedDelete="0" joinLayerId="marshals_by_position20161003112326575" customPrefix="csv_" hasCustomPrefix="1" targetFieldName="position" memoryCache="1" upsertOnEdit="0" editable="0" joinFieldName="position" dynamicForm="0">
+        <join editable="0" customPrefix="csv_" hasCustomPrefix="1" dynamicForm="0" targetFieldName="position" upsertOnEdit="0" joinLayerId="marshals_by_position20161003112326575" joinFieldName="position" cascadedDelete="0" memoryCache="1">
           <joinFieldsSubset>
             <field name="position"/>
             <field name="name"/>
@@ -4007,14 +3980,14 @@ def my_form_open(dialog, layer, feature):
         <map-layer-style name="default"/>
       </map-layer-style-manager>
       <auxiliaryLayer/>
-      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 symbollevels="0" type="RuleRenderer" enableorderby="0" forceraster="0">
         <rules key="{436a5e05-3485-477a-80b7-cf4d12d6dcec}">
-          <rule description="Show in marshal overview" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" key="{308d81eb-cefa-4627-8afb-3baa8363f863}" symbol="0" label="Show in marshal overview"/>
-          <rule description="Show in marshal overview" filter="'marshal' = attribute( @atlas_feature , 'type' )" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" symbol="1" label="Show in marshal maps"/>
+          <rule label="Show in marshal overview" description="Show in marshal overview" symbol="0" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" key="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
+          <rule label="Show in marshal maps" description="Show in marshal overview" symbol="1" filter="'marshal' = attribute( @atlas_feature , 'type' )" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
         </rules>
         <symbols>
-          <symbol name="0" type="marker" alpha="0.792157" clip_to_extent="1">
-            <layer locked="0" class="SimpleMarker" pass="1" enabled="1">
+          <symbol type="marker" clip_to_extent="1" name="0" alpha="0.792157">
+            <layer class="SimpleMarker" enabled="1" pass="1" locked="0">
               <prop v="0" k="angle"/>
               <prop v="0,0,0,255" k="color"/>
               <prop v="1" k="horizontal_anchor_point"/>
@@ -4035,15 +4008,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 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" type="marker" alpha="0.0470588" clip_to_extent="1">
-            <layer locked="0" class="SimpleMarker" pass="1" enabled="1">
+          <symbol type="marker" clip_to_extent="1" name="1" alpha="0.0470588">
+            <layer class="SimpleMarker" enabled="1" pass="1" locked="0">
               <prop v="0" k="angle"/>
               <prop v="0,0,0,255" k="color"/>
               <prop v="1" k="horizontal_anchor_point"/>
@@ -4064,9 +4037,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 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>
@@ -4077,97 +4050,97 @@ def my_form_open(dialog, layer, feature):
         <rules key="">
           <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions)" filter="'marshal' = attribute( @atlas_feature , 'type' )" key="">
             <settings>
-              <text-style fontWordSpacing="0" useSubstitutions="0" fontCapitals="0" isExpression="0" fontSizeUnit="Point" fontUnderline="0" previewBkgrdColor="#ffffff" fontFamily="Myriad Pro" fontSize="6" multilineHeight="1" fontItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fieldName="position" textColor="0,0,0,255" textOpacity="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0" fontStrikeout="0" fontWeight="63">
-                <text-buffer bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="0" bufferDraw="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeType="3" shapeSizeUnit="MM" shapeDraw="1" shapeJoinStyle="64" shapeOpacity="1" shapeSVGFile="" shapeOffsetUnit="MM" shapeSizeY="0.2" shapeRotation="0" shapeSizeX="0.2" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeOffsetY="0" shapeRadiiUnit="MM" shapeBorderWidth="0.4" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="6" fontCapitals="0" fontSizeUnit="Point" useSubstitutions="0" isExpression="0" fontItalic="0" fontStrikeout="0" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" fieldName="position" textOpacity="1" textColor="0,0,0,255" fontWeight="63" fontUnderline="0" multilineHeight="1" namedStyle="Semibold" fontLetterSpacing="0" fontWordSpacing="0" blendMode="0">
+                <text-buffer bufferNoFill="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <background shapeOffsetUnit="MM" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiY="0" shapeType="3" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeSizeX="0.2" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.4" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.2" shapeDraw="1" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiUnit="MM" shapeOpacity="1"/>
+                <shadow shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.7" shadowOffsetAngle="135" shadowRadius="1.5" shadowBlendMode="6" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100"/>
                 <substitutions/>
               </text-style>
-              <text-format decimals="3" addDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="0" wrapChar="" placeDirectionSymbol="0" plussign="0" formatNumbers="0"/>
-              <placement placementFlags="10" offsetType="0" centroidWhole="0" repeatDistanceUnits="MM" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" dist="0" yOffset="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="8" placement="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" xOffset="0" fitInPolygonOnly="0" centroidInside="0" maxCurvedCharAngleOut="-20" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" rotationAngle="0"/>
-              <rendering fontLimitPixelSize="0" labelPerPart="0" obstacle="1" zIndex="0" obstacleFactor="1" displayAll="1" maxNumLabels="2000" fontMaxPixelSize="10000" upsidedownLabels="0" limitNumLabels="0" scaleMin="1" minFeatureSize="0" drawLabels="1" mergeLines="0" scaleVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" decimals="3"/>
+              <placement quadOffset="4" offsetType="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="8" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceUnits="MM" offsetUnits="MapUnit" centroidWhole="0" maxCurvedCharAngleIn="20" centroidInside="0" xOffset="0" placement="1" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" yOffset="0" dist="0" distUnits="MM" repeatDistance="0"/>
+              <rendering displayAll="1" fontLimitPixelSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" labelPerPart="0" obstacle="1" scaleMin="1" limitNumLabels="0" maxNumLabels="2000" obstacleType="0" drawLabels="1" upsidedownLabels="0" fontMinPixelSize="3" minFeatureSize="0" scaleMax="10000000" scaleVisibility="0" zIndex="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="FontOpacity" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 20))" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="FontOpacity">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 20))"/>
+                      <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="true" type="bool"/>
-                      <Option name="expression" value="if ( @atlas_featureid = $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 ( @atlas_featureid = $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 ( @atlas_featureid = $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 ( @atlas_featureid = $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 ( @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, 20, 60))" 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, 20, 60))"/>
+                      <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 ( $atlasfeatureid = $id, 10, -1 )" 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, -1 )"/>
+                      <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 description="Show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" key="">
             <settings>
-              <text-style fontWordSpacing="0" useSubstitutions="0" fontCapitals="0" isExpression="0" fontSizeUnit="Point" fontUnderline="0" previewBkgrdColor="#ffffff" fontFamily="Myriad Pro" fontSize="6" multilineHeight="1" fontItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fieldName="position" textColor="0,0,0,255" textOpacity="0.9" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0" fontStrikeout="0" fontWeight="63">
-                <text-buffer bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="0" bufferDraw="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeType="3" shapeSizeUnit="MM" shapeDraw="1" shapeJoinStyle="64" shapeOpacity="0.5" shapeSVGFile="" shapeOffsetUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeOffsetY="0" shapeRadiiUnit="MM" shapeBorderWidth="0.1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="6" fontCapitals="0" fontSizeUnit="Point" useSubstitutions="0" isExpression="0" fontItalic="0" fontStrikeout="0" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" fieldName="position" textOpacity="0.9" textColor="0,0,0,255" fontWeight="63" fontUnderline="0" multilineHeight="1" namedStyle="Semibold" fontLetterSpacing="0" fontWordSpacing="0" blendMode="0">
+                <text-buffer bufferNoFill="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <background shapeOffsetUnit="MM" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiY="0" shapeType="3" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeSizeX="0" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.1" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeDraw="1" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiUnit="MM" shapeOpacity="0.5"/>
+                <shadow shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.7" shadowOffsetAngle="135" shadowRadius="1.5" shadowBlendMode="6" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100"/>
                 <substitutions/>
               </text-style>
-              <text-format decimals="3" addDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="0" wrapChar="" placeDirectionSymbol="0" plussign="0" formatNumbers="0"/>
-              <placement placementFlags="10" offsetType="0" centroidWhole="0" repeatDistanceUnits="MM" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" dist="1" yOffset="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="10" placement="6" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" xOffset="0" fitInPolygonOnly="0" centroidInside="0" maxCurvedCharAngleOut="-20" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" rotationAngle="0"/>
-              <rendering fontLimitPixelSize="0" labelPerPart="0" obstacle="0" zIndex="2" obstacleFactor="1" displayAll="1" maxNumLabels="2000" fontMaxPixelSize="10000" upsidedownLabels="0" limitNumLabels="0" scaleMin="1" minFeatureSize="0" drawLabels="1" mergeLines="0" scaleVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" decimals="3"/>
+              <placement quadOffset="4" offsetType="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="10" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceUnits="MM" offsetUnits="MapUnit" centroidWhole="0" maxCurvedCharAngleIn="20" centroidInside="0" xOffset="0" placement="6" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" yOffset="0" dist="1" distUnits="MM" repeatDistance="0"/>
+              <rendering displayAll="1" fontLimitPixelSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" labelPerPart="0" obstacle="0" scaleMin="1" limitNumLabels="0" maxNumLabels="2000" obstacleType="0" drawLabels="1" upsidedownLabels="0" fontMinPixelSize="3" minFeatureSize="0" scaleMax="10000000" scaleVisibility="0" zIndex="2"/>
               <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 ( @atlas_featureid = $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 ( @atlas_featureid = $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 ( @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="false"/>
+                      <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="Size" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="expression" value="if ( @atlas_featureid = $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 ( @atlas_featureid = $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>
@@ -4184,160 +4157,160 @@ def my_form_open(dialog, layer, feature):
           <value>COALESCE( "id", '&lt;NULL>' )</value>
           <value>COALESCE( "id", '&lt;NULL>' )</value>
         </property>
-        <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 height="15" lineSizeType="MM" opacity="1" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" backgroundAlpha="255" maxScaleDenominator="1e+8" diagramOrientation="Up" width="15" scaleDependency="Area" minimumSize="0" backgroundColor="#ffffff" enabled="0" barWidth="5" penColor="#000000" minScaleDenominator="100000" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penAlpha="255" penWidth="0" sizeType="MM">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" rotationOffset="270" penColor="#000000" backgroundAlpha="255" opacity="1" minScaleDenominator="100000" lineSizeType="MM" diagramOrientation="Up" barWidth="5" maxScaleDenominator="1e+8" minimumSize="0" width="15" height="15" scaleBasedVisibility="0" labelPlacementMethod="XHeight" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundColor="#ffffff">
           <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" field="" label=""/>
+          <attribute label="" color="#000000" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="2" obstacle="0" zIndex="0" placement="0" showAll="1" priority="0">
+      <DiagramLayerSettings priority="0" dist="0" zIndex="0" showAll="1" linePlacementFlags="2" obstacle="0" placement="0">
         <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>
@@ -4346,8 +4319,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>
@@ -4356,8 +4329,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>
@@ -4366,8 +4339,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>
@@ -4376,8 +4349,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>
@@ -4386,8 +4359,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>
@@ -4396,8 +4369,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>
@@ -4406,8 +4379,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>
@@ -4416,8 +4389,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>
@@ -4426,8 +4399,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>
@@ -4436,8 +4409,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>
@@ -4446,8 +4419,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>
@@ -4456,8 +4429,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>
@@ -4466,8 +4439,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>
@@ -4476,8 +4449,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>
@@ -4486,8 +4459,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>
@@ -4496,8 +4469,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>
@@ -4506,8 +4479,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>
@@ -4516,8 +4489,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>
@@ -4526,124 +4499,124 @@ 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 name="" index="0" field="id"/>
-        <alias name="" index="1" field="position"/>
-        <alias name="" index="2" field="type"/>
-        <alias name="" index="3" field="notes"/>
-        <alias name="" index="4" field="oldpositio"/>
-        <alias name="" index="5" field="xyposition"/>
-        <alias name="" index="6" field="csv_position"/>
-        <alias name="" index="7" field="csv_name"/>
-        <alias name="" index="8" field="csv_club"/>
-        <alias name="" index="9" field="csv_phone"/>
-        <alias name="" index="10" field="csv_email"/>
-        <alias name="" index="11" field="csv_captain"/>
-        <alias name="" index="12" field="csv_captain_number"/>
-        <alias name="" index="13" field="csv_races"/>
-        <alias name="" index="14" field="csv_first_runner"/>
-        <alias name="" index="15" field="csv_last_runner"/>
-        <alias name="" index="16" field="csv_21_distance"/>
-        <alias name="" index="17" field="csv_10_distance"/>
-        <alias name="" index="18" field="csv_instructions"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="position" index="1" name=""/>
+        <alias field="type" index="2" name=""/>
+        <alias field="notes" index="3" name=""/>
+        <alias field="oldpositio" index="4" name=""/>
+        <alias field="xyposition" index="5" name=""/>
+        <alias field="csv_position" index="6" name=""/>
+        <alias field="csv_name" index="7" name=""/>
+        <alias field="csv_club" index="8" name=""/>
+        <alias field="csv_phone" index="9" name=""/>
+        <alias field="csv_email" index="10" name=""/>
+        <alias field="csv_captain" index="11" name=""/>
+        <alias field="csv_captain_number" index="12" name=""/>
+        <alias field="csv_races" index="13" name=""/>
+        <alias field="csv_first_runner" index="14" name=""/>
+        <alias field="csv_last_runner" index="15" name=""/>
+        <alias field="csv_21_distance" index="16" name=""/>
+        <alias field="csv_10_distance" index="17" name=""/>
+        <alias field="csv_instructions" index="18" name=""/>
       </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_position"/>
-        <default expression="" applyOnUpdate="0" field="csv_name"/>
-        <default expression="" applyOnUpdate="0" field="csv_club"/>
-        <default expression="" applyOnUpdate="0" field="csv_phone"/>
-        <default expression="" applyOnUpdate="0" field="csv_email"/>
-        <default expression="" applyOnUpdate="0" field="csv_captain"/>
-        <default expression="" applyOnUpdate="0" field="csv_captain_number"/>
-        <default expression="" applyOnUpdate="0" field="csv_races"/>
-        <default expression="" applyOnUpdate="0" field="csv_first_runner"/>
-        <default expression="" applyOnUpdate="0" field="csv_last_runner"/>
-        <default expression="" applyOnUpdate="0" field="csv_21_distance"/>
-        <default expression="" applyOnUpdate="0" field="csv_10_distance"/>
-        <default expression="" applyOnUpdate="0" field="csv_instructions"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="position" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="notes" expression="" applyOnUpdate="0"/>
+        <default field="oldpositio" expression="" applyOnUpdate="0"/>
+        <default field="xyposition" expression="" applyOnUpdate="0"/>
+        <default field="csv_position" expression="" applyOnUpdate="0"/>
+        <default field="csv_name" expression="" applyOnUpdate="0"/>
+        <default field="csv_club" expression="" applyOnUpdate="0"/>
+        <default field="csv_phone" expression="" applyOnUpdate="0"/>
+        <default field="csv_email" expression="" applyOnUpdate="0"/>
+        <default field="csv_captain" expression="" applyOnUpdate="0"/>
+        <default field="csv_captain_number" expression="" applyOnUpdate="0"/>
+        <default field="csv_races" expression="" applyOnUpdate="0"/>
+        <default field="csv_first_runner" expression="" applyOnUpdate="0"/>
+        <default field="csv_last_runner" expression="" applyOnUpdate="0"/>
+        <default field="csv_21_distance" expression="" applyOnUpdate="0"/>
+        <default field="csv_10_distance" expression="" applyOnUpdate="0"/>
+        <default field="csv_instructions" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="id" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="position" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="type" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="notes" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="oldpositio" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="xyposition" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="csv_position" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="csv_name" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="csv_club" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="csv_phone" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="csv_email" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="csv_captain" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="csv_captain_number" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="csv_races" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="csv_first_runner" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="csv_last_runner" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="csv_21_distance" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="csv_10_distance" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="csv_instructions" notnull_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="position" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="notes" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="oldpositio" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="xyposition" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="csv_position" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="csv_name" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="csv_club" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="csv_phone" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="csv_email" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="csv_captain" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="csv_captain_number" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="csv_races" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="csv_first_runner" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="csv_last_runner" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="csv_21_distance" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="csv_10_distance" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="csv_instructions" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="position"/>
-        <constraint exp="" desc="" field="type"/>
-        <constraint exp="" desc="" field="notes"/>
-        <constraint exp="" desc="" field="oldpositio"/>
-        <constraint exp="" desc="" field="xyposition"/>
-        <constraint exp="" desc="" field="csv_position"/>
-        <constraint exp="" desc="" field="csv_name"/>
-        <constraint exp="" desc="" field="csv_club"/>
-        <constraint exp="" desc="" field="csv_phone"/>
-        <constraint exp="" desc="" field="csv_email"/>
-        <constraint exp="" desc="" field="csv_captain"/>
-        <constraint exp="" desc="" field="csv_captain_number"/>
-        <constraint exp="" desc="" field="csv_races"/>
-        <constraint exp="" desc="" field="csv_first_runner"/>
-        <constraint exp="" desc="" field="csv_last_runner"/>
-        <constraint exp="" desc="" field="csv_21_distance"/>
-        <constraint exp="" desc="" field="csv_10_distance"/>
-        <constraint exp="" desc="" field="csv_instructions"/>
+        <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_position" exp=""/>
+        <constraint desc="" field="csv_name" exp=""/>
+        <constraint desc="" field="csv_club" exp=""/>
+        <constraint desc="" field="csv_phone" exp=""/>
+        <constraint desc="" field="csv_email" exp=""/>
+        <constraint desc="" field="csv_captain" exp=""/>
+        <constraint desc="" field="csv_captain_number" exp=""/>
+        <constraint desc="" field="csv_races" exp=""/>
+        <constraint desc="" field="csv_first_runner" exp=""/>
+        <constraint desc="" field="csv_last_runner" exp=""/>
+        <constraint desc="" field="csv_21_distance" exp=""/>
+        <constraint desc="" field="csv_10_distance" exp=""/>
+        <constraint desc="" field="csv_instructions" exp=""/>
       </constraintExpressions>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;position&quot;" actionWidgetStyle="dropDown" sortOrder="1">
+      <attributetableconfig sortExpression="&quot;position&quot;" sortOrder="1" actionWidgetStyle="dropDown">
         <columns>
-          <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_position" 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_phone" hidden="0" type="field" width="-1"/>
-          <column name="csv_email" hidden="0" type="field" width="-1"/>
-          <column name="csv_captain" hidden="0" type="field" width="-1"/>
-          <column name="csv_captain_number" hidden="0" type="field" width="-1"/>
-          <column name="csv_first_runner" hidden="0" type="field" width="-1"/>
-          <column name="csv_last_runner" hidden="0" type="field" width="-1"/>
-          <column name="csv_races" hidden="0" type="field" width="-1"/>
-          <column name="csv_21_distance" hidden="0" type="field" width="-1"/>
-          <column name="csv_10_distance" hidden="0" type="field" width="-1"/>
-          <column name="csv_instructions" hidden="0" type="field" width="-1"/>
+          <column type="field" hidden="0" name="id" width="-1"/>
+          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" hidden="0" name="position" width="-1"/>
+          <column type="field" hidden="0" name="type" width="-1"/>
+          <column type="field" hidden="0" name="notes" width="-1"/>
+          <column type="field" hidden="0" name="oldpositio" width="-1"/>
+          <column type="field" hidden="0" name="xyposition" width="-1"/>
+          <column type="field" hidden="0" name="csv_position" width="-1"/>
+          <column type="field" hidden="0" name="csv_name" width="-1"/>
+          <column type="field" hidden="0" name="csv_club" width="-1"/>
+          <column type="field" hidden="0" name="csv_phone" width="-1"/>
+          <column type="field" hidden="0" name="csv_email" width="-1"/>
+          <column type="field" hidden="0" name="csv_captain" width="-1"/>
+          <column type="field" hidden="0" name="csv_captain_number" width="-1"/>
+          <column type="field" hidden="0" name="csv_first_runner" width="-1"/>
+          <column type="field" hidden="0" name="csv_last_runner" width="-1"/>
+          <column type="field" hidden="0" name="csv_races" width="-1"/>
+          <column type="field" hidden="0" name="csv_21_distance" width="-1"/>
+          <column type="field" hidden="0" name="csv_10_distance" width="-1"/>
+          <column type="field" hidden="0" name="csv_instructions" width="-1"/>
         </columns>
       </attributetableconfig>
       <editform tolerant="1">.</editform>
@@ -4670,46 +4643,46 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="csv_10_distance" editable="0"/>
-        <field name="csv_21_distance" editable="0"/>
-        <field name="csv_captain" editable="0"/>
-        <field name="csv_captain_number" editable="0"/>
-        <field name="csv_club" editable="0"/>
-        <field name="csv_email" 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_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"/>
+        <field editable="0" name="csv_10_distance"/>
+        <field editable="0" name="csv_21_distance"/>
+        <field editable="0" name="csv_captain"/>
+        <field editable="0" name="csv_captain_number"/>
+        <field editable="0" name="csv_club"/>
+        <field editable="0" name="csv_email"/>
+        <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_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"/>
       </editable>
       <labelOnTop>
-        <field name="csv_10_distance" labelOnTop="0"/>
-        <field name="csv_21_distance" labelOnTop="0"/>
-        <field name="csv_captain" labelOnTop="0"/>
-        <field name="csv_captain_number" labelOnTop="0"/>
-        <field name="csv_club" labelOnTop="0"/>
-        <field name="csv_email" labelOnTop="0"/>
-        <field name="csv_first_runner" labelOnTop="0"/>
-        <field name="csv_instructions" labelOnTop="0"/>
-        <field name="csv_last_runner" labelOnTop="0"/>
-        <field name="csv_name" labelOnTop="0"/>
-        <field name="csv_phone" labelOnTop="0"/>
-        <field name="csv_position" labelOnTop="0"/>
-        <field name="csv_races" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="notes" labelOnTop="0"/>
-        <field name="oldpositio" labelOnTop="0"/>
-        <field name="position" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
-        <field name="xyposition" labelOnTop="0"/>
+        <field labelOnTop="0" name="csv_10_distance"/>
+        <field labelOnTop="0" name="csv_21_distance"/>
+        <field labelOnTop="0" name="csv_captain"/>
+        <field labelOnTop="0" name="csv_captain_number"/>
+        <field labelOnTop="0" name="csv_club"/>
+        <field labelOnTop="0" name="csv_email"/>
+        <field labelOnTop="0" name="csv_first_runner"/>
+        <field labelOnTop="0" name="csv_instructions"/>
+        <field labelOnTop="0" name="csv_last_runner"/>
+        <field labelOnTop="0" name="csv_name"/>
+        <field labelOnTop="0" name="csv_phone"/>
+        <field labelOnTop="0" name="csv_position"/>
+        <field labelOnTop="0" name="csv_races"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="notes"/>
+        <field labelOnTop="0" name="oldpositio"/>
+        <field labelOnTop="0" name="position"/>
+        <field labelOnTop="0" name="type"/>
+        <field labelOnTop="0" name="xyposition"/>
       </labelOnTop>
       <widgets>
         <widget name="csv_captain_ph">
@@ -4763,7 +4736,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer maxScale="100000" refreshOnNotifyMessage="" geometry="No geometry" type="vector" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" autoRefreshTime="0" minScale="1e+8" readOnly="0">
+    <maplayer autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" autoRefreshTime="0" readOnly="0" geometry="No geometry" minScale="1e+8" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" maxScale="100000">
       <id>marshals_by_position20161003112326575</id>
       <datasource>file:./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes</datasource>
       <keywordList>
@@ -4814,7 +4787,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxz="0" minx="0" dimensions="2" maxx="0" crs="" maxy="0" miny="0" minz="0"/>
+          <spatial maxz="0" maxx="0" minx="0" crs="" miny="0" maxy="0" dimensions="2" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -4824,8 +4797,8 @@ def my_form_open(dialog, layer, feature):
         </extent>
       </resourceMetadata>
       <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>
@@ -4833,8 +4806,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/>
@@ -4847,8 +4820,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>
@@ -4857,8 +4830,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>
@@ -4867,8 +4840,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>
@@ -4877,8 +4850,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>
@@ -4887,8 +4860,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>
@@ -4897,8 +4870,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>
@@ -4907,8 +4880,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>
@@ -4917,8 +4890,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>
@@ -4927,8 +4900,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>
@@ -4937,8 +4910,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>
@@ -4947,8 +4920,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>
@@ -4957,8 +4930,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>
@@ -4967,8 +4940,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>
@@ -4977,8 +4950,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>
@@ -4987,8 +4960,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>
@@ -4997,8 +4970,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>
@@ -5007,114 +4980,114 @@ 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 name="" index="0" field="position"/>
-        <alias name="" index="1" field="first_name"/>
-        <alias name="" index="2" field="last_name"/>
-        <alias name="" index="3" field="name"/>
-        <alias name="" index="4" field="club"/>
-        <alias name="" index="5" field="phone"/>
-        <alias name="" index="6" field="email"/>
-        <alias name="" index="7" field="captain"/>
-        <alias name="" index="8" field="captain_number"/>
-        <alias name="" index="9" field="tshirt"/>
-        <alias name="" index="10" field="races"/>
-        <alias name="" index="11" field="first_runner"/>
-        <alias name="" index="12" field="last_runner"/>
-        <alias name="" index="13" field="21_distance"/>
-        <alias name="" index="14" field="10_distance"/>
-        <alias name="" index="15" field="5_distance"/>
-        <alias name="" index="16" field="instructions"/>
+        <alias field="position" index="0" name=""/>
+        <alias field="first_name" index="1" name=""/>
+        <alias field="last_name" index="2" name=""/>
+        <alias field="name" index="3" name=""/>
+        <alias field="club" index="4" name=""/>
+        <alias field="phone" index="5" name=""/>
+        <alias field="email" index="6" name=""/>
+        <alias field="captain" index="7" name=""/>
+        <alias field="captain_number" index="8" name=""/>
+        <alias field="tshirt" index="9" name=""/>
+        <alias field="races" index="10" name=""/>
+        <alias field="first_runner" index="11" name=""/>
+        <alias field="last_runner" index="12" name=""/>
+        <alias field="21_distance" index="13" name=""/>
+        <alias field="10_distance" index="14" name=""/>
+        <alias field="5_distance" index="15" name=""/>
+        <alias field="instructions" index="16" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="position"/>
-        <default expression="" applyOnUpdate="0" field="first_name"/>
-        <default expression="" applyOnUpdate="0" field="last_name"/>
-        <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_number"/>
-        <default expression="" applyOnUpdate="0" field="tshirt"/>
-        <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="21_distance"/>
-        <default expression="" applyOnUpdate="0" field="10_distance"/>
-        <default expression="" applyOnUpdate="0" field="5_distance"/>
-        <default expression="" applyOnUpdate="0" field="instructions"/>
+        <default field="position" expression="" applyOnUpdate="0"/>
+        <default field="first_name" expression="" applyOnUpdate="0"/>
+        <default field="last_name" expression="" applyOnUpdate="0"/>
+        <default field="name" expression="" applyOnUpdate="0"/>
+        <default field="club" expression="" applyOnUpdate="0"/>
+        <default field="phone" expression="" applyOnUpdate="0"/>
+        <default field="email" expression="" applyOnUpdate="0"/>
+        <default field="captain" expression="" applyOnUpdate="0"/>
+        <default field="captain_number" expression="" applyOnUpdate="0"/>
+        <default field="tshirt" expression="" applyOnUpdate="0"/>
+        <default field="races" expression="" applyOnUpdate="0"/>
+        <default field="first_runner" expression="" applyOnUpdate="0"/>
+        <default field="last_runner" expression="" applyOnUpdate="0"/>
+        <default field="21_distance" expression="" applyOnUpdate="0"/>
+        <default field="10_distance" expression="" applyOnUpdate="0"/>
+        <default field="5_distance" expression="" applyOnUpdate="0"/>
+        <default field="instructions" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="position" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="first_name" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="last_name" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="name" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="club" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="phone" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="email" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="captain" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="captain_number" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="tshirt" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="races" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="first_runner" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="last_runner" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="21_distance" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="10_distance" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="5_distance" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="instructions" notnull_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="position" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="first_name" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="last_name" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="club" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="phone" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="email" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="captain" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="captain_number" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="tshirt" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="races" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="first_runner" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="last_runner" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="21_distance" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="10_distance" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="5_distance" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="instructions" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="position"/>
-        <constraint exp="" desc="" field="first_name"/>
-        <constraint exp="" desc="" field="last_name"/>
-        <constraint exp="" desc="" field="name"/>
-        <constraint exp="" desc="" field="club"/>
-        <constraint exp="" desc="" field="phone"/>
-        <constraint exp="" desc="" field="email"/>
-        <constraint exp="" desc="" field="captain"/>
-        <constraint exp="" desc="" field="captain_number"/>
-        <constraint exp="" desc="" field="tshirt"/>
-        <constraint exp="" desc="" field="races"/>
-        <constraint exp="" desc="" field="first_runner"/>
-        <constraint exp="" desc="" field="last_runner"/>
-        <constraint exp="" desc="" field="21_distance"/>
-        <constraint exp="" desc="" field="10_distance"/>
-        <constraint exp="" desc="" field="5_distance"/>
-        <constraint exp="" desc="" field="instructions"/>
+        <constraint desc="" field="position" exp=""/>
+        <constraint desc="" field="first_name" exp=""/>
+        <constraint desc="" field="last_name" 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_number" exp=""/>
+        <constraint desc="" field="tshirt" exp=""/>
+        <constraint desc="" field="races" exp=""/>
+        <constraint desc="" field="first_runner" exp=""/>
+        <constraint desc="" field="last_runner" exp=""/>
+        <constraint desc="" field="21_distance" exp=""/>
+        <constraint desc="" field="10_distance" exp=""/>
+        <constraint desc="" field="5_distance" exp=""/>
+        <constraint desc="" field="instructions" exp=""/>
       </constraintExpressions>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <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="tshirt" 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_name" hidden="0" type="field" width="-1"/>
-          <column name="last_name" hidden="0" type="field" width="-1"/>
-          <column name="captain_number" hidden="0" type="field" width="-1"/>
-          <column name="first_runner" hidden="0" type="field" width="-1"/>
-          <column name="last_runner" hidden="0" type="field" width="-1"/>
-          <column name="21_distance" hidden="0" type="field" width="-1"/>
-          <column name="10_distance" hidden="0" type="field" width="-1"/>
-          <column name="5_distance" hidden="0" type="field" width="-1"/>
-          <column name="instructions" hidden="0" type="field" width="-1"/>
+          <column type="field" hidden="0" name="position" width="-1"/>
+          <column type="field" hidden="0" name="name" width="-1"/>
+          <column type="field" hidden="0" name="club" width="-1"/>
+          <column type="field" hidden="0" name="phone" width="-1"/>
+          <column type="field" hidden="0" name="email" width="-1"/>
+          <column type="field" hidden="0" name="captain" width="-1"/>
+          <column type="field" hidden="0" name="tshirt" width="-1"/>
+          <column type="field" hidden="0" name="races" width="-1"/>
+          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" hidden="0" name="first_name" width="-1"/>
+          <column type="field" hidden="0" name="last_name" width="-1"/>
+          <column type="field" hidden="0" name="captain_number" width="-1"/>
+          <column type="field" hidden="0" name="first_runner" width="-1"/>
+          <column type="field" hidden="0" name="last_runner" width="-1"/>
+          <column type="field" hidden="0" name="21_distance" width="-1"/>
+          <column type="field" hidden="0" name="10_distance" width="-1"/>
+          <column type="field" hidden="0" name="5_distance" width="-1"/>
+          <column type="field" hidden="0" name="instructions" width="-1"/>
         </columns>
       </attributetableconfig>
       <editform tolerant="1">.</editform>
@@ -5141,42 +5114,42 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="10_distance" editable="1"/>
-        <field name="21_distance" editable="1"/>
-        <field name="5_distance" editable="1"/>
-        <field name="captain" editable="1"/>
-        <field name="captain_number" editable="1"/>
-        <field name="club" editable="1"/>
-        <field name="email" editable="1"/>
-        <field name="first_name" editable="1"/>
-        <field name="first_runner" editable="1"/>
-        <field name="instructions" editable="1"/>
-        <field name="last_name" editable="1"/>
-        <field name="last_runner" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="phone" editable="1"/>
-        <field name="position" editable="1"/>
-        <field name="races" editable="1"/>
-        <field name="tshirt" editable="1"/>
+        <field editable="1" name="10_distance"/>
+        <field editable="1" name="21_distance"/>
+        <field editable="1" name="5_distance"/>
+        <field editable="1" name="captain"/>
+        <field editable="1" name="captain_number"/>
+        <field editable="1" name="club"/>
+        <field editable="1" name="email"/>
+        <field editable="1" name="first_name"/>
+        <field editable="1" name="first_runner"/>
+        <field editable="1" name="instructions"/>
+        <field editable="1" name="last_name"/>
+        <field editable="1" name="last_runner"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="phone"/>
+        <field editable="1" name="position"/>
+        <field editable="1" name="races"/>
+        <field editable="1" name="tshirt"/>
       </editable>
       <labelOnTop>
-        <field name="10_distance" labelOnTop="0"/>
-        <field name="21_distance" labelOnTop="0"/>
-        <field name="5_distance" labelOnTop="0"/>
-        <field name="captain" labelOnTop="0"/>
-        <field name="captain_number" labelOnTop="0"/>
-        <field name="club" labelOnTop="0"/>
-        <field name="email" labelOnTop="0"/>
-        <field name="first_name" labelOnTop="0"/>
-        <field name="first_runner" labelOnTop="0"/>
-        <field name="instructions" labelOnTop="0"/>
-        <field name="last_name" labelOnTop="0"/>
-        <field name="last_runner" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="phone" labelOnTop="0"/>
-        <field name="position" labelOnTop="0"/>
-        <field name="races" labelOnTop="0"/>
-        <field name="tshirt" labelOnTop="0"/>
+        <field labelOnTop="0" name="10_distance"/>
+        <field labelOnTop="0" name="21_distance"/>
+        <field labelOnTop="0" name="5_distance"/>
+        <field labelOnTop="0" name="captain"/>
+        <field labelOnTop="0" name="captain_number"/>
+        <field labelOnTop="0" name="club"/>
+        <field labelOnTop="0" name="email"/>
+        <field labelOnTop="0" name="first_name"/>
+        <field labelOnTop="0" name="first_runner"/>
+        <field labelOnTop="0" name="instructions"/>
+        <field labelOnTop="0" name="last_name"/>
+        <field labelOnTop="0" name="last_runner"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="phone"/>
+        <field labelOnTop="0" name="position"/>
+        <field labelOnTop="0" name="races"/>
+        <field labelOnTop="0" name="tshirt"/>
       </labelOnTop>
       <widgets/>
       <conditionalstyles>
@@ -5187,7 +5160,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>first_name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="100000" refreshOnNotifyMessage="" geometry="Point" simplifyLocal="1" simplifyDrawingHints="0" type="vector" simplifyMaxScale="1" simplifyAlgorithm="0" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshEnabled="0" autoRefreshTime="0" minScale="1e+8" readOnly="0">
+    <maplayer autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" simplifyLocal="1" autoRefreshTime="0" readOnly="0" geometry="Point" labelsEnabled="1" minScale="1e+8" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" maxScale="100000" simplifyMaxScale="1" simplifyAlgorithm="0" simplifyDrawingHints="0">
       <extent>
         <xmin>2045937.50281219300813973</xmin>
         <ymin>-4020077.48741823574528098</ymin>
@@ -5244,7 +5217,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxz="0" minx="0" dimensions="2" maxx="0" crs="" maxy="0" miny="0" minz="0"/>
+          <spatial maxz="0" maxx="0" minx="0" crs="" miny="0" maxy="0" dimensions="2" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -5266,66 +5239,66 @@ def my_form_open(dialog, layer, feature):
       <renderer-v2 type="nullSymbol"/>
       <labeling type="simple">
         <settings>
-          <text-style fontWordSpacing="0" useSubstitutions="0" fontCapitals="0" isExpression="0" fontSizeUnit="Point" fontUnderline="0" previewBkgrdColor="#ffffff" fontFamily="Myriad Pro" fontSize="8.5" multilineHeight="1" fontItalic="0" namedStyle="Regular" fontLetterSpacing="0" fieldName="name" textColor="0,0,0,255" textOpacity="0.75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0" fontStrikeout="0" fontWeight="50">
-            <text-buffer bufferSizeUnits="MM" bufferOpacity="0.6" bufferNoFill="0" bufferDraw="1" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1.5" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <background shapeType="0" shapeSizeUnit="MM" shapeDraw="0" shapeJoinStyle="64" shapeOpacity="1" shapeSVGFile="" shapeOffsetUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetY="0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="8.5" fontCapitals="0" fontSizeUnit="Point" useSubstitutions="0" isExpression="0" fontItalic="0" fontStrikeout="0" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" fieldName="name" textOpacity="0.75" textColor="0,0,0,255" fontWeight="50" fontUnderline="0" multilineHeight="1" namedStyle="Regular" fontLetterSpacing="0" fontWordSpacing="0" blendMode="0">
+            <text-buffer bufferNoFill="0" bufferSize="1.5" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="1" bufferColor="255,255,255,255" bufferOpacity="0.6"/>
+            <background shapeOffsetUnit="MM" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiY="0" shapeType="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeDraw="0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiUnit="MM" shapeOpacity="1"/>
+            <shadow shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.7" shadowOffsetAngle="135" shadowRadius="1.5" shadowBlendMode="6" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100"/>
             <substitutions/>
           </text-style>
-          <text-format decimals="3" addDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="0" wrapChar="" placeDirectionSymbol="0" plussign="0" formatNumbers="0"/>
-          <placement placementFlags="2" offsetType="0" centroidWhole="0" repeatDistanceUnits="MM" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" dist="0" yOffset="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="5" placement="6" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" xOffset="0" fitInPolygonOnly="0" centroidInside="0" maxCurvedCharAngleOut="-20" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" rotationAngle="0"/>
-          <rendering fontLimitPixelSize="0" labelPerPart="0" obstacle="1" zIndex="0" obstacleFactor="0.4" displayAll="0" maxNumLabels="2000" fontMaxPixelSize="10000" upsidedownLabels="0" limitNumLabels="0" scaleMin="1" minFeatureSize="0" drawLabels="1" mergeLines="0" scaleVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3"/>
+          <text-format placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" decimals="3"/>
+          <placement quadOffset="4" offsetType="0" placementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="5" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceUnits="MM" offsetUnits="MapUnit" centroidWhole="0" maxCurvedCharAngleIn="20" centroidInside="0" xOffset="0" placement="6" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" yOffset="0" dist="0" distUnits="MM" repeatDistance="0"/>
+          <rendering displayAll="0" fontLimitPixelSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="0.4" labelPerPart="0" obstacle="1" scaleMin="1" limitNumLabels="0" maxNumLabels="2000" obstacleType="0" drawLabels="1" upsidedownLabels="0" fontMinPixelSize="3" minFeatureSize="0" scaleMax="10000000" scaleVisibility="0" zIndex="0"/>
           <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 height="15" lineSizeType="MM" opacity="1" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" backgroundAlpha="255" maxScaleDenominator="1e+8" diagramOrientation="Up" width="15" scaleDependency="Area" minimumSize="0" backgroundColor="#ffffff" enabled="0" barWidth="5" penColor="#000000" minScaleDenominator="100000" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penAlpha="255" penWidth="0" sizeType="MM">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" rotationOffset="270" penColor="#000000" backgroundAlpha="255" opacity="1" minScaleDenominator="100000" lineSizeType="MM" diagramOrientation="Up" barWidth="5" maxScaleDenominator="1e+8" minimumSize="0" width="15" height="15" scaleBasedVisibility="0" labelPlacementMethod="XHeight" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundColor="#ffffff">
           <fontProperties description="Arial,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" field="" label=""/>
+          <attribute label="" color="#000000" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="2" obstacle="0" zIndex="0" placement="0" showAll="1" priority="0">
+      <DiagramLayerSettings priority="0" dist="0" zIndex="0" showAll="1" linePlacementFlags="2" obstacle="0" placement="0">
         <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>
@@ -5334,8 +5307,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>
@@ -5344,8 +5317,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>
@@ -5354,8 +5327,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>
@@ -5364,8 +5337,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>
@@ -5374,8 +5347,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>
@@ -5384,8 +5357,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>
@@ -5394,8 +5367,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>
@@ -5404,8 +5377,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>
@@ -5414,74 +5387,74 @@ 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 name="" index="0" field="id"/>
-        <alias name="" index="1" field="osm_id"/>
-        <alias name="" index="2" field="name"/>
-        <alias name="" index="3" field="type"/>
-        <alias name="" index="4" field="z_order"/>
-        <alias name="" index="5" field="population"/>
-        <alias name="" index="6" field="label_x"/>
-        <alias name="" index="7" field="label_y"/>
-        <alias name="" index="8" field="label_rota"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="osm_id" index="1" name=""/>
+        <alias field="name" index="2" name=""/>
+        <alias field="type" index="3" name=""/>
+        <alias field="z_order" index="4" name=""/>
+        <alias field="population" index="5" name=""/>
+        <alias field="label_x" index="6" name=""/>
+        <alias field="label_y" index="7" name=""/>
+        <alias field="label_rota" index="8" name=""/>
       </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 field="id" expression="" applyOnUpdate="0"/>
+        <default field="osm_id" expression="" applyOnUpdate="0"/>
+        <default field="name" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="z_order" expression="" applyOnUpdate="0"/>
+        <default field="population" expression="" applyOnUpdate="0"/>
+        <default field="label_x" expression="" applyOnUpdate="0"/>
+        <default field="label_y" expression="" applyOnUpdate="0"/>
+        <default field="label_rota" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="id" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="osm_id" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="name" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="type" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="z_order" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="population" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="label_x" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="label_y" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="label_rota" notnull_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="osm_id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="z_order" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="population" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="label_x" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="label_y" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="label_rota" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="osm_id"/>
-        <constraint exp="" desc="" field="name"/>
-        <constraint exp="" desc="" field="type"/>
-        <constraint exp="" desc="" field="z_order"/>
-        <constraint exp="" desc="" field="population"/>
-        <constraint exp="" desc="" field="label_x"/>
-        <constraint exp="" desc="" field="label_y"/>
-        <constraint exp="" desc="" 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>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <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"/>
+          <column type="field" hidden="0" name="id" width="-1"/>
+          <column type="field" hidden="0" name="osm_id" width="-1"/>
+          <column type="field" hidden="0" name="name" width="-1"/>
+          <column type="field" hidden="0" name="type" width="-1"/>
+          <column type="field" hidden="0" name="z_order" width="-1"/>
+          <column type="field" hidden="0" name="population" width="-1"/>
+          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" hidden="0" name="label_x" width="-1"/>
+          <column type="field" hidden="0" name="label_y" width="-1"/>
+          <column type="field" hidden="0" name="label_rota" width="-1"/>
         </columns>
       </attributetableconfig>
       <editform tolerant="1">.</editform>
@@ -5508,26 +5481,26 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="label_rota" editable="1"/>
-        <field name="label_x" editable="1"/>
-        <field name="label_y" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="osm_id" editable="1"/>
-        <field name="population" editable="1"/>
-        <field name="type" editable="1"/>
-        <field name="z_order" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="label_rota"/>
+        <field editable="1" name="label_x"/>
+        <field editable="1" name="label_y"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="osm_id"/>
+        <field editable="1" name="population"/>
+        <field editable="1" name="type"/>
+        <field editable="1" name="z_order"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="label_rota" labelOnTop="0"/>
-        <field name="label_x" labelOnTop="0"/>
-        <field name="label_y" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="osm_id" labelOnTop="0"/>
-        <field name="population" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
-        <field name="z_order" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="label_rota"/>
+        <field labelOnTop="0" name="label_x"/>
+        <field labelOnTop="0" name="label_y"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="osm_id"/>
+        <field labelOnTop="0" name="population"/>
+        <field labelOnTop="0" name="type"/>
+        <field labelOnTop="0" name="z_order"/>
       </labelOnTop>
       <widgets/>
       <conditionalstyles>
@@ -5538,7 +5511,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="100000" refreshOnNotifyMessage="" geometry="Line" simplifyLocal="1" simplifyDrawingHints="0" type="vector" simplifyMaxScale="1" simplifyAlgorithm="0" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshEnabled="0" autoRefreshTime="0" minScale="1e+8" readOnly="0">
+    <maplayer autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" simplifyLocal="1" autoRefreshTime="0" readOnly="0" geometry="Line" labelsEnabled="1" minScale="1e+8" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" maxScale="100000" simplifyMaxScale="1" simplifyAlgorithm="0" simplifyDrawingHints="0">
       <extent>
         <xmin>18.3437671999999985</xmin>
         <ymin>-34.02801110000000051</ymin>
@@ -5595,7 +5568,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxz="0" minx="0" dimensions="2" maxx="0" crs="" maxy="0" miny="0" minz="0"/>
+          <spatial maxz="0" maxx="0" minx="0" crs="" miny="0" maxy="0" dimensions="2" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -5614,14 +5587,14 @@ def my_form_open(dialog, layer, feature):
         <map-layer-style name="default"/>
       </map-layer-style-manager>
       <auxiliaryLayer/>
-      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 symbollevels="0" type="RuleRenderer" enableorderby="0" forceraster="0">
         <rules key="{7f12d429-ae70-4c2d-a34a-eee5abbe2ad2}">
-          <rule filter="regexp_match( attribute( @atlas_feature, 'type' ), '^(residen|access)' ) AND regexp_match( &quot;highway&quot;, '^(primary|secondary|tertiary)' )" key="{f4eb265a-7df0-4880-ba8b-62fa5c664496}" symbol="0"/>
-          <rule filter="ELSE" key="{c37e51d1-6158-4d1c-800c-b9f70f8487d8}" symbol="1"/>
+          <rule symbol="0" filter="regexp_match( attribute( @atlas_feature, 'type' ), '^(residen|access)' ) AND regexp_match( &quot;highway&quot;, '^(primary|secondary|tertiary)' )" key="{f4eb265a-7df0-4880-ba8b-62fa5c664496}"/>
+          <rule symbol="1" filter="ELSE" key="{c37e51d1-6158-4d1c-800c-b9f70f8487d8}"/>
         </rules>
         <symbols>
-          <symbol name="0" type="line" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+          <symbol type="line" clip_to_extent="1" name="0" alpha="1">
+            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -5639,15 +5612,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 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" type="line" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="0">
+          <symbol type="line" clip_to_extent="1" name="1" alpha="1">
+            <layer class="SimpleLine" enabled="0" pass="0" locked="0">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -5665,9 +5638,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 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>
@@ -5676,61 +5649,61 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings>
-          <text-style fontWordSpacing="0" useSubstitutions="0" fontCapitals="0" isExpression="1" fontSizeUnit="Point" fontUnderline="0" previewBkgrdColor="#ffffff" fontFamily="Myriad Pro" fontSize="7" multilineHeight="1" fontItalic="0" namedStyle="Regular" fontLetterSpacing="0" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" textColor="0,0,0,255" textOpacity="0.8" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0" fontStrikeout="0" fontWeight="50">
-            <text-buffer bufferSizeUnits="MM" bufferOpacity="0.6" bufferNoFill="0" bufferDraw="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <background shapeType="0" shapeSizeUnit="MM" shapeDraw="0" shapeJoinStyle="64" shapeOpacity="1" shapeSVGFile="" shapeOffsetUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetY="0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="7" fontCapitals="0" fontSizeUnit="Point" useSubstitutions="0" isExpression="1" fontItalic="0" fontStrikeout="0" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" textOpacity="0.8" textColor="0,0,0,255" fontWeight="50" fontUnderline="0" multilineHeight="1" namedStyle="Regular" fontLetterSpacing="0" fontWordSpacing="0" blendMode="0">
+            <text-buffer bufferNoFill="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="1" bufferColor="255,255,255,255" bufferOpacity="0.6"/>
+            <background shapeOffsetUnit="MM" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiY="0" shapeType="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeDraw="0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiUnit="MM" shapeOpacity="1"/>
+            <shadow shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.7" shadowOffsetAngle="135" shadowRadius="1.5" shadowBlendMode="6" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100"/>
             <substitutions/>
           </text-style>
-          <text-format decimals="3" addDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="0" wrapChar="" placeDirectionSymbol="0" plussign="0" formatNumbers="0"/>
-          <placement placementFlags="4" offsetType="0" centroidWhole="0" repeatDistanceUnits="MapUnit" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" dist="0" yOffset="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="3" placement="3" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" xOffset="0" fitInPolygonOnly="0" centroidInside="0" maxCurvedCharAngleOut="-20" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" rotationAngle="0"/>
-          <rendering fontLimitPixelSize="0" labelPerPart="0" obstacle="1" zIndex="0" obstacleFactor="0.5600000000000001" displayAll="0" maxNumLabels="2000" fontMaxPixelSize="10000" upsidedownLabels="0" limitNumLabels="0" scaleMin="1" minFeatureSize="5" drawLabels="1" mergeLines="1" scaleVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3"/>
+          <text-format placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" decimals="3"/>
+          <placement quadOffset="4" offsetType="0" placementFlags="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="3" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceUnits="MapUnit" offsetUnits="MapUnit" centroidWhole="0" maxCurvedCharAngleIn="20" centroidInside="0" xOffset="0" placement="3" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" yOffset="0" dist="0" distUnits="MM" repeatDistance="0"/>
+          <rendering displayAll="0" fontLimitPixelSize="0" fontMaxPixelSize="10000" mergeLines="1" obstacleFactor="0.5600000000000001" labelPerPart="0" obstacle="1" scaleMin="1" limitNumLabels="0" maxNumLabels="2000" obstacleType="0" drawLabels="1" upsidedownLabels="0" fontMinPixelSize="3" minFeatureSize="5" scaleMax="10000000" scaleVisibility="0" zIndex="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="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="expression" value="CASE &#xa;WHEN regexp_match( &quot;name&quot;, '(Somerset Road|Port Road|Ebenezer|Victoria|Clarens|Promenade|Vlei|Fritz Sonnenberg|Granger Bay Boulevard|Norfolk)' ) THEN 10&#xa;ELSE 4&#xa;END" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="Priority">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value="CASE &#xa;WHEN regexp_match( &quot;name&quot;, '(Somerset Road|Port Road|Ebenezer|Victoria|Clarens|Promenade|Vlei|Fritz Sonnenberg|Granger Bay Boulevard|Norfolk)' ) THEN 10&#xa;ELSE 4&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="Show" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="''" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="Show">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value="''"/>
+                  <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 ('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>
@@ -5740,25 +5713,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 height="15" lineSizeType="MM" opacity="1" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" backgroundAlpha="255" maxScaleDenominator="1e+8" diagramOrientation="Up" width="15" scaleDependency="Area" minimumSize="0" backgroundColor="#ffffff" enabled="0" barWidth="5" penColor="#000000" minScaleDenominator="100000" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penAlpha="255" penWidth="0" sizeType="MM">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" rotationOffset="270" penColor="#000000" backgroundAlpha="255" opacity="1" minScaleDenominator="100000" lineSizeType="MM" diagramOrientation="Up" barWidth="5" maxScaleDenominator="1e+8" minimumSize="0" width="15" height="15" scaleBasedVisibility="0" labelPlacementMethod="XHeight" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundColor="#ffffff">
           <fontProperties description="Arial,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" field="" label=""/>
+          <attribute label="" color="#000000" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="2" obstacle="0" zIndex="0" placement="2" showAll="1" priority="0">
+      <DiagramLayerSettings priority="0" dist="0" zIndex="0" showAll="1" linePlacementFlags="2" obstacle="0" placement="2">
         <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>
@@ -5767,8 +5740,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>
@@ -5777,8 +5750,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>
@@ -5822,8 +5795,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>
@@ -5879,96 +5852,96 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="osm_id"/>
-        <alias name="" index="1" field="name"/>
-        <alias name="" index="2" field="highway"/>
-        <alias name="" index="3" field="waterway"/>
-        <alias name="" index="4" field="aerialway"/>
-        <alias name="" index="5" field="barrier"/>
-        <alias name="" index="6" field="man_made"/>
-        <alias name="" index="7" field="z_order"/>
-        <alias name="" index="8" field="other_tags"/>
-        <alias name="" index="9" field="never_show"/>
-        <alias name="" index="10" field="label_x"/>
-        <alias name="" index="11" field="label_y"/>
-        <alias name="" index="12" field="label_rota"/>
-        <alias name="" index="13" field="always_sho"/>
-        <alias name="" index="14" field="resident_a"/>
+        <alias field="osm_id" index="0" name=""/>
+        <alias field="name" index="1" name=""/>
+        <alias field="highway" index="2" name=""/>
+        <alias field="waterway" index="3" name=""/>
+        <alias field="aerialway" index="4" name=""/>
+        <alias field="barrier" index="5" name=""/>
+        <alias field="man_made" index="6" name=""/>
+        <alias field="z_order" index="7" name=""/>
+        <alias field="other_tags" index="8" name=""/>
+        <alias field="never_show" index="9" name=""/>
+        <alias field="label_x" index="10" name=""/>
+        <alias field="label_y" index="11" name=""/>
+        <alias field="label_rota" index="12" name=""/>
+        <alias field="always_sho" index="13" name=""/>
+        <alias field="resident_a" index="14" name=""/>
       </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 field="osm_id" expression="" applyOnUpdate="0"/>
+        <default field="name" expression="" applyOnUpdate="0"/>
+        <default field="highway" expression="" applyOnUpdate="0"/>
+        <default field="waterway" expression="" applyOnUpdate="0"/>
+        <default field="aerialway" expression="" applyOnUpdate="0"/>
+        <default field="barrier" expression="" applyOnUpdate="0"/>
+        <default field="man_made" expression="" applyOnUpdate="0"/>
+        <default field="z_order" expression="" applyOnUpdate="0"/>
+        <default field="other_tags" expression="" applyOnUpdate="0"/>
+        <default field="never_show" expression="" applyOnUpdate="0"/>
+        <default field="label_x" expression="" applyOnUpdate="0"/>
+        <default field="label_y" expression="" applyOnUpdate="0"/>
+        <default field="label_rota" expression="" applyOnUpdate="0"/>
+        <default field="always_sho" expression="" applyOnUpdate="0"/>
+        <default field="resident_a" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="osm_id" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="name" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="highway" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="waterway" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="aerialway" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="barrier" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="man_made" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="z_order" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="other_tags" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="never_show" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="label_x" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="label_y" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="label_rota" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="always_sho" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="resident_a" notnull_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="osm_id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="highway" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="waterway" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="aerialway" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="barrier" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="man_made" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="z_order" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="other_tags" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="never_show" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="label_x" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="label_y" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="label_rota" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="always_sho" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="resident_a" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="osm_id"/>
-        <constraint exp="" desc="" field="name"/>
-        <constraint exp="" desc="" field="highway"/>
-        <constraint exp="" desc="" field="waterway"/>
-        <constraint exp="" desc="" field="aerialway"/>
-        <constraint exp="" desc="" field="barrier"/>
-        <constraint exp="" desc="" field="man_made"/>
-        <constraint exp="" desc="" field="z_order"/>
-        <constraint exp="" desc="" field="other_tags"/>
-        <constraint exp="" desc="" field="never_show"/>
-        <constraint exp="" desc="" field="label_x"/>
-        <constraint exp="" desc="" field="label_y"/>
-        <constraint exp="" desc="" field="label_rota"/>
-        <constraint exp="" desc="" field="always_sho"/>
-        <constraint exp="" desc="" 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>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;osm_id&quot;" actionWidgetStyle="dropDown" sortOrder="1">
+      <attributetableconfig sortExpression="&quot;osm_id&quot;" sortOrder="1" actionWidgetStyle="dropDown">
         <columns>
-          <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"/>
+          <column type="field" hidden="0" name="osm_id" width="-1"/>
+          <column type="field" hidden="0" name="name" width="-1"/>
+          <column type="field" hidden="0" name="z_order" width="-1"/>
+          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" hidden="0" name="highway" width="-1"/>
+          <column type="field" hidden="0" name="waterway" width="-1"/>
+          <column type="field" hidden="0" name="aerialway" width="-1"/>
+          <column type="field" hidden="0" name="barrier" width="-1"/>
+          <column type="field" hidden="0" name="man_made" width="-1"/>
+          <column type="field" hidden="0" name="other_tags" width="-1"/>
+          <column type="field" hidden="0" name="never_show" width="-1"/>
+          <column type="field" hidden="0" name="label_x" width="-1"/>
+          <column type="field" hidden="0" name="label_y" width="-1"/>
+          <column type="field" hidden="0" name="label_rota" width="-1"/>
+          <column type="field" hidden="0" name="always_sho" width="-1"/>
+          <column type="field" hidden="0" name="resident_a" width="-1"/>
         </columns>
       </attributetableconfig>
       <editform tolerant="1">.</editform>
@@ -5995,74 +5968,74 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="aerialway" editable="1"/>
-        <field name="always_sho" editable="1"/>
-        <field name="barrier" editable="1"/>
-        <field name="highway" editable="1"/>
-        <field name="label_rota" editable="1"/>
-        <field name="label_x" editable="1"/>
-        <field name="label_y" editable="1"/>
-        <field name="man_made" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="never_show" editable="1"/>
-        <field name="orig_access" editable="0"/>
-        <field name="orig_always_sho" editable="0"/>
-        <field name="orig_bridge" editable="0"/>
-        <field name="orig_c_z_order" editable="0"/>
-        <field name="orig_class" editable="0"/>
-        <field name="orig_id" editable="0"/>
-        <field name="orig_label_rota" editable="0"/>
-        <field name="orig_label_x" editable="0"/>
-        <field name="orig_label_y" editable="0"/>
-        <field name="orig_name" editable="0"/>
-        <field name="orig_oneway" editable="0"/>
-        <field name="orig_ref" editable="0"/>
-        <field name="orig_service" editable="0"/>
-        <field name="orig_show" editable="0"/>
-        <field name="orig_tunnel" editable="0"/>
-        <field name="orig_type" editable="0"/>
-        <field name="orig_z_order" editable="0"/>
-        <field name="osm_id" editable="1"/>
-        <field name="other_tags" editable="1"/>
-        <field name="resident_a" editable="1"/>
-        <field name="resident_access" editable="1"/>
-        <field name="waterway" editable="1"/>
-        <field name="z_order" editable="1"/>
+        <field editable="1" name="aerialway"/>
+        <field editable="1" name="always_sho"/>
+        <field editable="1" name="barrier"/>
+        <field editable="1" name="highway"/>
+        <field editable="1" name="label_rota"/>
+        <field editable="1" name="label_x"/>
+        <field editable="1" name="label_y"/>
+        <field editable="1" name="man_made"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="never_show"/>
+        <field editable="0" name="orig_access"/>
+        <field editable="0" name="orig_always_sho"/>
+        <field editable="0" name="orig_bridge"/>
+        <field editable="0" name="orig_c_z_order"/>
+        <field editable="0" name="orig_class"/>
+        <field editable="0" name="orig_id"/>
+        <field editable="0" name="orig_label_rota"/>
+        <field editable="0" name="orig_label_x"/>
+        <field editable="0" name="orig_label_y"/>
+        <field editable="0" name="orig_name"/>
+        <field editable="0" name="orig_oneway"/>
+        <field editable="0" name="orig_ref"/>
+        <field editable="0" name="orig_service"/>
+        <field editable="0" name="orig_show"/>
+        <field editable="0" name="orig_tunnel"/>
+        <field editable="0" name="orig_type"/>
+        <field editable="0" name="orig_z_order"/>
+        <field editable="1" name="osm_id"/>
+        <field editable="1" name="other_tags"/>
+        <field editable="1" name="resident_a"/>
+        <field editable="1" name="resident_access"/>
+        <field editable="1" name="waterway"/>
+        <field editable="1" name="z_order"/>
       </editable>
       <labelOnTop>
-        <field name="aerialway" labelOnTop="0"/>
-        <field name="always_sho" labelOnTop="0"/>
-        <field name="barrier" labelOnTop="0"/>
-        <field name="highway" labelOnTop="0"/>
-        <field name="label_rota" labelOnTop="0"/>
-        <field name="label_x" labelOnTop="0"/>
-        <field name="label_y" labelOnTop="0"/>
-        <field name="man_made" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="never_show" labelOnTop="0"/>
-        <field name="orig_access" labelOnTop="0"/>
-        <field name="orig_always_sho" labelOnTop="0"/>
-        <field name="orig_bridge" labelOnTop="0"/>
-        <field name="orig_c_z_order" labelOnTop="0"/>
-        <field name="orig_class" labelOnTop="0"/>
-        <field name="orig_id" labelOnTop="0"/>
-        <field name="orig_label_rota" labelOnTop="0"/>
-        <field name="orig_label_x" labelOnTop="0"/>
-        <field name="orig_label_y" labelOnTop="0"/>
-        <field name="orig_name" labelOnTop="0"/>
-        <field name="orig_oneway" labelOnTop="0"/>
-        <field name="orig_ref" labelOnTop="0"/>
-        <field name="orig_service" labelOnTop="0"/>
-        <field name="orig_show" labelOnTop="0"/>
-        <field name="orig_tunnel" labelOnTop="0"/>
-        <field name="orig_type" labelOnTop="0"/>
-        <field name="orig_z_order" labelOnTop="0"/>
-        <field name="osm_id" labelOnTop="0"/>
-        <field name="other_tags" labelOnTop="0"/>
-        <field name="resident_a" labelOnTop="0"/>
-        <field name="resident_access" labelOnTop="0"/>
-        <field name="waterway" labelOnTop="0"/>
-        <field name="z_order" labelOnTop="0"/>
+        <field labelOnTop="0" name="aerialway"/>
+        <field labelOnTop="0" name="always_sho"/>
+        <field labelOnTop="0" name="barrier"/>
+        <field labelOnTop="0" name="highway"/>
+        <field labelOnTop="0" name="label_rota"/>
+        <field labelOnTop="0" name="label_x"/>
+        <field labelOnTop="0" name="label_y"/>
+        <field labelOnTop="0" name="man_made"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="never_show"/>
+        <field labelOnTop="0" name="orig_access"/>
+        <field labelOnTop="0" name="orig_always_sho"/>
+        <field labelOnTop="0" name="orig_bridge"/>
+        <field labelOnTop="0" name="orig_c_z_order"/>
+        <field labelOnTop="0" name="orig_class"/>
+        <field labelOnTop="0" name="orig_id"/>
+        <field labelOnTop="0" name="orig_label_rota"/>
+        <field labelOnTop="0" name="orig_label_x"/>
+        <field labelOnTop="0" name="orig_label_y"/>
+        <field labelOnTop="0" name="orig_name"/>
+        <field labelOnTop="0" name="orig_oneway"/>
+        <field labelOnTop="0" name="orig_ref"/>
+        <field labelOnTop="0" name="orig_service"/>
+        <field labelOnTop="0" name="orig_show"/>
+        <field labelOnTop="0" name="orig_tunnel"/>
+        <field labelOnTop="0" name="orig_type"/>
+        <field labelOnTop="0" name="orig_z_order"/>
+        <field labelOnTop="0" name="osm_id"/>
+        <field labelOnTop="0" name="other_tags"/>
+        <field labelOnTop="0" name="resident_a"/>
+        <field labelOnTop="0" name="resident_access"/>
+        <field labelOnTop="0" name="waterway"/>
+        <field labelOnTop="0" name="z_order"/>
       </labelOnTop>
       <widgets>
         <widget name="always_show">
@@ -6116,15 +6089,15 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" refreshOnNotifyMessage="" geometry="Point" simplifyLocal="1" simplifyDrawingHints="0" type="vector" simplifyMaxScale="1" simplifyAlgorithm="0" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshEnabled="0" autoRefreshTime="0" minScale="1e+8" readOnly="0">
+    <maplayer autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" simplifyLocal="1" autoRefreshTime="0" readOnly="0" geometry="Point" labelsEnabled="1" minScale="1e+8" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" maxScale="0" simplifyMaxScale="1" simplifyAlgorithm="0" simplifyDrawingHints="0">
       <extent>
         <xmin>2048104.86252160812728107</xmin>
         <ymin>-4016499.04737948765978217</ymin>
         <xmax>2050068.23129932186566293</xmax>
-        <ymax>-4015303.68345076218247414</ymax>
+        <ymax>-4015294.2153964783065021</ymax>
       </extent>
       <id>poi_labels_59d3855d_466f_419c_8119_94b9ad7c140d</id>
-      <datasource>../../../poi_labels.shp</datasource>
+      <datasource>./poi_labels.shp</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -6173,7 +6146,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxz="0" minx="0" dimensions="2" maxx="0" crs="" maxy="0" miny="0" minz="0"/>
+          <spatial maxz="0" maxx="0" minx="0" crs="" miny="0" maxy="0" dimensions="2" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -6192,18 +6165,18 @@ def my_form_open(dialog, layer, feature):
         <map-layer-style name="default"/>
       </map-layer-style-manager>
       <auxiliaryLayer/>
-      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 symbollevels="0" type="RuleRenderer" enableorderby="0" forceraster="0">
         <rules key="{0927a9cd-bbb2-44ea-811b-fdbcb767a09a}">
-          <rule filter="regexp_match( &quot;type&quot;, '(start|finish)')" key="{efda7615-994b-459d-a657-ee8185286b0b}" symbol="0"/>
-          <rule filter="&quot;type&quot; = 'toilets'" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}" symbol="1"/>
-          <rule filter="&quot;type&quot; = 'togbag'" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}" symbol="2"/>
-          <rule filter=" &quot;type&quot; = 'closure'" key="{67af661e-65f1-44a7-9993-d5a668077b33}" symbol="3"/>
-          <rule filter="&quot;type&quot; = 'myciti'" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}" symbol="4"/>
-          <rule filter="&quot;type&quot; = 'parking'" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}" symbol="5"/>
+          <rule symbol="0" filter="regexp_match( &quot;type&quot;, '(start|finish)')" key="{efda7615-994b-459d-a657-ee8185286b0b}"/>
+          <rule symbol="1" filter="&quot;type&quot; = 'toilets'" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}"/>
+          <rule symbol="2" filter="&quot;type&quot; = 'togbag'" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}"/>
+          <rule symbol="3" filter=" &quot;type&quot; = 'closure'" key="{67af661e-65f1-44a7-9993-d5a668077b33}"/>
+          <rule symbol="4" filter="&quot;type&quot; = 'myciti'" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}"/>
+          <rule symbol="5" filter="&quot;type&quot; = 'parking'" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}"/>
         </rules>
         <symbols>
-          <symbol name="0" type="marker" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
+          <symbol type="marker" clip_to_extent="1" name="0" alpha="1">
+            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
               <prop v="0" k="angle"/>
               <prop v="0,0,0,255" k="color"/>
               <prop v="1" k="horizontal_anchor_point"/>
@@ -6224,17 +6197,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 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" type="marker" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="SvgMarker" pass="0" enabled="1">
+          <symbol type="marker" clip_to_extent="1" name="1" alpha="1">
+            <layer class="SvgMarker" enabled="1" pass="0" locked="0">
               <prop v="0" k="angle"/>
-              <prop v="0,255,157,255" k="color"/>
+              <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"/>
@@ -6252,25 +6225,25 @@ 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 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" type="marker" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="SvgMarker" pass="0" enabled="1">
+          <symbol type="marker" clip_to_extent="1" name="2" alpha="1">
+            <layer class="SvgMarker" enabled="1" pass="0" locked="0">
               <prop v="0" k="angle"/>
-              <prop v="255,255,255,255" k="color"/>
+              <prop v="0,0,0,255" k="color"/>
               <prop v="0" k="fixedAspectRatio"/>
               <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="../gym-bag.svg" k="name"/>
+              <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" k="outline_width"/>
+              <prop v="0.2" k="outline_width"/>
               <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
               <prop v="MM" k="outline_width_unit"/>
               <prop v="diameter" k="scale_method"/>
@@ -6280,31 +6253,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="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 '#91d337'&#xa;ELSE&#xa;'#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>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" type="marker" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="SvgMarker" pass="0" enabled="1">
+          <symbol type="marker" clip_to_extent="1" name="3" alpha="1">
+            <layer class="SvgMarker" enabled="1" pass="0" 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="../road_closure.svg" k="name"/>
+              <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"/>
@@ -6319,15 +6292,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 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" type="marker" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="SvgMarker" pass="0" enabled="1">
+          <symbol type="marker" clip_to_extent="1" name="4" alpha="1">
+            <layer class="SvgMarker" enabled="1" pass="0" locked="0">
               <prop v="0" k="angle"/>
               <prop v="0,12,254,255" k="color"/>
               <prop v="0" k="fixedAspectRatio"/>
@@ -6411,13 +6384,13 @@ def my_form_open(dialog, layer, feature):
               </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>
             </layer>
-            <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
+            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
               <prop v="0" k="angle"/>
               <prop v="255,0,0,0" k="color"/>
               <prop v="1" k="horizontal_anchor_point"/>
@@ -6438,15 +6411,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 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="5" type="marker" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="SvgMarker" pass="0" enabled="1">
+          <symbol type="marker" clip_to_extent="1" name="5" alpha="1">
+            <layer class="SvgMarker" enabled="1" pass="0" locked="0">
               <prop v="0" k="angle"/>
               <prop v="43,153,41,255" k="color"/>
               <prop v="0" k="fixedAspectRatio"/>
@@ -6466,9 +6439,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 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>
@@ -6477,45 +6450,45 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings>
-          <text-style fontWordSpacing="0" useSubstitutions="0" fontCapitals="0" isExpression="0" fontSizeUnit="Point" fontUnderline="0" previewBkgrdColor="#ffffff" fontFamily="Myriad Pro" fontSize="10" multilineHeight="1" fontItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fieldName="name" textColor="0,0,0,255" textOpacity="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0" fontStrikeout="0" fontWeight="63">
-            <text-buffer bufferSizeUnits="MM" bufferOpacity="0.75" bufferNoFill="1" bufferDraw="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="2" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <background shapeType="0" shapeSizeUnit="MM" shapeDraw="0" shapeJoinStyle="64" shapeOpacity="1" shapeSVGFile="" shapeOffsetUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetY="0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" fontCapitals="0" fontSizeUnit="Point" useSubstitutions="0" isExpression="0" fontItalic="0" fontStrikeout="0" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" fieldName="name" textOpacity="0.8" textColor="0,0,0,255" fontWeight="63" fontUnderline="0" multilineHeight="1" namedStyle="Semibold" fontLetterSpacing="0" fontWordSpacing="0" blendMode="0">
+            <text-buffer bufferNoFill="1" bufferSize="2" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="1" bufferColor="255,255,255,255" bufferOpacity="0.7"/>
+            <background shapeOffsetUnit="MM" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiY="0" shapeType="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeDraw="0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiUnit="MM" shapeOpacity="1"/>
+            <shadow shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.7" shadowOffsetAngle="135" shadowRadius="1.5" shadowBlendMode="6" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100"/>
             <substitutions/>
           </text-style>
-          <text-format decimals="3" addDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="3" wrapChar="" placeDirectionSymbol="0" plussign="0" formatNumbers="0"/>
-          <placement placementFlags="10" offsetType="0" centroidWhole="0" repeatDistanceUnits="MM" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" dist="2" yOffset="0" offsetUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="10" placement="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" xOffset="0" fitInPolygonOnly="0" centroidInside="0" maxCurvedCharAngleOut="-25" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" rotationAngle="0"/>
-          <rendering fontLimitPixelSize="0" labelPerPart="0" obstacle="1" zIndex="10" obstacleFactor="1.8" displayAll="1" maxNumLabels="2000" fontMaxPixelSize="10000" upsidedownLabels="0" limitNumLabels="0" scaleMin="0" minFeatureSize="0" drawLabels="1" mergeLines="0" scaleVisibility="0" obstacleType="0" scaleMax="0" fontMinPixelSize="3"/>
+          <text-format placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="3" decimals="3"/>
+          <placement quadOffset="4" offsetType="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="10" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceUnits="MM" offsetUnits="MM" centroidWhole="0" maxCurvedCharAngleIn="25" centroidInside="0" xOffset="0" placement="0" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" yOffset="0" dist="3" distUnits="MM" repeatDistance="0"/>
+          <rendering displayAll="1" fontLimitPixelSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1.8" labelPerPart="0" obstacle="1" scaleMin="0" limitNumLabels="0" maxNumLabels="2000" obstacleType="0" drawLabels="1" upsidedownLabels="0" fontMinPixelSize="3" minFeatureSize="0" scaleMax="0" scaleVisibility="0" zIndex="10"/>
           <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 height="15" lineSizeType="MM" opacity="1" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" backgroundAlpha="255" maxScaleDenominator="1e+8" diagramOrientation="Up" width="15" scaleDependency="Area" minimumSize="0" backgroundColor="#ffffff" enabled="0" barWidth="5" penColor="#000000" minScaleDenominator="0" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penAlpha="255" penWidth="0" sizeType="MM">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" rotationOffset="270" penColor="#000000" backgroundAlpha="255" opacity="1" minScaleDenominator="0" lineSizeType="MM" diagramOrientation="Up" barWidth="5" maxScaleDenominator="1e+8" minimumSize="0" width="15" height="15" scaleBasedVisibility="0" labelPlacementMethod="XHeight" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundColor="#ffffff">
           <fontProperties description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0" style="0"/>
-          <attribute color="#000000" field="" label=""/>
+          <attribute label="" color="#000000" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="18" obstacle="0" zIndex="0" placement="0" showAll="1" priority="0">
+      <DiagramLayerSettings priority="0" dist="0" zIndex="0" showAll="1" linePlacementFlags="18" obstacle="0" placement="0">
         <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>
@@ -6550,41 +6523,41 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="type"/>
-        <alias name="" index="2" field="name"/>
-        <alias name="" index="3" field="distance"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="type" index="1" name=""/>
+        <alias field="name" index="2" name=""/>
+        <alias field="distance" index="3" name=""/>
       </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 field="id" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="name" expression="" applyOnUpdate="0"/>
+        <default field="distance" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="id" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="type" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="name" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="distance" notnull_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="distance" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="type"/>
-        <constraint exp="" desc="" field="name"/>
-        <constraint exp="" desc="" field="distance"/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="name" exp=""/>
+        <constraint desc="" field="distance" exp=""/>
       </constraintExpressions>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;type&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;type&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <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"/>
+          <column type="field" hidden="0" name="id" width="-1"/>
+          <column type="field" hidden="0" name="type" width="-1"/>
+          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" hidden="0" name="name" width="-1"/>
+          <column type="field" hidden="0" name="distance" width="-1"/>
         </columns>
       </attributetableconfig>
       <editform tolerant="1"></editform>
@@ -6611,16 +6584,16 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="distance" editable="1"/>
-        <field name="id" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="1" name="distance"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field name="distance" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="distance"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <widgets/>
       <conditionalstyles>
@@ -6631,7 +6604,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" refreshOnNotifyMessage="" geometry="Polygon" simplifyLocal="1" simplifyDrawingHints="1" type="vector" simplifyMaxScale="1" simplifyAlgorithm="0" labelsEnabled="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshEnabled="0" autoRefreshTime="0" minScale="1e+8" readOnly="0">
+    <maplayer autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" simplifyLocal="1" autoRefreshTime="0" readOnly="0" geometry="Polygon" labelsEnabled="0" minScale="1e+8" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" maxScale="0" simplifyMaxScale="1" simplifyAlgorithm="0" simplifyDrawingHints="1">
       <extent>
         <xmin>2045286.68750100489705801</xmin>
         <ymin>-4019650.19606142397969961</ymin>
@@ -6688,7 +6661,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxz="0" minx="0" dimensions="2" maxx="0" crs="" maxy="0" miny="0" minz="0"/>
+          <spatial maxz="0" maxx="0" minx="0" crs="" miny="0" maxy="0" dimensions="2" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -6707,10 +6680,10 @@ def my_form_open(dialog, layer, feature):
         <map-layer-style name="default"/>
       </map-layer-style-manager>
       <auxiliaryLayer/>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 symbollevels="0" type="singleSymbol" enableorderby="0" forceraster="0">
         <symbols>
-          <symbol name="0" type="fill" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="LinePatternFill" pass="0" enabled="1">
+          <symbol type="fill" clip_to_extent="1" name="0" alpha="1">
+            <layer class="LinePatternFill" enabled="1" pass="0" locked="0">
               <prop v="135" k="angle"/>
               <prop v="211,134,33,255" k="color"/>
               <prop v="2" k="distance"/>
@@ -6726,13 +6699,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 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" type="line" alpha="1" clip_to_extent="1">
-                <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+              <symbol type="line" clip_to_extent="1" name="@0@0" alpha="1">
+                <layer class="SimpleLine" enabled="1" pass="0" locked="0">
                   <prop v="square" k="capstyle"/>
                   <prop v="5;2" k="customdash"/>
                   <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -6750,15 +6723,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 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 locked="0" class="SimpleFill" pass="0" enabled="1">
+            <layer class="SimpleFill" enabled="1" pass="0" 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"/>
@@ -6772,9 +6745,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 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>
@@ -6784,26 +6757,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 height="15" lineSizeType="MM" opacity="1" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" backgroundAlpha="255" maxScaleDenominator="1e+8" diagramOrientation="Up" width="15" scaleDependency="Area" minimumSize="0" backgroundColor="#ffffff" enabled="0" barWidth="5" penColor="#000000" minScaleDenominator="0" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penAlpha="255" penWidth="0" sizeType="MM">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" rotationOffset="270" penColor="#000000" backgroundAlpha="255" opacity="1" minScaleDenominator="0" lineSizeType="MM" diagramOrientation="Up" barWidth="5" maxScaleDenominator="1e+8" minimumSize="0" width="15" height="15" scaleBasedVisibility="0" labelPlacementMethod="XHeight" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundColor="#ffffff">
           <fontProperties description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0" style="0"/>
-          <attribute color="#000000" field="" label=""/>
+          <attribute label="" color="#000000" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="18" obstacle="0" zIndex="0" placement="1" showAll="1" priority="0">
+      <DiagramLayerSettings priority="0" dist="0" zIndex="0" showAll="1" linePlacementFlags="18" obstacle="0" placement="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>
@@ -6815,13 +6788,13 @@ def my_form_open(dialog, layer, feature):
       <constraints/>
       <constraintExpressions/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <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"/>
+          <column type="field" hidden="0" name="id" width="-1"/>
+          <column type="field" hidden="0" name="type" width="431"/>
+          <column type="actions" hidden="1" width="-1"/>
         </columns>
       </attributetableconfig>
       <editform tolerant="1"></editform>
@@ -6848,12 +6821,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <widgets/>
       <conditionalstyles>
@@ -6864,7 +6837,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" refreshOnNotifyMessage="" geometry="Line" simplifyLocal="1" simplifyDrawingHints="1" type="vector" simplifyMaxScale="1" simplifyAlgorithm="0" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshEnabled="0" autoRefreshTime="0" minScale="1e+8" readOnly="0">
+    <maplayer autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" simplifyLocal="1" autoRefreshTime="0" readOnly="0" geometry="Line" labelsEnabled="1" minScale="1e+8" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" maxScale="0" simplifyMaxScale="1" simplifyAlgorithm="0" simplifyDrawingHints="1">
       <extent>
         <xmin>2045527.88145093410275877</xmin>
         <ymin>-4021539.35817469004541636</ymin>
@@ -6921,7 +6894,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxz="0" minx="0" dimensions="2" maxx="0" crs="" maxy="0" miny="0" minz="0"/>
+          <spatial maxz="0" maxx="0" minx="0" crs="" miny="0" maxy="0" dimensions="2" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -6940,15 +6913,15 @@ def my_form_open(dialog, layer, feature):
         <map-layer-style name="default"/>
       </map-layer-style-manager>
       <auxiliaryLayer/>
-      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
+      <renderer-v2 symbollevels="0" type="RuleRenderer" enableorderby="0" forceraster="0">
         <rules key="{57366f52-c504-4c9a-800f-dcbf1d415bf6}">
-          <rule filter="&quot;status&quot; = 'closure'" key="{3d527c2d-2e74-4cfa-bc4b-b23a84bd2b64}" symbol="0" label="Road Closures"/>
-          <rule filter="&quot;status&quot; = 'one-way'" key="{15afbf65-f71f-4335-906e-79a74c987d9a}" symbol="1" label="One-Way"/>
-          <rule filter="&quot;status&quot; = 'open'" key="{1c49b105-b991-480a-b221-afb9009498f0}" symbol="2" label="Road Open"/>
+          <rule label="Road Closures" symbol="0" filter="&quot;status&quot; = 'closure'" key="{3d527c2d-2e74-4cfa-bc4b-b23a84bd2b64}"/>
+          <rule label="One-Way" symbol="1" filter="&quot;status&quot; = 'one-way'" key="{15afbf65-f71f-4335-906e-79a74c987d9a}"/>
+          <rule label="Road Open" symbol="2" filter="&quot;status&quot; = 'open'" key="{1c49b105-b991-480a-b221-afb9009498f0}"/>
         </rules>
         <symbols>
-          <symbol name="0" type="line" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+          <symbol type="line" clip_to_extent="1" name="0" alpha="1">
+            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -6966,26 +6939,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="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" type="line" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+          <symbol type="line" clip_to_extent="1" name="1" alpha="1">
+            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -7003,24 +6976,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="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 locked="0" class="MarkerLine" pass="0" enabled="1">
+            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
               <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"/>
@@ -7034,19 +7007,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="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" type="marker" alpha="1" clip_to_extent="1">
-                <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
+              <symbol type="marker" clip_to_extent="1" name="@1@1" alpha="1">
+                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
                   <prop v="0" k="angle"/>
                   <prop v="0,255,0,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -7067,23 +7040,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="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" type="line" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+          <symbol type="line" clip_to_extent="1" name="2" alpha="1">
+            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -7101,20 +7074,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="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>
@@ -7123,45 +7096,45 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings>
-          <text-style fontWordSpacing="0" useSubstitutions="0" fontCapitals="0" isExpression="0" fontSizeUnit="Point" fontUnderline="0" previewBkgrdColor="#ffffff" fontFamily="Myriad Pro" fontSize="9" multilineHeight="1" fontItalic="0" namedStyle="Regular" fontLetterSpacing="0" fieldName="times" textColor="0,0,0,255" textOpacity="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0" fontStrikeout="0" fontWeight="50">
-            <text-buffer bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <background shapeType="0" shapeSizeUnit="MM" shapeDraw="0" shapeJoinStyle="64" shapeOpacity="1" shapeSVGFile="" shapeOffsetUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetY="0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="9" fontCapitals="0" fontSizeUnit="Point" useSubstitutions="0" isExpression="0" fontItalic="0" fontStrikeout="0" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" fieldName="times" textOpacity="1" textColor="0,0,0,255" fontWeight="50" fontUnderline="0" multilineHeight="1" namedStyle="Regular" fontLetterSpacing="0" fontWordSpacing="0" blendMode="0">
+            <text-buffer bufferNoFill="1" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <background shapeOffsetUnit="MM" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiY="0" shapeType="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeDraw="0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiUnit="MM" shapeOpacity="1"/>
+            <shadow shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.7" shadowOffsetAngle="135" shadowRadius="1.5" shadowBlendMode="6" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100"/>
             <substitutions/>
           </text-style>
-          <text-format decimals="3" addDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="4294967295" wrapChar="" placeDirectionSymbol="0" plussign="0" formatNumbers="0"/>
-          <placement placementFlags="10" offsetType="0" centroidWhole="0" repeatDistanceUnits="MM" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" dist="0" yOffset="0" offsetUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="5" placement="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" xOffset="0" fitInPolygonOnly="0" centroidInside="0" maxCurvedCharAngleOut="-25" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" rotationAngle="0"/>
-          <rendering fontLimitPixelSize="0" labelPerPart="0" obstacle="1" zIndex="0" obstacleFactor="1" displayAll="0" maxNumLabels="2000" fontMaxPixelSize="10000" upsidedownLabels="0" limitNumLabels="0" scaleMin="0" minFeatureSize="0" drawLabels="1" mergeLines="0" scaleVisibility="0" obstacleType="0" scaleMax="0" fontMinPixelSize="3"/>
+          <text-format placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="4294967295" decimals="3"/>
+          <placement quadOffset="4" offsetType="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="5" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceUnits="MM" offsetUnits="MM" centroidWhole="0" maxCurvedCharAngleIn="25" centroidInside="0" xOffset="0" placement="2" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" yOffset="0" dist="0" distUnits="MM" repeatDistance="0"/>
+          <rendering displayAll="0" fontLimitPixelSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" labelPerPart="0" obstacle="1" scaleMin="0" limitNumLabels="0" maxNumLabels="2000" obstacleType="0" drawLabels="1" upsidedownLabels="0" fontMinPixelSize="3" minFeatureSize="0" scaleMax="0" scaleVisibility="0" zIndex="0"/>
           <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 height="15" lineSizeType="MM" opacity="1" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" backgroundAlpha="255" maxScaleDenominator="1e+8" diagramOrientation="Up" width="15" scaleDependency="Area" minimumSize="0" backgroundColor="#ffffff" enabled="0" barWidth="5" penColor="#000000" minScaleDenominator="0" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penAlpha="255" penWidth="0" sizeType="MM">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" rotationOffset="270" penColor="#000000" backgroundAlpha="255" opacity="1" minScaleDenominator="0" lineSizeType="MM" diagramOrientation="Up" barWidth="5" maxScaleDenominator="1e+8" minimumSize="0" width="15" height="15" scaleBasedVisibility="0" labelPlacementMethod="XHeight" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundColor="#ffffff">
           <fontProperties description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0" style="0"/>
-          <attribute color="#000000" field="" label=""/>
+          <attribute label="" color="#000000" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="18" obstacle="0" zIndex="0" placement="2" showAll="1" priority="0">
+      <DiagramLayerSettings priority="0" dist="0" zIndex="0" showAll="1" linePlacementFlags="18" obstacle="0" placement="2">
         <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>
@@ -7196,41 +7169,41 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="type"/>
-        <alias name="" index="2" field="status"/>
-        <alias name="" index="3" field="times"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="type" index="1" name=""/>
+        <alias field="status" index="2" name=""/>
+        <alias field="times" index="3" name=""/>
       </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 field="id" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="status" expression="" applyOnUpdate="0"/>
+        <default field="times" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="id" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="type" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="status" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="times" notnull_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="status" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="times" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="type"/>
-        <constraint exp="" desc="" field="status"/>
-        <constraint exp="" desc="" field="times"/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="status" exp=""/>
+        <constraint desc="" field="times" exp=""/>
       </constraintExpressions>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;id&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <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"/>
+          <column type="field" hidden="0" name="id" width="-1"/>
+          <column type="field" hidden="0" name="type" width="202"/>
+          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" hidden="0" name="status" width="-1"/>
+          <column type="field" hidden="0" name="times" width="-1"/>
         </columns>
       </attributetableconfig>
       <editform tolerant="1"></editform>
@@ -7257,16 +7230,16 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="status" editable="1"/>
-        <field name="times" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="status"/>
+        <field editable="1" name="times"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="status" labelOnTop="0"/>
-        <field name="times" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="status"/>
+        <field labelOnTop="0" name="times"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <widgets/>
       <conditionalstyles>
@@ -7277,7 +7250,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="100000" refreshOnNotifyMessage="" geometry="Point" simplifyLocal="1" simplifyDrawingHints="0" type="vector" simplifyMaxScale="1" simplifyAlgorithm="0" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshEnabled="0" autoRefreshTime="0" minScale="1e+8" readOnly="0">
+    <maplayer autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" simplifyLocal="1" autoRefreshTime="0" readOnly="0" geometry="Point" labelsEnabled="1" minScale="1e+8" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" maxScale="100000" simplifyMaxScale="1" simplifyAlgorithm="0" simplifyDrawingHints="0">
       <extent>
         <xmin>18.37579395571144758</xmin>
         <ymin>-33.94513036405621875</ymin>
@@ -7341,128 +7314,128 @@ def my_form_open(dialog, layer, feature):
         <rules key="">
           <rule description="21KM" 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="">
             <settings>
-              <text-style fontWordSpacing="0" useSubstitutions="0" fontCapitals="0" isExpression="1" fontSizeUnit="Point" fontUnderline="0" previewBkgrdColor="#ffffff" fontFamily="Myriad Pro" fontSize="10" multilineHeight="1" fontItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textColor="255,255,255,255" textOpacity="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0" fontStrikeout="0" fontWeight="63">
-                <text-buffer bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="0" bufferDraw="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeType="0" shapeSizeUnit="MM" shapeDraw="1" shapeJoinStyle="128" shapeOpacity="1" shapeSVGFile="" shapeOffsetUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeX="0.25" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="210,32,39,255" shapeOffsetY="0" shapeRadiiUnit="MM" shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="210,32,39,255" shapeSizeType="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" fontCapitals="0" fontSizeUnit="Point" useSubstitutions="0" isExpression="1" fontItalic="0" fontStrikeout="0" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textOpacity="1" textColor="255,255,255,255" fontWeight="63" fontUnderline="0" multilineHeight="1" namedStyle="Semibold" fontLetterSpacing="0" fontWordSpacing="0" blendMode="0">
+                <text-buffer bufferNoFill="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <background shapeOffsetUnit="MM" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="128" shapeRadiiY="0" shapeType="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeFillColor="210,32,39,255" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeSizeX="0.25" shapeBorderColor="210,32,39,255" shapeBorderWidth="1" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeDraw="1" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiUnit="MM" shapeOpacity="1"/>
+                <shadow shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.7" shadowOffsetAngle="135" shadowRadius="1.5" shadowBlendMode="6" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100"/>
                 <substitutions/>
               </text-style>
-              <text-format decimals="0" addDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="3" wrapChar="" placeDirectionSymbol="0" plussign="0" formatNumbers="0"/>
-              <placement placementFlags="10" offsetType="0" centroidWhole="0" repeatDistanceUnits="MM" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" dist="2" yOffset="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="10" placement="6" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" xOffset="0" fitInPolygonOnly="0" centroidInside="0" maxCurvedCharAngleOut="-20" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" rotationAngle="0"/>
-              <rendering fontLimitPixelSize="0" labelPerPart="0" obstacle="1" zIndex="0" obstacleFactor="2" displayAll="1" maxNumLabels="2000" fontMaxPixelSize="10000" upsidedownLabels="0" limitNumLabels="0" scaleMin="1" minFeatureSize="0" drawLabels="1" mergeLines="0" scaleVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="3" decimals="0"/>
+              <placement quadOffset="4" offsetType="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="10" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceUnits="MM" offsetUnits="MapUnit" centroidWhole="0" maxCurvedCharAngleIn="20" centroidInside="0" xOffset="0" placement="6" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" yOffset="0" dist="2" distUnits="MM" repeatDistance="0"/>
+              <rendering displayAll="1" fontLimitPixelSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="2" labelPerPart="0" obstacle="1" scaleMin="1" limitNumLabels="0" maxNumLabels="2000" obstacleType="0" drawLabels="1" upsidedownLabels="0" fontMinPixelSize="3" minFeatureSize="0" scaleMax="10000000" scaleVisibility="0" zIndex="0"/>
               <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="field" value="label_x" type="QString"/>
-                      <Option name="type" value="2" type="int"/>
+                  <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="QString" name="field" value="label_x"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" value="false" 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="false"/>
+                      <Option type="QString" name="field" value="label_y"/>
+                      <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 description="10KM" 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="">
             <settings>
-              <text-style fontWordSpacing="0" useSubstitutions="0" fontCapitals="0" isExpression="1" fontSizeUnit="Point" fontUnderline="0" previewBkgrdColor="#ffffff" fontFamily="Myriad Pro" fontSize="10" multilineHeight="1" fontItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textColor="255,255,255,255" textOpacity="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0" fontStrikeout="0" fontWeight="63">
-                <text-buffer bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="0" bufferDraw="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeType="0" shapeSizeUnit="MM" shapeDraw="1" shapeJoinStyle="128" shapeOpacity="1" shapeSVGFile="" shapeOffsetUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeX="0.25" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="103,34,144,255" shapeOffsetY="0" shapeRadiiUnit="MM" shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="103,34,144,255" shapeSizeType="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" fontCapitals="0" fontSizeUnit="Point" useSubstitutions="0" isExpression="1" fontItalic="0" fontStrikeout="0" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textOpacity="1" textColor="255,255,255,255" fontWeight="63" fontUnderline="0" multilineHeight="1" namedStyle="Semibold" fontLetterSpacing="0" fontWordSpacing="0" blendMode="0">
+                <text-buffer bufferNoFill="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <background shapeOffsetUnit="MM" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="128" shapeRadiiY="0" shapeType="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeFillColor="103,34,144,255" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeSizeX="0.25" shapeBorderColor="103,34,144,255" shapeBorderWidth="1" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeDraw="1" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiUnit="MM" shapeOpacity="1"/>
+                <shadow shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.7" shadowOffsetAngle="135" shadowRadius="1.5" shadowBlendMode="6" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100"/>
                 <substitutions/>
               </text-style>
-              <text-format decimals="0" addDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="3" wrapChar="" placeDirectionSymbol="0" plussign="0" formatNumbers="0"/>
-              <placement placementFlags="10" offsetType="0" centroidWhole="0" repeatDistanceUnits="MM" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" dist="2" yOffset="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="10" placement="6" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" xOffset="0" fitInPolygonOnly="0" centroidInside="0" maxCurvedCharAngleOut="-20" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" rotationAngle="0"/>
-              <rendering fontLimitPixelSize="0" labelPerPart="0" obstacle="1" zIndex="0" obstacleFactor="2" displayAll="1" maxNumLabels="2000" fontMaxPixelSize="10000" upsidedownLabels="0" limitNumLabels="0" scaleMin="1" minFeatureSize="0" drawLabels="1" mergeLines="0" scaleVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="3" decimals="0"/>
+              <placement quadOffset="4" offsetType="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="10" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceUnits="MM" offsetUnits="MapUnit" centroidWhole="0" maxCurvedCharAngleIn="20" centroidInside="0" xOffset="0" placement="6" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" yOffset="0" dist="2" distUnits="MM" repeatDistance="0"/>
+              <rendering displayAll="1" fontLimitPixelSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="2" labelPerPart="0" obstacle="1" scaleMin="1" limitNumLabels="0" maxNumLabels="2000" obstacleType="0" drawLabels="1" upsidedownLabels="0" fontMinPixelSize="3" minFeatureSize="0" scaleMax="10000000" scaleVisibility="0" zIndex="0"/>
               <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="field" value="label_x" type="QString"/>
-                      <Option name="type" value="2" type="int"/>
+                  <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="QString" name="field" value="label_x"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" value="false" 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="false"/>
+                      <Option type="QString" name="field" value="label_y"/>
+                      <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 description="5KM" 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="">
             <settings>
-              <text-style fontWordSpacing="0" useSubstitutions="0" fontCapitals="0" isExpression="1" fontSizeUnit="Point" fontUnderline="0" previewBkgrdColor="#ffffff" fontFamily="Myriad Pro" fontSize="10" multilineHeight="1" fontItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" textColor="255,255,255,255" textOpacity="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0" fontStrikeout="0" fontWeight="63">
-                <text-buffer bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="0" bufferDraw="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeType="0" shapeSizeUnit="MM" shapeDraw="1" shapeJoinStyle="128" shapeOpacity="1" shapeSVGFile="" shapeOffsetUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeX="0.25" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeOffsetY="0" shapeRadiiUnit="MM" shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="145,211,55,255" shapeSizeType="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" fontCapitals="0" fontSizeUnit="Point" useSubstitutions="0" isExpression="1" fontItalic="0" fontStrikeout="0" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" textOpacity="1" textColor="255,255,255,255" fontWeight="63" fontUnderline="0" multilineHeight="1" namedStyle="Semibold" fontLetterSpacing="0" fontWordSpacing="0" blendMode="0">
+                <text-buffer bufferNoFill="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <background shapeOffsetUnit="MM" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="128" shapeRadiiY="0" shapeType="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeFillColor="145,211,55,255" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeSizeX="0.25" shapeBorderColor="145,211,55,255" shapeBorderWidth="1" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeDraw="1" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiUnit="MM" shapeOpacity="1"/>
+                <shadow shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.7" shadowOffsetAngle="135" shadowRadius="1.5" shadowBlendMode="6" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100"/>
                 <substitutions/>
               </text-style>
-              <text-format decimals="0" addDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="3" wrapChar="" placeDirectionSymbol="0" plussign="0" formatNumbers="0"/>
-              <placement placementFlags="10" offsetType="0" centroidWhole="0" repeatDistanceUnits="MM" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" dist="2" yOffset="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="10" placement="6" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" xOffset="0" fitInPolygonOnly="0" centroidInside="0" maxCurvedCharAngleOut="-20" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" rotationAngle="0"/>
-              <rendering fontLimitPixelSize="0" labelPerPart="0" obstacle="1" zIndex="0" obstacleFactor="2" displayAll="1" maxNumLabels="2000" fontMaxPixelSize="10000" upsidedownLabels="0" limitNumLabels="0" scaleMin="1" minFeatureSize="0" drawLabels="1" mergeLines="0" scaleVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="3" decimals="0"/>
+              <placement quadOffset="4" offsetType="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="10" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceUnits="MM" offsetUnits="MapUnit" centroidWhole="0" maxCurvedCharAngleIn="20" centroidInside="0" xOffset="0" placement="6" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" yOffset="0" dist="2" distUnits="MM" repeatDistance="0"/>
+              <rendering displayAll="1" fontLimitPixelSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="2" labelPerPart="0" obstacle="1" scaleMin="1" limitNumLabels="0" maxNumLabels="2000" obstacleType="0" drawLabels="1" upsidedownLabels="0" fontMinPixelSize="3" minFeatureSize="0" scaleMax="10000000" scaleVisibility="0" zIndex="0"/>
               <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="field" value="label_x" type="QString"/>
-                      <Option name="type" value="2" type="int"/>
+                  <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="QString" name="field" value="label_x"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" value="false" 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="false"/>
+                      <Option type="QString" name="field" value="label_y"/>
+                      <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 description="Always show" key="" active="0">
+          <rule active="0" description="Always show" key="">
             <settings>
-              <text-style fontWordSpacing="0" useSubstitutions="0" fontCapitals="0" isExpression="0" fontSizeUnit="Point" fontUnderline="0" previewBkgrdColor="#ffffff" fontFamily="Roboto Condensed" fontSize="11" multilineHeight="1" fontItalic="1" namedStyle="Italic" fontLetterSpacing="0" fieldName="Name" textColor="0,0,0,255" textOpacity="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0" fontStrikeout="0" fontWeight="50">
-                <text-buffer bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="0" bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeType="0" shapeSizeUnit="MM" shapeDraw="1" shapeJoinStyle="64" shapeOpacity="1" shapeSVGFile="" shapeOffsetUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetY="0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="11" fontCapitals="0" fontSizeUnit="Point" useSubstitutions="0" isExpression="0" fontItalic="1" fontStrikeout="0" fontFamily="Roboto Condensed" previewBkgrdColor="#ffffff" fieldName="Name" textOpacity="1" textColor="0,0,0,255" fontWeight="50" fontUnderline="0" multilineHeight="1" namedStyle="Italic" fontLetterSpacing="0" fontWordSpacing="0" blendMode="0">
+                <text-buffer bufferNoFill="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <background shapeOffsetUnit="MM" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiY="0" shapeType="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeDraw="1" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiUnit="MM" shapeOpacity="1"/>
+                <shadow shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.7" shadowOffsetAngle="135" shadowRadius="1.5" shadowBlendMode="6" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100"/>
                 <substitutions/>
               </text-style>
-              <text-format decimals="3" addDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="3" wrapChar="" placeDirectionSymbol="0" plussign="0" formatNumbers="0"/>
-              <placement placementFlags="10" offsetType="0" centroidWhole="0" repeatDistanceUnits="MM" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" dist="0" yOffset="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="5" placement="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" xOffset="0" fitInPolygonOnly="0" centroidInside="0" maxCurvedCharAngleOut="-25" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" rotationAngle="0"/>
-              <rendering fontLimitPixelSize="0" labelPerPart="0" obstacle="1" zIndex="0" obstacleFactor="1" displayAll="0" maxNumLabels="2000" fontMaxPixelSize="10000" upsidedownLabels="0" limitNumLabels="0" scaleMin="1" minFeatureSize="0" drawLabels="1" mergeLines="0" scaleVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="3" decimals="3"/>
+              <placement quadOffset="4" offsetType="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="5" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceUnits="MM" offsetUnits="MapUnit" centroidWhole="0" maxCurvedCharAngleIn="25" centroidInside="0" xOffset="0" placement="0" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" yOffset="0" dist="0" distUnits="MM" repeatDistance="0"/>
+              <rendering displayAll="0" fontLimitPixelSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" labelPerPart="0" obstacle="1" scaleMin="1" limitNumLabels="0" maxNumLabels="2000" obstacleType="0" drawLabels="1" upsidedownLabels="0" fontMinPixelSize="3" minFeatureSize="0" scaleMax="10000000" scaleVisibility="0" zIndex="0"/>
               <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>
@@ -7470,25 +7443,25 @@ def my_form_open(dialog, layer, feature):
         </rules>
       </labeling>
       <customproperties>
-        <property value="COALESCE(&quot;Text&quot;, '&lt;NULL>')" key="dualview/previewExpressions"/>
+        <property key="dualview/previewExpressions" value="COALESCE(&quot;Text&quot;, '&lt;NULL>')"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory height="15" lineSizeType="MM" opacity="1" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" backgroundAlpha="255" maxScaleDenominator="1e+8" diagramOrientation="Up" width="15" scaleDependency="Area" minimumSize="0" backgroundColor="#ffffff" enabled="0" barWidth="5" penColor="#000000" minScaleDenominator="100000" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penAlpha="255" penWidth="0" sizeType="MM">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" rotationOffset="270" penColor="#000000" backgroundAlpha="255" opacity="1" minScaleDenominator="100000" lineSizeType="MM" diagramOrientation="Up" barWidth="5" maxScaleDenominator="1e+8" minimumSize="0" width="15" height="15" scaleBasedVisibility="0" labelPlacementMethod="XHeight" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundColor="#ffffff">
           <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" field="" label=""/>
+          <attribute label="" color="#000000" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="2" obstacle="0" zIndex="0" placement="0" showAll="1" priority="0">
+      <DiagramLayerSettings priority="0" dist="0" zIndex="0" showAll="1" linePlacementFlags="2" obstacle="0" placement="0">
         <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>
@@ -7497,8 +7470,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>
@@ -7507,8 +7480,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>
@@ -7517,8 +7490,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>
@@ -7527,8 +7500,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>
@@ -7537,8 +7510,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>
@@ -7547,8 +7520,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>
@@ -7557,8 +7530,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>
@@ -7567,8 +7540,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>
@@ -7577,8 +7550,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>
@@ -7587,8 +7560,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>
@@ -7597,8 +7570,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>
@@ -7607,89 +7580,89 @@ 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 name="" index="0" field="Name"/>
-        <alias name="" index="1" field="descriptio"/>
-        <alias name="" index="2" field="timestamp"/>
-        <alias name="" index="3" field="begin"/>
-        <alias name="" index="4" field="end"/>
-        <alias name="" index="5" field="Distance"/>
-        <alias name="" index="6" field="RouteLen"/>
-        <alias name="" index="7" field="length_m"/>
-        <alias name="" index="8" field="length_km"/>
-        <alias name="" index="9" field="Source"/>
-        <alias name="" index="10" field="org_fid"/>
-        <alias name="" index="11" field="distance"/>
+        <alias field="Name" index="0" name=""/>
+        <alias field="descriptio" index="1" name=""/>
+        <alias field="timestamp" index="2" name=""/>
+        <alias field="begin" index="3" name=""/>
+        <alias field="end" index="4" name=""/>
+        <alias field="Distance" index="5" name=""/>
+        <alias field="RouteLen" index="6" name=""/>
+        <alias field="length_m" index="7" name=""/>
+        <alias field="length_km" index="8" name=""/>
+        <alias field="Source" index="9" name=""/>
+        <alias field="org_fid" index="10" name=""/>
+        <alias field="distance" index="11" name=""/>
       </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 field="Name" expression="" applyOnUpdate="0"/>
+        <default field="descriptio" expression="" applyOnUpdate="0"/>
+        <default field="timestamp" expression="" applyOnUpdate="0"/>
+        <default field="begin" expression="" applyOnUpdate="0"/>
+        <default field="end" expression="" applyOnUpdate="0"/>
+        <default field="Distance" expression="" applyOnUpdate="0"/>
+        <default field="RouteLen" expression="" applyOnUpdate="0"/>
+        <default field="length_m" expression="" applyOnUpdate="0"/>
+        <default field="length_km" expression="" applyOnUpdate="0"/>
+        <default field="Source" expression="" applyOnUpdate="0"/>
+        <default field="org_fid" expression="" applyOnUpdate="0"/>
+        <default field="distance" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="Name" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="descriptio" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="timestamp" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="begin" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="end" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="Distance" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="RouteLen" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="length_m" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="length_km" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="Source" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="org_fid" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="distance" notnull_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="Name" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="descriptio" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="timestamp" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="begin" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="end" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="Distance" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="RouteLen" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="length_m" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="length_km" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="Source" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="org_fid" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="distance" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="Name"/>
-        <constraint exp="" desc="" field="descriptio"/>
-        <constraint exp="" desc="" field="timestamp"/>
-        <constraint exp="" desc="" field="begin"/>
-        <constraint exp="" desc="" field="end"/>
-        <constraint exp="" desc="" field="Distance"/>
-        <constraint exp="" desc="" field="RouteLen"/>
-        <constraint exp="" desc="" field="length_m"/>
-        <constraint exp="" desc="" field="length_km"/>
-        <constraint exp="" desc="" field="Source"/>
-        <constraint exp="" desc="" field="org_fid"/>
-        <constraint exp="" desc="" 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>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;distance&quot;" actionWidgetStyle="dropDown" sortOrder="1">
+      <attributetableconfig sortExpression="&quot;distance&quot;" sortOrder="1" actionWidgetStyle="dropDown">
         <columns>
-          <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"/>
+          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" hidden="0" name="org_fid" width="-1"/>
+          <column type="field" hidden="0" name="distance" width="-1"/>
+          <column type="field" hidden="0" name="Name" width="-1"/>
+          <column type="field" hidden="0" name="Source" width="-1"/>
+          <column type="field" hidden="0" name="RouteLen" width="-1"/>
+          <column type="field" hidden="0" name="descriptio" width="-1"/>
+          <column type="field" hidden="0" name="timestamp" width="-1"/>
+          <column type="field" hidden="0" name="begin" width="-1"/>
+          <column type="field" hidden="0" name="end" width="-1"/>
+          <column type="field" hidden="0" name="Distance" width="-1"/>
+          <column type="field" hidden="0" name="length_m" width="-1"/>
+          <column type="field" hidden="0" name="length_km" width="-1"/>
         </columns>
       </attributetableconfig>
       <editform tolerant="1"></editform>
@@ -7716,32 +7689,32 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="Distance" editable="1"/>
-        <field name="Name" editable="1"/>
-        <field name="RouteLen" editable="1"/>
-        <field name="Source" editable="1"/>
-        <field name="begin" editable="1"/>
-        <field name="descriptio" editable="1"/>
-        <field name="distance" editable="1"/>
-        <field name="end" editable="1"/>
-        <field name="length_km" editable="1"/>
-        <field name="length_m" editable="1"/>
-        <field name="org_fid" editable="1"/>
-        <field name="timestamp" editable="1"/>
+        <field editable="1" name="Distance"/>
+        <field editable="1" name="Name"/>
+        <field editable="1" name="RouteLen"/>
+        <field editable="1" name="Source"/>
+        <field editable="1" name="begin"/>
+        <field editable="1" name="descriptio"/>
+        <field editable="1" name="distance"/>
+        <field editable="1" name="end"/>
+        <field editable="1" name="length_km"/>
+        <field editable="1" name="length_m"/>
+        <field editable="1" name="org_fid"/>
+        <field editable="1" name="timestamp"/>
       </editable>
       <labelOnTop>
-        <field name="Distance" labelOnTop="0"/>
-        <field name="Name" labelOnTop="0"/>
-        <field name="RouteLen" labelOnTop="0"/>
-        <field name="Source" labelOnTop="0"/>
-        <field name="begin" labelOnTop="0"/>
-        <field name="descriptio" labelOnTop="0"/>
-        <field name="distance" labelOnTop="0"/>
-        <field name="end" labelOnTop="0"/>
-        <field name="length_km" labelOnTop="0"/>
-        <field name="length_m" labelOnTop="0"/>
-        <field name="org_fid" labelOnTop="0"/>
-        <field name="timestamp" labelOnTop="0"/>
+        <field labelOnTop="0" name="Distance"/>
+        <field labelOnTop="0" name="Name"/>
+        <field labelOnTop="0" name="RouteLen"/>
+        <field labelOnTop="0" name="Source"/>
+        <field labelOnTop="0" name="begin"/>
+        <field labelOnTop="0" name="descriptio"/>
+        <field labelOnTop="0" name="distance"/>
+        <field labelOnTop="0" name="end"/>
+        <field labelOnTop="0" name="length_km"/>
+        <field labelOnTop="0" name="length_m"/>
+        <field labelOnTop="0" name="org_fid"/>
+        <field labelOnTop="0" name="timestamp"/>
       </labelOnTop>
       <widgets/>
       <conditionalstyles>
@@ -7752,7 +7725,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
       <mapTip>Text</mapTip>
     </maplayer>
-    <maplayer maxScale="0" refreshOnNotifyMessage="" geometry="Polygon" simplifyLocal="1" simplifyDrawingHints="1" type="vector" simplifyMaxScale="1" simplifyAlgorithm="0" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" autoRefreshEnabled="0" autoRefreshTime="0" minScale="1e+8" readOnly="0">
+    <maplayer autoRefreshEnabled="0" refreshOnNotifyMessage="" type="vector" simplifyLocal="1" autoRefreshTime="0" readOnly="0" geometry="Polygon" labelsEnabled="1" minScale="1e+8" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" maxScale="0" simplifyMaxScale="1" simplifyAlgorithm="0" simplifyDrawingHints="1">
       <extent>
         <xmin>18.37549461152003971</xmin>
         <ymin>-33.94162201868364548</ymin>
@@ -7809,7 +7782,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxz="0" minx="0" dimensions="2" maxx="0" crs="" maxy="0" miny="0" minz="0"/>
+          <spatial maxz="0" maxx="0" minx="0" crs="" miny="0" maxy="0" dimensions="2" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -7833,44 +7806,44 @@ def my_form_open(dialog, layer, feature):
       <renderer-v2 type="nullSymbol"/>
       <labeling type="simple">
         <settings>
-          <text-style fontWordSpacing="0" useSubstitutions="0" fontCapitals="0" isExpression="0" fontSizeUnit="Point" fontUnderline="0" previewBkgrdColor="#ffffff" fontFamily="Myriad Pro" fontSize="8" multilineHeight="1" fontItalic="0" namedStyle="Bold" fontLetterSpacing="0" fieldName="label" textColor="31,120,180,255" textOpacity="0.8" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0" fontStrikeout="0" fontWeight="75">
-            <text-buffer bufferSizeUnits="MM" bufferOpacity="0.4" bufferNoFill="0" bufferDraw="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="0.75" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <background shapeType="0" shapeSizeUnit="MM" shapeDraw="1" shapeJoinStyle="128" shapeOpacity="0.5" shapeSVGFile="" shapeOffsetUnit="MM" shapeSizeY="0.5" shapeRotation="0" shapeSizeX="0.5" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="31,120,180,255" shapeOffsetY="0" shapeRadiiUnit="MM" shapeBorderWidth="0.75" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,0" shapeSizeType="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="8" fontCapitals="0" fontSizeUnit="Point" useSubstitutions="0" isExpression="0" fontItalic="0" fontStrikeout="0" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" fieldName="label" textOpacity="0.8" textColor="31,120,180,255" fontWeight="75" fontUnderline="0" multilineHeight="1" namedStyle="Bold" fontLetterSpacing="0" fontWordSpacing="0" blendMode="0">
+            <text-buffer bufferNoFill="0" bufferSize="0.75" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="1" bufferColor="255,255,255,255" bufferOpacity="0.4"/>
+            <background shapeOffsetUnit="MM" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="128" shapeRadiiY="0" shapeType="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeFillColor="255,255,255,0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeSizeX="0.5" shapeBorderColor="31,120,180,255" shapeBorderWidth="0.75" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.5" shapeDraw="1" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiUnit="MM" shapeOpacity="0.5"/>
+            <shadow shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.7" shadowOffsetAngle="135" shadowRadius="1.5" shadowBlendMode="6" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100"/>
             <substitutions/>
           </text-style>
-          <text-format decimals="3" addDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="1" wrapChar="" placeDirectionSymbol="0" plussign="0" formatNumbers="0"/>
-          <placement placementFlags="10" offsetType="0" centroidWhole="1" repeatDistanceUnits="MM" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" dist="2" yOffset="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="1" priority="5" placement="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" xOffset="1" fitInPolygonOnly="0" centroidInside="0" maxCurvedCharAngleOut="-25" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" rotationAngle="0"/>
-          <rendering fontLimitPixelSize="0" labelPerPart="0" obstacle="1" zIndex="5" obstacleFactor="0.76" displayAll="0" maxNumLabels="6" fontMaxPixelSize="10000" upsidedownLabels="0" limitNumLabels="0" scaleMin="1" minFeatureSize="0" drawLabels="1" mergeLines="0" scaleVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3"/>
+          <text-format placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="1" decimals="3"/>
+          <placement quadOffset="1" offsetType="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="5" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" repeatDistanceUnits="MM" offsetUnits="MapUnit" centroidWhole="1" maxCurvedCharAngleIn="25" centroidInside="0" xOffset="1" placement="0" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" yOffset="0" dist="2" distUnits="MM" repeatDistance="0"/>
+          <rendering displayAll="0" fontLimitPixelSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="0.76" labelPerPart="0" obstacle="1" scaleMin="1" limitNumLabels="0" maxNumLabels="6" obstacleType="0" drawLabels="1" upsidedownLabels="0" fontMinPixelSize="3" minFeatureSize="0" scaleMax="10000000" scaleVisibility="0" zIndex="5"/>
           <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="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 height="15" lineSizeType="MM" opacity="1" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" backgroundAlpha="255" maxScaleDenominator="1e+8" diagramOrientation="Up" width="15" scaleDependency="Area" minimumSize="0" backgroundColor="#ffffff" enabled="0" barWidth="5" penColor="#000000" minScaleDenominator="-2.14748e+9" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" penAlpha="255" penWidth="0" sizeType="MM">
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" rotationOffset="270" penColor="#000000" backgroundAlpha="255" opacity="1" minScaleDenominator="-2.14748e+9" lineSizeType="MM" diagramOrientation="Up" barWidth="5" maxScaleDenominator="1e+8" minimumSize="0" width="15" height="15" scaleBasedVisibility="0" labelPlacementMethod="XHeight" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundColor="#ffffff">
           <fontProperties description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" field="" label=""/>
+          <attribute label="" color="#000000" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="2" obstacle="0" zIndex="0" placement="0" showAll="1" priority="0">
+      <DiagramLayerSettings priority="0" dist="0" zIndex="0" showAll="1" linePlacementFlags="2" obstacle="0" placement="0">
         <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>
@@ -7879,8 +7852,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>
@@ -7889,8 +7862,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>
@@ -7899,44 +7872,44 @@ 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 name="" index="0" field="id"/>
-        <alias name="" index="1" field="table_set"/>
-        <alias name="" index="2" field="label"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="table_set" index="1" name=""/>
+        <alias field="label" index="2" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="table_set"/>
-        <default expression="" applyOnUpdate="0" field="label"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="table_set" expression="" applyOnUpdate="0"/>
+        <default field="label" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="id" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="table_set" notnull_strength="0"/>
-        <constraint unique_strength="0" exp_strength="0" constraints="0" field="label" notnull_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="table_set" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="label" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="table_set"/>
-        <constraint exp="" desc="" field="label"/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="table_set" exp=""/>
+        <constraint desc="" field="label" exp=""/>
       </constraintExpressions>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <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 type="field" hidden="0" name="id" width="-1"/>
+          <column type="actions" hidden="1" width="-1"/>
+          <column type="field" hidden="0" name="table_set" width="-1"/>
+          <column type="field" hidden="0" name="label" width="-1"/>
         </columns>
       </attributetableconfig>
       <editform tolerant="1">.</editform>
@@ -7963,14 +7936,14 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="label" editable="1"/>
-        <field name="table_set" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="label"/>
+        <field editable="1" name="table_set"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="label" labelOnTop="0"/>
-        <field name="table_set" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="label"/>
+        <field labelOnTop="0" name="table_set"/>
       </labelOnTop>
       <widgets/>
       <conditionalstyles>
@@ -8002,53 +7975,83 @@ def my_form_open(dialog, layer, feature):
     <layer id="poi_labels_59d3855d_466f_419c_8119_94b9ad7c140d"/>
   </layerorder>
   <properties>
-    <WMSAccessConstraints type="QString">None</WMSAccessConstraints>
-    <DefaultStyles>
-      <ColorRamp type="QString"></ColorRamp>
-      <Fill type="QString"></Fill>
-      <AlphaInt type="int">255</AlphaInt>
-      <Marker type="QString"></Marker>
-      <Line type="QString"></Line>
-      <Opacity type="double">1</Opacity>
-      <RandomColors type="bool">true</RandomColors>
-    </DefaultStyles>
+    <WMSContactOrganization type="QString"></WMSContactOrganization>
+    <WCSUrl type="QString"></WCSUrl>
+    <WFSLayers type="QStringList"/>
+    <WMSContactMail type="QString"></WMSContactMail>
     <Variables>
-      <variableNames type="QStringList"/>
       <variableValues type="QStringList"/>
+      <variableNames type="QStringList"/>
     </Variables>
-    <WMSSegmentizeFeatureInfoGeometry type="bool">false</WMSSegmentizeFeatureInfoGeometry>
-    <WMSContactPerson type="QString"></WMSContactPerson>
-    <WMSContactPhone type="QString"></WMSContactPhone>
-    <WMSImageQuality type="int">90</WMSImageQuality>
-    <WMSContactPosition type="QString"></WMSContactPosition>
-    <WMSFees type="QString">conditions unknown</WMSFees>
-    <WMSUseLayerIDs type="bool">false</WMSUseLayerIDs>
-    <Gui>
-      <SelectionColorBluePart type="int">0</SelectionColorBluePart>
-      <CanvasColorBluePart type="int">255</CanvasColorBluePart>
-      <SelectionColorAlphaPart type="int">255</SelectionColorAlphaPart>
-      <CanvasColorRedPart type="int">255</CanvasColorRedPart>
-      <CanvasColorGreenPart type="int">255</CanvasColorGreenPart>
-      <SelectionColorRedPart type="int">255</SelectionColorRedPart>
-      <SelectionColorGreenPart type="int">255</SelectionColorGreenPart>
-    </Gui>
+    <WMSUrl type="QString"></WMSUrl>
+    <Paths>
+      <Absolute type="bool">false</Absolute>
+    </Paths>
+    <WMSServiceAbstract type="QString"></WMSServiceAbstract>
+    <WFSTLayers>
+      <Insert type="QStringList"/>
+      <Update type="QStringList"/>
+      <Delete type="QStringList"/>
+    </WFSTLayers>
     <Macros>
       <pythonCode type="QString"></pythonCode>
     </Macros>
-    <WMSUrl type="QString"></WMSUrl>
+    <WMSFees type="QString">conditions unknown</WMSFees>
+    <Measure>
+      <Ellipsoid type="QString">WGS84</Ellipsoid>
+    </Measure>
+    <DefaultStyles>
+      <Marker type="QString"></Marker>
+      <Fill type="QString"></Fill>
+      <AlphaInt type="int">255</AlphaInt>
+      <Line type="QString"></Line>
+      <ColorRamp type="QString"></ColorRamp>
+      <RandomColors type="bool">true</RandomColors>
+      <Opacity type="double">1</Opacity>
+    </DefaultStyles>
     <WMSPrecision type="QString">8</WMSPrecision>
-    <WMSServiceTitle type="QString"></WMSServiceTitle>
+    <WMSAccessConstraints type="QString">None</WMSAccessConstraints>
     <Grid>
-      <Enabled type="bool">false</Enabled>
-      <MarginUnit type="QString">MM</MarginUnit>
-      <MapUnits type="int">0</MapUnits>
-      <IntervalY type="double">10</IntervalY>
-      <AnnotationFrameDistance type="double">0</AnnotationFrameDistance>
-      <Style type="int">0</Style>
-      <AnnotationDirection type="int">0</AnnotationDirection>
       <AnnotationPrecision type="int">0</AnnotationPrecision>
-      <AnnotationFont type="QString">Roboto Condensed,,16,-1,5,50,0,0,0,0,0</AnnotationFont>
+      <OffsetX type="double">0</OffsetX>
+      <LineSymbol type="QString">&lt;symbol clip_to_extent="1" type="line" alpha="1" name="line symbol">
+ &lt;layer pass="0" class="SimpleLine" enabled="1" locked="0">
+  &lt;prop k="capstyle" v="square"/>
+  &lt;prop k="customdash" v="5;2"/>
+  &lt;prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+  &lt;prop k="customdash_unit" v="MM"/>
+  &lt;prop k="draw_inside_polygon" v="0"/>
+  &lt;prop k="joinstyle" v="bevel"/>
+  &lt;prop k="line_color" v="35,35,35,255"/>
+  &lt;prop k="line_style" v="solid"/>
+  &lt;prop k="line_width" v="0.26"/>
+  &lt;prop k="line_width_unit" v="MM"/>
+  &lt;prop k="offset" v="0"/>
+  &lt;prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+  &lt;prop k="offset_unit" v="MM"/>
+  &lt;prop k="use_custom_dash" v="0"/>
+  &lt;prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+  &lt;data_defined_properties>
+   &lt;Option type="Map">
+    &lt;Option type="QString" value="" name="name"/>
+    &lt;Option name="properties"/>
+    &lt;Option type="QString" value="collection" name="type"/>
+   &lt;/Option>
+  &lt;/data_defined_properties>
+ &lt;/layer>
+&lt;/symbol>
+</LineSymbol>
+      <ShowAnnotation type="bool">false</ShowAnnotation>
+      <Style type="int">0</Style>
+      <MarginUnit type="QString">MM</MarginUnit>
+      <Enabled type="bool">false</Enabled>
+      <OffsetY type="double">0</OffsetY>
       <Placement type="int">1</Placement>
+      <IntervalX type="double">10</IntervalX>
+      <AnnotationDirection type="int">0</AnnotationDirection>
+      <IntervalY type="double">10</IntervalY>
+      <MapUnits type="int">0</MapUnits>
+      <AnnotationFrameDistance type="double">0</AnnotationFrameDistance>
       <MarkerSymbol type="QString">&lt;symbol clip_to_extent="1" type="marker" alpha="1" name="marker symbol">
  &lt;layer pass="0" class="SimpleMarker" enabled="1" locked="0">
   &lt;prop k="angle" v="0"/>
@@ -8079,52 +8082,80 @@ def my_form_open(dialog, layer, feature):
  &lt;/layer>
 &lt;/symbol>
 </MarkerSymbol>
-      <LineSymbol type="QString">&lt;symbol clip_to_extent="1" type="line" alpha="1" name="line symbol">
- &lt;layer pass="0" class="SimpleLine" enabled="1" locked="0">
-  &lt;prop k="capstyle" v="square"/>
-  &lt;prop k="customdash" v="5;2"/>
-  &lt;prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-  &lt;prop k="customdash_unit" v="MM"/>
-  &lt;prop k="draw_inside_polygon" v="0"/>
-  &lt;prop k="joinstyle" v="bevel"/>
-  &lt;prop k="line_color" v="35,35,35,255"/>
-  &lt;prop k="line_style" v="solid"/>
-  &lt;prop k="line_width" v="0.26"/>
-  &lt;prop k="line_width_unit" v="MM"/>
-  &lt;prop k="offset" v="0"/>
-  &lt;prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-  &lt;prop k="offset_unit" v="MM"/>
-  &lt;prop k="use_custom_dash" v="0"/>
-  &lt;prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-  &lt;data_defined_properties>
-   &lt;Option type="Map">
-    &lt;Option type="QString" value="" name="name"/>
-    &lt;Option name="properties"/>
-    &lt;Option type="QString" value="collection" name="type"/>
-   &lt;/Option>
-  &lt;/data_defined_properties>
- &lt;/layer>
-&lt;/symbol>
-</LineSymbol>
-      <ShowAnnotation type="bool">false</ShowAnnotation>
-      <OffsetY type="double">0</OffsetY>
-      <IntervalX type="double">10</IntervalX>
-      <OffsetX type="double">0</OffsetX>
+      <AnnotationFont type="QString">Roboto Condensed,,16,-1,5,50,0,0,0,0,0</AnnotationFont>
     </Grid>
-    <PositionPrecision>
-      <Automatic type="bool">true</Automatic>
-      <DecimalPlaces type="int">2</DecimalPlaces>
-      <DegreeFormat type="QString">MU</DegreeFormat>
-    </PositionPrecision>
-    <WFSLayers type="QStringList"/>
+    <WMSRequestDefinedDataSources type="bool">false</WMSRequestDefinedDataSources>
+    <WMSContactPhone type="QString"></WMSContactPhone>
+    <PAL>
+      <DrawOutlineLabels type="bool">true</DrawOutlineLabels>
+      <CandidatesPolygon type="int">30</CandidatesPolygon>
+      <DrawRectOnly type="bool">false</DrawRectOnly>
+      <CandidatesPoint type="int">16</CandidatesPoint>
+      <SearchMethod type="int">0</SearchMethod>
+      <ShowingAllLabels type="bool">false</ShowingAllLabels>
+      <CandidatesLine type="int">50</CandidatesLine>
+      <ShowingCandidates type="bool">false</ShowingCandidates>
+      <ShowingPartialsLabels type="bool">true</ShowingPartialsLabels>
+    </PAL>
+    <Measurement>
+      <AreaUnits type="QString">&lt;unknown></AreaUnits>
+      <DistanceUnits type="QString">&lt;unknown></DistanceUnits>
+    </Measurement>
+    <WMSServiceCapabilities type="bool">false</WMSServiceCapabilities>
     <WMSKeywordList type="QStringList">
       <value></value>
     </WMSKeywordList>
+    <RequiredLayers>
+      <Layers type="QStringList">
+        <value>water_tables20170921142016467</value>
+        <value>fencing_504d8fa2_bdeb_4951_b151_966d5d257666</value>
+        <value>fence_groups_b08dad12_5ae6_4ba8_b737_e74b37bd274c</value>
+        <value>GDAL_City_of_Cape_Town_2015_Aerial20160928085834970</value>
+        <value>all_routes20170907054841602</value>
+        <value>Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d</value>
+        <value>osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18</value>
+        <value>marshal_overviews_shp20160930210331241</value>
+        <value>osm_places20160930221519937</value>
+      </Layers>
+    </RequiredLayers>
+    <WMSUseLayerIDs type="bool">false</WMSUseLayerIDs>
+    <Mask>
+      <layer_id type="QString"></layer_id>
+      <parameters type="QString">KGxwMApJMDAKYUkxCmFJNQphSTAxCmFGMS4wCmFJMDAKYU5hTmEobHAxCmFOYUkyCmFJMAphTmFOYS4=</parameters>
+    </Mask>
+    <Identify>
+      <disabledLayers type="QStringList"/>
+    </Identify>
+    <WMSAddWktGeometry type="bool">false</WMSAddWktGeometry>
+    <WMSContactPosition type="QString"></WMSContactPosition>
+    <WMSImageQuality type="int">90</WMSImageQuality>
     <WFSUrl type="QString"></WFSUrl>
-    <WCSUrl type="QString"></WCSUrl>
+    <PositionPrecision>
+      <Automatic type="bool">true</Automatic>
+      <DegreeFormat type="QString">MU</DegreeFormat>
+      <DecimalPlaces type="int">2</DecimalPlaces>
+    </PositionPrecision>
+    <WCSLayers type="QStringList"/>
+    <WMSContactPerson type="QString"></WMSContactPerson>
+    <Gui>
+      <CanvasColorGreenPart type="int">255</CanvasColorGreenPart>
+      <CanvasColorRedPart type="int">255</CanvasColorRedPart>
+      <CanvasColorBluePart type="int">255</CanvasColorBluePart>
+      <SelectionColorBluePart type="int">0</SelectionColorBluePart>
+      <SelectionColorRedPart type="int">255</SelectionColorRedPart>
+      <SelectionColorAlphaPart type="int">255</SelectionColorAlphaPart>
+      <SelectionColorGreenPart type="int">255</SelectionColorGreenPart>
+    </Gui>
+    <WMSSegmentizeFeatureInfoGeometry type="bool">false</WMSSegmentizeFeatureInfoGeometry>
+    <SpatialRefSys>
+      <ProjectionsEnabled type="int">1</ProjectionsEnabled>
+      <ProjectCrs type="QString">EPSG:3857</ProjectCrs>
+      <ProjectCRSProj4String type="QString">+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</ProjectCRSProj4String>
+      <ProjectCRSID type="int">3857</ProjectCRSID>
+    </SpatialRefSys>
     <Digitizing>
-      <SnappingMode type="QString">current_layer</SnappingMode>
-      <DefaultSnapTolerance type="double">0</DefaultSnapTolerance>
+      <AvoidIntersectionsList type="QStringList"/>
+      <DefaultSnapType type="QString">off</DefaultSnapType>
       <LayerSnapToList type="QStringList">
         <value>to_vertex_and_segment</value>
         <value>to_vertex_and_segment</value>
@@ -8139,23 +8170,7 @@ def my_form_open(dialog, layer, feature):
         <value>to_vertex_and_segment</value>
         <value>to_vertex_and_segment</value>
       </LayerSnapToList>
-      <AvoidIntersectionsList type="QStringList"/>
-      <LayerSnappingList type="QStringList">
-        <value>20170907___Gun_Run_10km_10km_kmz_LineString20170907054652280</value>
-        <value>20170907___Gun_Run_21_21km_kmz_LineString20170907054546428</value>
-        <value>20170907___Gun_Run_5km_Gun_Run_5K_kmz_LineString20170907054709477</value>
-        <value>all_routes20170907054841602</value>
-        <value>extra_security20170921130834191</value>
-        <value>fencing_areas20160930180843078</value>
-        <value>marshal_overviews_shp20160930210331241</value>
-        <value>marshal_positions20160930121322287</value>
-        <value>osm_places20160930221519937</value>
-        <value>osm_roads20170921182231228</value>
-        <value>route_markers20171001130518852</value>
-        <value>water_tables20170921142016467</value>
-      </LayerSnappingList>
-      <DefaultSnapType type="QString">off</DefaultSnapType>
-      <DefaultSnapToleranceUnit type="int">2</DefaultSnapToleranceUnit>
+      <SnappingMode type="QString">current_layer</SnappingMode>
       <LayerSnappingToleranceList type="QStringList">
         <value>0.000000</value>
         <value>0.000000</value>
@@ -8170,6 +8185,7 @@ def my_form_open(dialog, layer, feature):
         <value>0.000000</value>
         <value>0.000000</value>
       </LayerSnappingToleranceList>
+      <DefaultSnapTolerance type="double">0</DefaultSnapTolerance>
       <LayerSnappingEnabledList type="QStringList">
         <value>disabled</value>
         <value>disabled</value>
@@ -8184,7 +8200,6 @@ def my_form_open(dialog, layer, feature):
         <value>disabled</value>
         <value>disabled</value>
       </LayerSnappingEnabledList>
-      <TopologicalEditing type="int">0</TopologicalEditing>
       <LayerSnappingToleranceUnitList type="QStringList">
         <value>2</value>
         <value>2</value>
@@ -8199,277 +8214,235 @@ def my_form_open(dialog, layer, feature):
         <value>2</value>
         <value>2</value>
       </LayerSnappingToleranceUnitList>
-    </Digitizing>
-    <WMSAddWktGeometry type="bool">false</WMSAddWktGeometry>
-    <Measure>
-      <Ellipsoid type="QString">WGS84</Ellipsoid>
-    </Measure>
-    <RequiredLayers>
-      <Layers type="QStringList">
-        <value>water_tables20170921142016467</value>
-        <value>fencing_504d8fa2_bdeb_4951_b151_966d5d257666</value>
-        <value>fence_groups_b08dad12_5ae6_4ba8_b737_e74b37bd274c</value>
-        <value>GDAL_City_of_Cape_Town_2015_Aerial20160928085834970</value>
+      <LayerSnappingList type="QStringList">
+        <value>20170907___Gun_Run_10km_10km_kmz_LineString20170907054652280</value>
+        <value>20170907___Gun_Run_21_21km_kmz_LineString20170907054546428</value>
+        <value>20170907___Gun_Run_5km_Gun_Run_5K_kmz_LineString20170907054709477</value>
         <value>all_routes20170907054841602</value>
-        <value>Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d</value>
-        <value>osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18</value>
+        <value>extra_security20170921130834191</value>
+        <value>fencing_areas20160930180843078</value>
         <value>marshal_overviews_shp20160930210331241</value>
+        <value>marshal_positions20160930121322287</value>
         <value>osm_places20160930221519937</value>
-      </Layers>
-    </RequiredLayers>
-    <WMSServiceCapabilities type="bool">false</WMSServiceCapabilities>
-    <WMSContactOrganization type="QString"></WMSContactOrganization>
-    <WFSTLayers>
-      <Delete type="QStringList"/>
-      <Update type="QStringList"/>
-      <Insert type="QStringList"/>
-    </WFSTLayers>
-    <WMSOnlineResource type="QString"></WMSOnlineResource>
-    <WMSServiceAbstract type="QString"></WMSServiceAbstract>
-    <WMSContactMail type="QString"></WMSContactMail>
-    <Mask>
-      <layer_id type="QString"></layer_id>
-      <parameters type="QString">KGxwMApJMDAKYUkxCmFJNQphSTAxCmFGMS4wCmFJMDAKYU5hTmEobHAxCmFOYUkyCmFJMAphTmFOYS4=</parameters>
-    </Mask>
-    <Measurement>
-      <AreaUnits type="QString">&lt;unknown></AreaUnits>
-      <DistanceUnits type="QString">&lt;unknown></DistanceUnits>
-    </Measurement>
+        <value>osm_roads20170921182231228</value>
+        <value>route_markers20171001130518852</value>
+        <value>water_tables20170921142016467</value>
+      </LayerSnappingList>
+      <DefaultSnapToleranceUnit type="int">2</DefaultSnapToleranceUnit>
+      <TopologicalEditing type="int">0</TopologicalEditing>
+    </Digitizing>
     <Legend>
       <filterByMap type="bool">false</filterByMap>
     </Legend>
-    <Identify>
-      <disabledLayers type="QStringList"/>
-    </Identify>
-    <PAL>
-      <ShowingCandidates type="bool">false</ShowingCandidates>
-      <DrawOutlineLabels type="bool">true</DrawOutlineLabels>
-      <SearchMethod type="int">0</SearchMethod>
-      <ShowingAllLabels type="bool">false</ShowingAllLabels>
-      <CandidatesLine type="int">50</CandidatesLine>
-      <CandidatesPolygon type="int">30</CandidatesPolygon>
-      <CandidatesPoint type="int">16</CandidatesPoint>
-      <ShowingPartialsLabels type="bool">true</ShowingPartialsLabels>
-      <DrawRectOnly type="bool">false</DrawRectOnly>
-    </PAL>
-    <WCSLayers type="QStringList"/>
-    <Paths>
-      <Absolute type="bool">false</Absolute>
-    </Paths>
-    <SpatialRefSys>
-      <ProjectionsEnabled type="int">1</ProjectionsEnabled>
-      <ProjectCRSID type="int">3857</ProjectCRSID>
-      <ProjectCRSProj4String type="QString">+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</ProjectCRSProj4String>
-      <ProjectCrs type="QString">EPSG:3857</ProjectCrs>
-    </SpatialRefSys>
-    <WMSRequestDefinedDataSources type="bool">false</WMSRequestDefinedDataSources>
+    <WMSServiceTitle type="QString"></WMSServiceTitle>
+    <WMSOnlineResource type="QString"></WMSOnlineResource>
   </properties>
   <visibility-presets>
     <visibility-preset name="Access Routes" has-expanded-info="1">
-      <layer style="default" expanded="0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer style="default" expanded="1" id="residents_access_roads_a7a1b453_729e_4ac7_bb64_95381b84aa35"/>
-      <expanded-legend-nodes id="residents_access_roads_a7a1b453_729e_4ac7_bb64_95381b84aa35"/>
-      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
       <checked-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18">
         <checked-legend-node id="{c37e51d1-6158-4d1c-800c-b9f70f8487d8}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="residents_access_roads_a7a1b453_729e_4ac7_bb64_95381b84aa35" expanded="1" style="default"/>
+      <expanded-legend-nodes id="residents_access_roads_a7a1b453_729e_4ac7_bb64_95381b84aa35"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="0" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
         <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Marshal pages"/>
         <expanded-group-node id="Residents Access"/>
         <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshal pages"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Map"/>
         <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Ask Me" has-expanded-info="1">
-      <layer style="default" expanded="0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer style="default" expanded="1" id="directions_to_start_cf338b4b_1403_45e8_b11f_47b48dd39657"/>
+      <layer id="osm_places20160930221519937" expanded="1" style="default"/>
+      <expanded-legend-nodes id="osm_places20160930221519937"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="directions_to_start_cf338b4b_1403_45e8_b11f_47b48dd39657" expanded="1" style="default"/>
       <expanded-legend-nodes id="directions_to_start_cf338b4b_1403_45e8_b11f_47b48dd39657">
         <expanded-legend-node id="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
       </expanded-legend-nodes>
-      <layer style="default" expanded="1" id="poi_labels_59d3855d_466f_419c_8119_94b9ad7c140d"/>
+      <layer id="poi_labels_59d3855d_466f_419c_8119_94b9ad7c140d" expanded="1" style="default"/>
       <expanded-legend-nodes id="poi_labels_59d3855d_466f_419c_8119_94b9ad7c140d"/>
-      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" expanded="1" id="osm_places20160930221519937"/>
-      <expanded-legend-nodes id="osm_places20160930221519937"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="0" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
         <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Residents Access"/>
-        <expanded-group-node id="Ask Me"/>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Marshal pages"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Residents Access"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
         <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Ask Me"/>
+        <expanded-group-node id="Routes/Markers"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Fencing" has-expanded-info="1">
-      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer id="osm_places20160930221519937" expanded="0" style="default"/>
+      <expanded-legend-nodes id="osm_places20160930221519937"/>
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="1" style="default"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer style="default" expanded="1" id="all_routes20170907054841602"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="water_tables20170921142016467" expanded="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="all_routes20170907054841602" expanded="1" style="default"/>
       <expanded-legend-nodes id="all_routes20170907054841602">
         <expanded-legend-node id="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
       </expanded-legend-nodes>
-      <layer style="default" expanded="1" id="fencing_504d8fa2_bdeb_4951_b151_966d5d257666"/>
+      <layer id="route_markers_a5e14af7_58c2_4a9e_8e4a_d8d9a41d2bb6" expanded="1" style="default"/>
+      <expanded-legend-nodes id="route_markers_a5e14af7_58c2_4a9e_8e4a_d8d9a41d2bb6"/>
+      <layer id="fencing_504d8fa2_bdeb_4951_b151_966d5d257666" expanded="1" style="default"/>
       <checked-legend-nodes id="fencing_504d8fa2_bdeb_4951_b151_966d5d257666">
         <checked-legend-node id="{9da1c54c-0ca9-4db9-a722-ce3f53ccd358}"/>
-        <checked-legend-node id="{b3b38ee9-c245-4839-b078-3b966a2a5c4e}"/>
         <checked-legend-node id="{bb4463e8-e33a-4475-878c-fd2d7b636418}"/>
+        <checked-legend-node id="{b3b38ee9-c245-4839-b078-3b966a2a5c4e}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_504d8fa2_bdeb_4951_b151_966d5d257666">
         <expanded-legend-node id="{6f66f64e-a034-49f3-a480-0837e467ccae}"/>
       </expanded-legend-nodes>
-      <layer style="default" expanded="1" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" expanded="1" id="route_markers_a5e14af7_58c2_4a9e_8e4a_d8d9a41d2bb6"/>
-      <expanded-legend-nodes id="route_markers_a5e14af7_58c2_4a9e_8e4a_d8d9a41d2bb6"/>
-      <layer style="default" expanded="0" id="osm_places20160930221519937"/>
-      <expanded-legend-nodes id="osm_places20160930221519937"/>
       <expanded-group-nodes>
         <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Elevation"/>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Marshal pages"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
         <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Marshal map - inset" has-expanded-info="1">
-      <layer style="default" expanded="0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="osm_places20160930221519937" expanded="1" style="default"/>
+      <expanded-legend-nodes id="osm_places20160930221519937"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" expanded="1" id="all_routes20170907054841602"/>
+      <layer id="water_tables20170921142016467" expanded="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="all_routes20170907054841602" expanded="1" style="default"/>
       <expanded-legend-nodes id="all_routes20170907054841602">
         <expanded-legend-node id="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
       </expanded-legend-nodes>
-      <layer style="default" expanded="1" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" expanded="1" id="route_markers_a5e14af7_58c2_4a9e_8e4a_d8d9a41d2bb6"/>
+      <layer id="route_markers_a5e14af7_58c2_4a9e_8e4a_d8d9a41d2bb6" expanded="1" style="default"/>
       <expanded-legend-nodes id="route_markers_a5e14af7_58c2_4a9e_8e4a_d8d9a41d2bb6"/>
-      <layer style="default" expanded="1" id="osm_places20160930221519937"/>
-      <expanded-legend-nodes id="osm_places20160930221519937"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="0" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
         <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Marshal pages"/>
         <expanded-group-node id="Residents Access"/>
         <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshal pages"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Map"/>
         <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Marshal map - main" has-expanded-info="1">
-      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" expanded="1" id="extra_security20170921130834191"/>
-      <expanded-legend-nodes id="extra_security20170921130834191"/>
-      <layer style="default" expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer id="osm_places20160930221519937" expanded="1" style="default"/>
+      <expanded-legend-nodes id="osm_places20160930221519937"/>
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="1" style="default"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer style="default" expanded="1" id="marshal_positions20160930121322287"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="extra_security20170921130834191" expanded="1" style="default"/>
+      <expanded-legend-nodes id="extra_security20170921130834191"/>
+      <layer id="water_tables20170921142016467" expanded="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="marshal_positions20160930121322287" expanded="1" style="default"/>
       <expanded-legend-nodes id="marshal_positions20160930121322287"/>
-      <layer style="default" expanded="1" id="all_routes20170907054841602"/>
+      <layer id="all_routes20170907054841602" expanded="1" style="default"/>
       <expanded-legend-nodes id="all_routes20170907054841602">
         <expanded-legend-node id="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
       </expanded-legend-nodes>
-      <layer style="default" expanded="1" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" expanded="1" id="route_markers_a5e14af7_58c2_4a9e_8e4a_d8d9a41d2bb6"/>
+      <layer id="route_markers_a5e14af7_58c2_4a9e_8e4a_d8d9a41d2bb6" expanded="1" style="default"/>
       <expanded-legend-nodes id="route_markers_a5e14af7_58c2_4a9e_8e4a_d8d9a41d2bb6"/>
-      <layer style="default" expanded="1" id="osm_places20160930221519937"/>
-      <expanded-legend-nodes id="osm_places20160930221519937"/>
       <expanded-group-nodes>
         <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Marshal pages"/>
         <expanded-group-node id="Residents Access"/>
         <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshal pages"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Map"/>
         <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Marshal overview" has-expanded-info="1">
-      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" expanded="1" id="extra_security20170921130834191"/>
-      <expanded-legend-nodes id="extra_security20170921130834191"/>
-      <layer style="default" expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer id="osm_places20160930221519937" expanded="0" style="default"/>
+      <expanded-legend-nodes id="osm_places20160930221519937"/>
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="1" style="default"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer style="default" expanded="1" id="marshal_positions20160930121322287"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="extra_security20170921130834191" expanded="1" style="default"/>
+      <expanded-legend-nodes id="extra_security20170921130834191"/>
+      <layer id="water_tables20170921142016467" expanded="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="marshal_positions20160930121322287" expanded="1" style="default"/>
       <expanded-legend-nodes id="marshal_positions20160930121322287"/>
-      <layer style="default" expanded="1" id="all_routes20170907054841602"/>
+      <layer id="all_routes20170907054841602" expanded="1" style="default"/>
       <expanded-legend-nodes id="all_routes20170907054841602">
         <expanded-legend-node id="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
       </expanded-legend-nodes>
-      <layer style="default" expanded="1" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" expanded="1" id="route_markers_a5e14af7_58c2_4a9e_8e4a_d8d9a41d2bb6"/>
+      <layer id="route_markers_a5e14af7_58c2_4a9e_8e4a_d8d9a41d2bb6" expanded="1" style="default"/>
       <expanded-legend-nodes id="route_markers_a5e14af7_58c2_4a9e_8e4a_d8d9a41d2bb6"/>
-      <layer style="default" expanded="0" id="osm_places20160930221519937"/>
-      <expanded-legend-nodes id="osm_places20160930221519937"/>
       <expanded-group-nodes>
         <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Elevation"/>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Marshal pages"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
         <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Routes" has-expanded-info="1">
-      <layer style="default" expanded="0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="osm_places20160930221519937" expanded="0" style="default"/>
+      <expanded-legend-nodes id="osm_places20160930221519937"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" expanded="1" id="all_routes20170907054841602"/>
+      <layer id="water_tables20170921142016467" expanded="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="all_routes20170907054841602" expanded="1" style="default"/>
       <expanded-legend-nodes id="all_routes20170907054841602">
         <expanded-legend-node id="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
       </expanded-legend-nodes>
-      <layer style="default" expanded="1" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" expanded="1" id="route_markers_a5e14af7_58c2_4a9e_8e4a_d8d9a41d2bb6"/>
+      <layer id="route_markers_a5e14af7_58c2_4a9e_8e4a_d8d9a41d2bb6" expanded="1" style="default"/>
       <expanded-legend-nodes id="route_markers_a5e14af7_58c2_4a9e_8e4a_d8d9a41d2bb6"/>
-      <layer style="default" expanded="0" id="osm_places20160930221519937"/>
-      <expanded-legend-nodes id="osm_places20160930221519937"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="0" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
         <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Elevation"/>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Marshal pages"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
         <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
       </expanded-group-nodes>
     </visibility-preset>
   </visibility-presets>
@@ -8496,12 +8469,12 @@ def my_form_open(dialog, layer, feature):
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout name="Routes" printResolution="192" worldFileMap="" units="mm">
-      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
-      <Grid offsetX="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetY="0"/>
+    <Layout worldFileMap="" printResolution="192" name="Routes" units="mm">
+      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
+      <Grid offsetY="0" offsetUnits="mm" resolution="10" offsetX="0" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" type="fill" alpha="1" clip_to_extent="1">
-          <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+        <symbol type="fill" clip_to_extent="1" name="" alpha="1">
+          <layer class="SimpleFill" enabled="1" pass="0" 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"/>
@@ -8515,130 +8488,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 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 position="0,0,mm" frameJoinStyle="miter" templateUuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" visibility="1" opacity="1" type="65638" uuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" background="true" groupUuid="" positionOnPage="0,0,mm" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" excludeFromExports="0" positionLock="false" zValue="0" blendMode="0" size="297,210,mm">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem zValue="0" background="true" type="65638" frameJoinStyle="miter" size="297,210,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="0,0,mm" uuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" templateUuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" excludeFromExports="0" position="0,0,mm" itemRotation="0" positionLock="false" id="" blendMode="0">
+          <FrameColor green="0" blue="0" red="0" alpha="255"/>
+          <BackgroundColor green="255" blue="255" red="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" units="mm" orientation="2" position="0"/>
+          <Guide page="0" position="0" units="mm" orientation="2"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem position="12.7639,188.018,mm" frameJoinStyle="miter" templateUuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" visibility="1" opacity="1" valign="64" type="65641" uuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" background="false" groupUuid="" positionOnPage="12.7639,188.018,mm" marginY="1" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" halign="1" excludeFromExports="0" positionLock="true" zValue="9" labelText="[%&quot;Distance&quot;%]" blendMode="0" size="14.6625,7.071,mm" htmlState="0" marginX="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="9" marginY="1" background="false" type="65641" frameJoinStyle="miter" size="14.6625,7.071,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" labelText="[%&quot;Distance&quot;%]" referencePoint="0" valign="64" visibility="1" positionOnPage="12.7639,188.018,mm" uuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" templateUuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" htmlState="0" excludeFromExports="0" position="12.7639,188.018,mm" itemRotation="0" positionLock="true" halign="1" id="" blendMode="0" marginX="1">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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 description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
-        <FontColor blue="0" red="0" green="0"/>
+        <FontColor green="0" blue="0" red="0"/>
       </LayoutItem>
-      <LayoutItem position="27.4264,188.118,mm" frameJoinStyle="miter" templateUuid="{d9f4225c-620f-4a62-a293-599f109f5206}" visibility="1" opacity="1" valign="64" type="65641" uuid="{d9f4225c-620f-4a62-a293-599f109f5206}" background="false" groupUuid="" positionOnPage="27.4264,188.118,mm" marginY="1" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" halign="1" excludeFromExports="0" positionLock="true" zValue="8" labelText="RACE ROUTE" blendMode="0" size="28.8048,6.8714,mm" htmlState="0" marginX="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="8" marginY="1" background="false" type="65641" frameJoinStyle="miter" size="28.8048,6.8714,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" labelText="RACE ROUTE" referencePoint="0" valign="64" visibility="1" positionOnPage="27.4264,188.118,mm" uuid="{d9f4225c-620f-4a62-a293-599f109f5206}" templateUuid="{d9f4225c-620f-4a62-a293-599f109f5206}" htmlState="0" excludeFromExports="0" position="27.4264,188.118,mm" itemRotation="0" positionLock="true" halign="1" id="" blendMode="0" marginX="1">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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 description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" red="0" green="0"/>
+        <FontColor green="0" blue="0" red="0"/>
       </LayoutItem>
-      <LayoutItem position="228.202,188.218,mm" frameJoinStyle="miter" templateUuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" visibility="1" opacity="1" valign="32" type="65641" uuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" background="false" groupUuid="" positionOnPage="228.202,188.218,mm" marginY="1" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" halign="2" excludeFromExports="0" positionLock="true" zValue="6" labelText="REVISION 3.0" blendMode="0" size="27.7839,6.8714,mm" htmlState="0" marginX="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="6" marginY="1" background="false" type="65641" frameJoinStyle="miter" size="27.7839,6.8714,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" labelText="REVISION 3.0" referencePoint="0" valign="32" visibility="1" positionOnPage="228.202,188.218,mm" uuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" templateUuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" htmlState="0" excludeFromExports="0" position="228.202,188.218,mm" itemRotation="0" positionLock="true" halign="2" id="" blendMode="0" marginX="1">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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 description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" red="0" green="0"/>
+        <FontColor green="0" blue="0" red="0"/>
       </LayoutItem>
-      <LayoutItem position="204.316,195.489,mm" frameJoinStyle="miter" templateUuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" visibility="1" opacity="1" valign="64" type="65641" uuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" background="false" groupUuid="" positionOnPage="204.316,195.489,mm" marginY="1" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" halign="2" excludeFromExports="0" positionLock="true" zValue="5" labelText="Sunday, 14 October 2018" blendMode="0" size="51.6706,6.60801,mm" htmlState="0" marginX="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="5" marginY="1" background="false" type="65641" frameJoinStyle="miter" size="51.6706,6.60801,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" labelText="Sunday, 14 October 2018" referencePoint="0" valign="64" visibility="1" positionOnPage="204.316,195.489,mm" uuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" templateUuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" htmlState="0" excludeFromExports="0" position="204.316,195.489,mm" itemRotation="0" positionLock="true" halign="2" id="" blendMode="0" marginX="1">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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 description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" red="0" green="0"/>
+        <FontColor green="0" blue="0" red="0"/>
       </LayoutItem>
-      <LayoutItem position="258.483,187.425,mm" northOffset="0" resizeMode="0" frameJoinStyle="miter" templateUuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" visibility="1" opacity="1" file="../Gun_Run_Logo_2018.png" type="65640" uuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" background="false" groupUuid="" positionOnPage="258.483,187.425,mm" itemRotation="0" anchorPoint="4" svgBorderWidth="0.2" referencePoint="0" pictureWidth="29.7021" frame="false" id="" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" excludeFromExports="0" svgBorderColor="0,0,0,255" positionLock="true" zValue="4" mapUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" northMode="0" blendMode="0" pictureRotation="0" size="29.7523,17.4718,mm" pictureHeight="17.4718">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="4" svgFillColor="255,255,255,255" background="false" type="65640" frameJoinStyle="miter" pictureRotation="0" size="29.7523,17.4718,mm" groupUuid="" outlineWidthM="0.3,mm" svgBorderColor="0,0,0,255" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="258.483,187.425,mm" uuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" templateUuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" excludeFromExports="0" position="258.483,187.425,mm" northOffset="0" pictureHeight="17.4718" svgBorderWidth="0.2" itemRotation="0" positionLock="true" mapUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" northMode="0" resizeMode="0" file="../Gun_Run_Logo_2018.png" id="" blendMode="0" pictureWidth="29.7021" anchorPoint="4">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option 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 position="12.9139,195.239,mm" shapeType="1" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" templateUuid="{5e005555-54ea-40fd-a5a7-20254950b890}" visibility="1" opacity="1" type="65643" uuid="{5e005555-54ea-40fd-a5a7-20254950b890}" background="false" groupUuid="" positionOnPage="12.9139,195.239,mm" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" excludeFromExports="0" positionLock="true" zValue="3" blendMode="0" size="242.922,0.1,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="3" background="false" type="65643" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" size="242.922,0.1,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="12.9139,195.239,mm" uuid="{5e005555-54ea-40fd-a5a7-20254950b890}" templateUuid="{5e005555-54ea-40fd-a5a7-20254950b890}" shapeType="1" excludeFromExports="0" position="12.9139,195.239,mm" itemRotation="0" positionLock="true" id="" blendMode="0">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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="" type="fill" alpha="1" clip_to_extent="1">
-          <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+        <symbol type="fill" clip_to_extent="1" name="" alpha="1">
+          <layer class="SimpleFill" enabled="1" pass="0" 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"/>
@@ -8652,64 +8625,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 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 position="8.86559,6.09761,mm" frameJoinStyle="miter" templateUuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" visibility="1" opacity="1" type="65639" uuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" background="false" groupUuid="" positionOnPage="8.86559,6.09761,mm" mapRotation="0" followPreset="true" itemRotation="0" referencePoint="0" frame="true" id="" outlineWidthM="0.3,mm" excludeFromExports="0" positionLock="true" zValue="2" keepLayerSet="false" blendMode="0" size="67.7828,166.874,mm" followPresetName="Routes" drawCanvasItems="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="2" background="false" type="65639" frameJoinStyle="miter" size="67.7828,166.874,mm" groupUuid="" outlineWidthM="0.3,mm" frame="true" opacity="1" referencePoint="0" visibility="1" positionOnPage="8.86559,6.09761,mm" uuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" templateUuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" keepLayerSet="false" excludeFromExports="0" position="8.86559,6.09761,mm" itemRotation="0" mapRotation="0" positionLock="true" drawCanvasItems="false" followPresetName="Routes" id="" followPreset="true" blendMode="0">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '22000'&#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 '22000'&#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 '2045260.277'&#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 '2045260.277'&#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 '-4021624.475'&#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 '-4021624.475'&#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="2050333.25980100058950484" ymin="-4018530.32327284989878535" xmin="2048166.31620243540965021" ymax="-4013195.54002301394939423"/>
+        <Extent ymin="-4018530.32327284989878535" xmin="2048166.31620243540965021" xmax="2050333.25980100058950484" ymax="-4013195.54002301394939423"/>
         <LayerSet/>
-        <ComposerMapGrid bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" gridFrameWidth="2" leftAnnotationDisplay="0" bottomAnnotationDirection="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" unit="0" gridFramePenThickness="0.5" frameAnnotationDistance="1" annotationPrecision="3" showAnnotation="0" annotationFormat="0" topAnnotationPosition="1" rightAnnotationPosition="1" annotationFontColor="0,0,0,255" frameFillColor1="255,255,255,255" topAnnotationDirection="0" gridFrameStyle="0" intervalX="0" bottomFrameDivisions="0" rightAnnotationDirection="0" gridStyle="0" topFrameDivisions="0" leftAnnotationDirection="0" show="0" rightFrameDivisions="0" name="Grid 1" offsetX="0" annotationExpression="" leftAnnotationPosition="1" crossLength="3" blendMode="0" rightAnnotationDisplay="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" intervalY="0" leftFrameDivisions="0" gridFrameSideFlags="15" offsetY="0">
+        <ComposerMapGrid crossLength="3" annotationExpression="" topFrameDivisions="0" offsetX="0" leftAnnotationPosition="1" rightAnnotationPosition="1" gridFramePenThickness="0.5" topAnnotationPosition="1" bottomFrameDivisions="0" leftFrameDivisions="0" bottomAnnotationDirection="0" blendMode="0" annotationFormat="0" gridFrameStyle="0" topAnnotationDisplay="0" bottomAnnotationPosition="1" gridFrameWidth="2" show="0" rightAnnotationDirection="0" unit="0" gridFrameSideFlags="15" intervalY="0" bottomAnnotationDisplay="0" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" leftAnnotationDirection="0" annotationFontColor="0,0,0,255" rightFrameDivisions="0" frameFillColor2="0,0,0,255" showAnnotation="0" intervalX="0" frameAnnotationDistance="1" offsetY="0" leftAnnotationDisplay="0" rightAnnotationDisplay="0" gridStyle="0" annotationPrecision="3" name="Grid 1" frameFillColor1="255,255,255,255" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}">
           <lineStyle>
-            <symbol name="" type="line" alpha="1" clip_to_extent="1">
-              <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+            <symbol type="line" clip_to_extent="1" name="" alpha="1">
+              <layer class="SimpleLine" enabled="1" pass="0" locked="0">
                 <prop v="square" k="capstyle"/>
                 <prop v="5;2" k="customdash"/>
                 <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -8727,17 +8700,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 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="" type="marker" alpha="1" clip_to_extent="1">
-              <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
+            <symbol type="marker" clip_to_extent="1" name="" alpha="1">
+              <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
                 <prop v="0" k="angle"/>
                 <prop v="0,0,0,255" k="color"/>
                 <prop v="1" k="horizontal_anchor_point"/>
@@ -8758,9 +8731,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 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>
@@ -8768,43 +8741,43 @@ def my_form_open(dialog, layer, feature):
           </markerStyle>
           <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="1" margin="0.05" scalingMode="2"/>
+        <AtlasMap margin="0.05" atlasDriven="1" scalingMode="2"/>
       </LayoutItem>
-      <LayoutItem position="12.7639,10.411,mm" frameJoinStyle="miter" templateUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" visibility="1" opacity="1" type="65639" uuid="{b35d820c-6054-4426-a840-5216bed2ca94}" background="true" groupUuid="" positionOnPage="12.7639,10.411,mm" mapRotation="0" followPreset="true" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" excludeFromExports="0" positionLock="false" zValue="1" keepLayerSet="false" blendMode="0" size="275.472,177.014,mm" followPresetName="Routes" drawCanvasItems="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="1" background="true" type="65639" frameJoinStyle="miter" size="275.472,177.014,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="12.7639,10.411,mm" uuid="{b35d820c-6054-4426-a840-5216bed2ca94}" templateUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" keepLayerSet="false" excludeFromExports="0" position="12.7639,10.411,mm" itemRotation="0" mapRotation="0" positionLock="false" drawCanvasItems="false" followPresetName="Routes" id="" followPreset="true" blendMode="0">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '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="true"/>
+                  <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="true" 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="true"/>
+                  <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="true" 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="true"/>
+                  <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="2050392.80700224405154586" ymin="-4016466.77900000009685755" xmin="2048192.80700000002980232" ymax="-4015053.09112637676298618"/>
+        <Extent ymin="-4016466.77900000009685755" xmin="2048192.80700000002980232" xmax="2050392.80700224405154586" ymax="-4015053.09112637676298618"/>
         <LayerSet/>
-        <ComposerMapGrid bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" gridFrameWidth="2" leftAnnotationDisplay="0" bottomAnnotationDirection="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" unit="0" gridFramePenThickness="0.5" frameAnnotationDistance="1" annotationPrecision="3" showAnnotation="0" annotationFormat="0" topAnnotationPosition="1" rightAnnotationPosition="1" annotationFontColor="0,0,0,255" frameFillColor1="255,255,255,255" topAnnotationDirection="0" gridFrameStyle="0" intervalX="0" bottomFrameDivisions="0" rightAnnotationDirection="0" gridStyle="0" topFrameDivisions="0" leftAnnotationDirection="0" show="0" rightFrameDivisions="0" name="Grid 1" offsetX="0" annotationExpression="" leftAnnotationPosition="1" crossLength="3" blendMode="0" rightAnnotationDisplay="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" intervalY="0" leftFrameDivisions="0" gridFrameSideFlags="15" offsetY="0">
+        <ComposerMapGrid crossLength="3" annotationExpression="" topFrameDivisions="0" offsetX="0" leftAnnotationPosition="1" rightAnnotationPosition="1" gridFramePenThickness="0.5" topAnnotationPosition="1" bottomFrameDivisions="0" leftFrameDivisions="0" bottomAnnotationDirection="0" blendMode="0" annotationFormat="0" gridFrameStyle="0" topAnnotationDisplay="0" bottomAnnotationPosition="1" gridFrameWidth="2" show="0" rightAnnotationDirection="0" unit="0" gridFrameSideFlags="15" intervalY="0" bottomAnnotationDisplay="0" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" leftAnnotationDirection="0" annotationFontColor="0,0,0,255" rightFrameDivisions="0" frameFillColor2="0,0,0,255" showAnnotation="0" intervalX="0" frameAnnotationDistance="1" offsetY="0" leftAnnotationDisplay="0" rightAnnotationDisplay="0" gridStyle="0" annotationPrecision="3" name="Grid 1" frameFillColor1="255,255,255,255" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}">
           <lineStyle>
-            <symbol name="" type="line" alpha="1" clip_to_extent="1">
-              <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+            <symbol type="line" clip_to_extent="1" name="" alpha="1">
+              <layer class="SimpleLine" enabled="1" pass="0" locked="0">
                 <prop v="square" k="capstyle"/>
                 <prop v="5;2" k="customdash"/>
                 <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -8822,17 +8795,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 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="" type="marker" alpha="1" clip_to_extent="1">
-              <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
+            <symbol type="marker" clip_to_extent="1" name="" alpha="1">
+              <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
                 <prop v="0" k="angle"/>
                 <prop v="0,0,0,255" k="color"/>
                 <prop v="1" k="horizontal_anchor_point"/>
@@ -8853,9 +8826,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 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>
@@ -8863,26 +8836,26 @@ def my_form_open(dialog, layer, feature):
           </markerStyle>
           <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="1" margin="0.10000000000000001" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="1" scalingMode="2"/>
       </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 coverageLayerSource="/home/tim/Documents/GunRunMaps/GIS base files and routes/all_routes.shp" coverageLayerProvider="ogr" hideCoverage="0" coverageLayer="all_routes20170907054841602" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21)' )" filterFeatures="1" sortKey="RouteLen" pageNameExpression="&quot;Distance&quot;" sortFeatures="1" enabled="1" coverageLayerName="all_routes" filenamePattern="'Gun Run 2018 - '||&quot;RouteLen&quot;||'KM rev '" sortAscending="0"/>
+      <Atlas filenamePattern="'Gun Run 2018 - '||&quot;RouteLen&quot;||'KM rev '" sortKey="RouteLen" sortAscending="0" sortFeatures="1" enabled="1" coverageLayer="all_routes20170907054841602" hideCoverage="0" pageNameExpression="&quot;Distance&quot;" coverageLayerProvider="ogr" coverageLayerName="all_routes" coverageLayerSource="/home/tim/Documents/Projects/2018/Gun Run/Maps/GIS base files and routes/all_routes.shp" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21)' )" filterFeatures="1"/>
     </Layout>
-    <Layout name="Marshals" printResolution="120" worldFileMap="" units="mm">
-      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
-      <Grid offsetX="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetY="0"/>
+    <Layout worldFileMap="" printResolution="120" name="Marshals" units="mm">
+      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
+      <Grid offsetY="0" offsetUnits="mm" resolution="10" offsetX="0" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" type="fill" alpha="1" clip_to_extent="1">
-          <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+        <symbol type="fill" clip_to_extent="1" name="" alpha="1">
+          <layer class="SimpleFill" enabled="1" pass="0" 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"/>
@@ -8896,22 +8869,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 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 position="0,0,mm" frameJoinStyle="miter" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" visibility="1" opacity="1" type="65638" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" background="true" groupUuid="" positionOnPage="0,0,mm" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" excludeFromExports="0" positionLock="false" zValue="0" blendMode="0" size="280.83,198.549,mm">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem zValue="0" background="true" type="65638" frameJoinStyle="miter" size="280.83,198.549,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="0,0,mm" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" excludeFromExports="0" position="0,0,mm" itemRotation="0" positionLock="false" id="" blendMode="0">
+          <FrameColor green="0" blue="0" red="0" alpha="255"/>
+          <BackgroundColor green="255" blue="255" red="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/>
@@ -8919,15 +8892,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem positionLock="true" outlineWidthM="0.1,mm" splitLayer="0" groupUuid="" lineSpacing="1" titleAlignment="1" referencePoint="0" type="65642" itemRotation="0" wrapChar="" size="19.9422,26,mm" excludeFromExports="0" wmsLegendHeight="25" symbolHeight="4" legendFilterByAtlas="0" frameJoinStyle="bevel" opacity="1" id="" wmsLegendWidth="50" title="" symbolWidth="7" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" rasterBorderColor="0,0,0,255" position="128.239,3.58,mm" visibility="1" rasterBorderWidth="0" rasterBorder="1" zValue="5" equalColumnWidth="1" fontColor="#000000" columnSpace="2" positionOnPage="128.239,3.58,mm" columnCount="1" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" blendMode="0" resizeToContents="1" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" frame="true" boxSpace="2" background="true">
-        <FrameColor alpha="255" blue="128" red="128" green="128"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem lineSpacing="1" itemRotation="0" referencePoint="0" equalColumnWidth="1" splitLayer="0" wmsLegendHeight="25" groupUuid="" id="" title="" symbolWidth="7" positionLock="true" blendMode="0" background="true" boxSpace="2" rasterBorderColor="0,0,0,255" frameJoinStyle="bevel" rasterBorderWidth="0" titleAlignment="1" size="19.9422,26,mm" opacity="1" position="128.239,3.58,mm" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" wrapChar="" positionOnPage="128.239,3.58,mm" resizeToContents="1" symbolHeight="4" visibility="1" zValue="5" columnSpace="2" frame="true" type="65642" wmsLegendWidth="50" rasterBorder="1" legendFilterByAtlas="0" columnCount="1" excludeFromExports="0" outlineWidthM="0.1,mm" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" fontColor="#000000" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}">
+        <FrameColor green="128" blue="128" red="128" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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/>
@@ -8945,45 +8918,45 @@ def my_form_open(dialog, layer, feature):
           <style name="symbol" marginTop="2">
             <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
           </style>
-          <style name="symbolLabel" marginTop="2" marginLeft="2">
+          <style name="symbolLabel" marginLeft="2" marginTop="2">
             <styleFont description="Myriad Pro,8,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties/>
-          <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" name="Routes" expanded="1">
             <customproperties/>
-            <layer-tree-layer name="all_routes" source="./all_routes.shp" providerKey="ogr" expanded="1" checked="Qt::Checked" id="all_routes20170907054841602">
+            <layer-tree-layer id="all_routes20170907054841602" checked="Qt::Checked" source="./all_routes.shp" providerKey="ogr" name="all_routes" expanded="1">
               <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 position="102.986,142.175,mm" frameJoinStyle="miter" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" visibility="1" opacity="1" type="65639" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" background="false" groupUuid="" positionOnPage="102.986,142.175,mm" mapRotation="0" followPreset="true" itemRotation="0" referencePoint="0" frame="true" id="" outlineWidthM="0.2,mm" excludeFromExports="0" positionLock="true" zValue="4" keepLayerSet="false" blendMode="0" size="50.4055,50.7436,mm" followPresetName="Marshal map - inset" drawCanvasItems="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="4" background="false" type="65639" frameJoinStyle="miter" size="50.4055,50.7436,mm" groupUuid="" outlineWidthM="0.2,mm" frame="true" opacity="1" referencePoint="0" visibility="1" positionOnPage="102.986,142.175,mm" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" keepLayerSet="false" excludeFromExports="0" position="102.986,142.175,mm" itemRotation="0" mapRotation="0" positionLock="true" drawCanvasItems="false" followPresetName="Marshal map - inset" id="" followPreset="true" blendMode="0">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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="2048641.13804376311600208" ymin="-4016806.15934272995218635" xmin="2047541.13804264133796096" ymax="-4015698.78098011249676347"/>
+        <Extent ymin="-4016806.15934272995218635" xmin="2047541.13804264133796096" xmax="2048641.13804376311600208" ymax="-4015698.78098011249676347"/>
         <LayerSet/>
-        <ComposerMapGrid bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" gridFrameWidth="2" leftAnnotationDisplay="0" bottomAnnotationDirection="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" unit="0" gridFramePenThickness="0.5" frameAnnotationDistance="1" annotationPrecision="3" showAnnotation="0" annotationFormat="0" topAnnotationPosition="1" rightAnnotationPosition="1" annotationFontColor="0,0,0,255" frameFillColor1="255,255,255,255" topAnnotationDirection="0" gridFrameStyle="0" intervalX="0" bottomFrameDivisions="0" rightAnnotationDirection="0" gridStyle="0" topFrameDivisions="0" leftAnnotationDirection="0" show="0" rightFrameDivisions="0" name="Grid 1" offsetX="0" annotationExpression="" leftAnnotationPosition="1" crossLength="3" blendMode="0" rightAnnotationDisplay="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" intervalY="0" leftFrameDivisions="0" gridFrameSideFlags="15" offsetY="0">
+        <ComposerMapGrid crossLength="3" annotationExpression="" topFrameDivisions="0" offsetX="0" leftAnnotationPosition="1" rightAnnotationPosition="1" gridFramePenThickness="0.5" topAnnotationPosition="1" bottomFrameDivisions="0" leftFrameDivisions="0" bottomAnnotationDirection="0" blendMode="0" annotationFormat="0" gridFrameStyle="0" topAnnotationDisplay="0" bottomAnnotationPosition="1" gridFrameWidth="2" show="0" rightAnnotationDirection="0" unit="0" gridFrameSideFlags="15" intervalY="0" bottomAnnotationDisplay="0" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" leftAnnotationDirection="0" annotationFontColor="0,0,0,255" rightFrameDivisions="0" frameFillColor2="0,0,0,255" showAnnotation="0" intervalX="0" frameAnnotationDistance="1" offsetY="0" leftAnnotationDisplay="0" rightAnnotationDisplay="0" gridStyle="0" annotationPrecision="3" name="Grid 1" frameFillColor1="255,255,255,255" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}">
           <lineStyle>
-            <symbol name="" type="line" alpha="1" clip_to_extent="1">
-              <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+            <symbol type="line" clip_to_extent="1" name="" alpha="1">
+              <layer class="SimpleLine" enabled="1" pass="0" locked="0">
                 <prop v="square" k="capstyle"/>
                 <prop v="5;2" k="customdash"/>
                 <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -9001,17 +8974,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 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="" type="marker" alpha="1" clip_to_extent="1">
-              <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
+            <symbol type="marker" clip_to_extent="1" name="" alpha="1">
+              <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
                 <prop v="0" k="angle"/>
                 <prop v="0,0,0,255" k="color"/>
                 <prop v="1" k="horizontal_anchor_point"/>
@@ -9032,9 +9005,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 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>
@@ -9042,9 +9015,9 @@ def my_form_open(dialog, layer, feature):
           </markerStyle>
           <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
         </ComposerMapGrid>
-        <ComposerMapOverview blendMode="0" name="Overview 1" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" show="1" inverted="0" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" centered="1">
-          <symbol name="" type="fill" alpha="1" clip_to_extent="1">
-            <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+        <ComposerMapOverview frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" blendMode="0" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" inverted="0" centered="1" show="1" name="Overview 1">
+          <symbol type="fill" clip_to_extent="1" name="" alpha="1">
+            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="0,0,255,75" k="color"/>
               <prop v="bevel" k="joinstyle"/>
@@ -9058,35 +9031,35 @@ 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 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>
         </ComposerMapOverview>
-        <AtlasMap atlasDriven="1" margin="0.10000000000000001" scalingMode="0"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="1" scalingMode="0"/>
       </LayoutItem>
-      <LayoutItem position="3.53,6.0007,mm" frameJoinStyle="miter" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" visibility="1" opacity="1" type="65639" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" background="false" groupUuid="" positionOnPage="3.53,6.0007,mm" mapRotation="0" followPreset="true" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" excludeFromExports="0" positionLock="true" zValue="3" keepLayerSet="false" blendMode="0" size="142,181,mm" followPresetName="Marshal map - main" drawCanvasItems="true">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="3" background="false" type="65639" frameJoinStyle="miter" size="142,181,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="3.53,6.0007,mm" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" keepLayerSet="false" excludeFromExports="0" position="3.53,6.0007,mm" itemRotation="0" mapRotation="0" positionLock="true" drawCanvasItems="true" followPresetName="Marshal map - main" id="" followPreset="true" blendMode="0">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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="2048204.73804331803694367" ymin="-4016397.27016156911849976" xmin="2047977.53804308641701937" ymax="-4016107.67016127333045006"/>
+        <Extent ymin="-4016397.27016156911849976" xmin="2047977.53804308641701937" xmax="2048204.73804331803694367" ymax="-4016107.67016127333045006"/>
         <LayerSet/>
-        <ComposerMapGrid bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" gridFrameWidth="2" leftAnnotationDisplay="0" bottomAnnotationDirection="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" unit="0" gridFramePenThickness="0.5" frameAnnotationDistance="1" annotationPrecision="3" showAnnotation="0" annotationFormat="0" topAnnotationPosition="1" rightAnnotationPosition="1" annotationFontColor="0,0,0,255" frameFillColor1="255,255,255,255" topAnnotationDirection="0" gridFrameStyle="0" intervalX="0" bottomFrameDivisions="0" rightAnnotationDirection="0" gridStyle="0" topFrameDivisions="0" leftAnnotationDirection="0" show="0" rightFrameDivisions="0" name="Grid 1" offsetX="0" annotationExpression="" leftAnnotationPosition="1" crossLength="3" blendMode="0" rightAnnotationDisplay="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" intervalY="0" leftFrameDivisions="0" gridFrameSideFlags="15" offsetY="0">
+        <ComposerMapGrid crossLength="3" annotationExpression="" topFrameDivisions="0" offsetX="0" leftAnnotationPosition="1" rightAnnotationPosition="1" gridFramePenThickness="0.5" topAnnotationPosition="1" bottomFrameDivisions="0" leftFrameDivisions="0" bottomAnnotationDirection="0" blendMode="0" annotationFormat="0" gridFrameStyle="0" topAnnotationDisplay="0" bottomAnnotationPosition="1" gridFrameWidth="2" show="0" rightAnnotationDirection="0" unit="0" gridFrameSideFlags="15" intervalY="0" bottomAnnotationDisplay="0" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" leftAnnotationDirection="0" annotationFontColor="0,0,0,255" rightFrameDivisions="0" frameFillColor2="0,0,0,255" showAnnotation="0" intervalX="0" frameAnnotationDistance="1" offsetY="0" leftAnnotationDisplay="0" rightAnnotationDisplay="0" gridStyle="0" annotationPrecision="3" name="Grid 1" frameFillColor1="255,255,255,255" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}">
           <lineStyle>
-            <symbol name="" type="line" alpha="1" clip_to_extent="1">
-              <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+            <symbol type="line" clip_to_extent="1" name="" alpha="1">
+              <layer class="SimpleLine" enabled="1" pass="0" locked="0">
                 <prop v="square" k="capstyle"/>
                 <prop v="5;2" k="customdash"/>
                 <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -9104,17 +9077,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 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="" type="marker" alpha="1" clip_to_extent="1">
-              <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
+            <symbol type="marker" clip_to_extent="1" name="" alpha="1">
+              <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
                 <prop v="0" k="angle"/>
                 <prop v="0,0,0,255" k="color"/>
                 <prop v="1" k="horizontal_anchor_point"/>
@@ -9135,9 +9108,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 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>
@@ -9145,83 +9118,83 @@ def my_form_open(dialog, layer, feature):
           </markerStyle>
           <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="1" margin="0.10000000000000001" scalingMode="0"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="1" scalingMode="0"/>
       </LayoutItem>
-      <LayoutItem position="277.3,6.0007,mm" frameJoinStyle="round" sectionHeight="159.418" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" visibility="1" opacity="1" type="65647" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" hidePageIfEmpty="0" background="false" sectionWidth="127.436" groupUuid="" positionOnPage="277.3,6.0007,mm" hideBackgroundIfEmpty="0" itemRotation="0" referencePoint="2" sectionY="0" frame="false" id="" outlineWidthM="0.3,mm" excludeFromExports="0" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" sectionX="0" positionLock="true" zValue="2" blendMode="0" size="127.436,159.418,mm" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}">
-        <FrameColor alpha="255" blue="119" red="119" green="119"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="2" background="false" type="65647" frameJoinStyle="round" size="127.436,159.418,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" hidePageIfEmpty="0" referencePoint="2" visibility="1" positionOnPage="277.3,6.0007,mm" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" sectionWidth="127.436" excludeFromExports="0" position="277.3,6.0007,mm" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" itemRotation="0" hideBackgroundIfEmpty="0" positionLock="true" sectionHeight="159.418" sectionX="0" sectionY="0" id="" blendMode="0">
+        <FrameColor green="119" blue="119" red="119" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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 position="230.194,167.419,mm" northOffset="0" resizeMode="0" frameJoinStyle="miter" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" visibility="1" opacity="1" file="../Gun_Run_Logo_2018.png" type="65640" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" background="false" groupUuid="" positionOnPage="230.194,167.419,mm" itemRotation="0" anchorPoint="0" svgBorderWidth="0.2" referencePoint="0" pictureWidth="46.92" frame="false" id="" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" excludeFromExports="0" svgBorderColor="0,0,0,255" positionLock="true" zValue="1" mapUuid="" northMode="0" blendMode="0" pictureRotation="0" size="47.1065,27.6,mm" pictureHeight="27.6">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="1" svgFillColor="255,255,255,255" background="false" type="65640" frameJoinStyle="miter" pictureRotation="0" size="47.1065,27.6,mm" groupUuid="" outlineWidthM="0.3,mm" svgBorderColor="0,0,0,255" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="230.194,167.419,mm" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" excludeFromExports="0" position="230.194,167.419,mm" northOffset="0" pictureHeight="27.6" svgBorderWidth="0.2" itemRotation="0" positionLock="true" mapUuid="" northMode="0" resizeMode="0" file="../Gun_Run_Logo_2018.png" id="" blendMode="0" pictureWidth="46.92" anchorPoint="0">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option 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 evaluateExpressions="true" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" type="65648" 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;&lt;tr>&lt;td>Last runner&lt;/td>&lt;td>[%csv_last_runner%]&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;&lt;tr>&lt;td>[%&quot;csv_captain&quot;%]&amp;nbsp;&lt;/td>&lt;td>[%&quot;csv_captain_number&quot;%]&lt;/td>&lt;/tr>&#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>" useSmartBreaks="true" maxBreakDistance="12" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" contentMode="1" url="" resizeMode="0" 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">
-        <childFrame templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}"/>
+      <LayoutMultiFrame evaluateExpressions="true" useSmartBreaks="true" type="65648" 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;}" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" maxBreakDistance="12" stylesheetEnabled="true" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;tr>&lt;td>Name&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', &quot;csv_name&quot;, '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;/td>&lt;/tr>', '')%]&#xa;&lt;tr>&lt;td>Club&lt;/td>&lt;td>[%csv_club%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%csv_captain%]&lt;/td>&lt;/tr>&#xa;&#xa;&lt;tr>&lt;td>Last runner&lt;/td>&lt;td>[%csv_last_runner%]&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;&lt;tr>&lt;td>[%&quot;csv_captain&quot;%]&amp;nbsp;&lt;/td>&lt;td>[%&quot;csv_captain_number&quot;%]&lt;/td>&lt;/tr>&#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" contentMode="1" 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 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>
-      <LayoutMultiFrame evaluateExpressions="true" templateUuid="{0d806c1b-c0e7-44f3-83a6-c25ae6c99cd3}" type="65648" html="" useSmartBreaks="true" maxBreakDistance="10" uuid="{0d806c1b-c0e7-44f3-83a6-c25ae6c99cd3}" contentMode="0" url="" resizeMode="0" stylesheet="" stylesheetEnabled="false">
+      <LayoutMultiFrame evaluateExpressions="true" useSmartBreaks="true" type="65648" stylesheet="" uuid="{0d806c1b-c0e7-44f3-83a6-c25ae6c99cd3}" templateUuid="{0d806c1b-c0e7-44f3-83a6-c25ae6c99cd3}" maxBreakDistance="10" stylesheetEnabled="false" html="" resizeMode="0" contentMode="0" url="">
         <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="png" key="atlasRasterFormat"/>
-        <property value="0" key="imageCropMarginUnit"/>
-        <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 key="atlasRasterFormat" value="png"/>
+        <property key="imageCropMarginUnit" value="0"/>
+        <property key="resizeToContentsBottomMargin" value="3.53"/>
+        <property key="resizeToContentsLeftMargin" value="3.53"/>
+        <property key="resizeToContentsRightMargin" value="3.53"/>
+        <property key="resizeToContentsTopMargin" value="3.53"/>
       </customproperties>
-      <Atlas coverageLayerSource="/home/tim/Documents/GunRunMaps/GIS base files and routes/marshal_positions.shp" coverageLayerProvider="ogr" hideCoverage="0" coverageLayer="marshal_positions20160930121322287" filterFeatures="0" sortKey="position" pageNameExpression="&quot;position&quot;" sortFeatures="1" enabled="1" coverageLayerName="marshal_positions" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" sortAscending="1"/>
+      <Atlas filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" sortKey="position" sortAscending="1" sortFeatures="1" enabled="1" coverageLayer="marshal_positions20160930121322287" hideCoverage="0" pageNameExpression="&quot;position&quot;" coverageLayerProvider="ogr" coverageLayerName="marshal_positions" coverageLayerSource="/home/tim/Documents/Projects/2018/Gun Run/Maps/GIS base files and routes/marshal_positions.shp" filterFeatures="0"/>
     </Layout>
-    <Layout name="Marshal Plan" printResolution="120" worldFileMap="" units="mm">
-      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
-      <Grid offsetX="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetY="0"/>
+    <Layout worldFileMap="" printResolution="120" name="Marshal Plan" units="mm">
+      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
+      <Grid offsetY="0" offsetUnits="mm" resolution="10" offsetX="0" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" type="fill" alpha="1" clip_to_extent="1">
-          <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+        <symbol type="fill" clip_to_extent="1" name="" alpha="1">
+          <layer class="SimpleFill" enabled="1" pass="0" 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"/>
@@ -9235,22 +9208,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 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 position="0,0,mm" frameJoinStyle="miter" templateUuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" visibility="1" opacity="1" type="65638" uuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" background="true" groupUuid="" positionOnPage="0,0,mm" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" excludeFromExports="0" positionLock="false" zValue="0" blendMode="0" size="297,420,mm">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem zValue="0" background="true" type="65638" frameJoinStyle="miter" size="297,420,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="0,0,mm" uuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" templateUuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" excludeFromExports="0" position="0,0,mm" itemRotation="0" positionLock="false" id="" blendMode="0">
+          <FrameColor green="0" blue="0" red="0" alpha="255"/>
+          <BackgroundColor green="255" blue="255" red="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/>
@@ -9258,15 +9231,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem positionLock="false" outlineWidthM="0.3,mm" splitLayer="0" groupUuid="" lineSpacing="1" titleAlignment="1" referencePoint="0" type="65642" itemRotation="0" wrapChar="" size="21.6797,27,mm" excludeFromExports="0" wmsLegendHeight="25" symbolHeight="4" legendFilterByAtlas="0" frameJoinStyle="miter" opacity="1" id="" wmsLegendWidth="50" title="" symbolWidth="7" templateUuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" rasterBorderColor="0,0,0,255" position="15.6525,12.5708,mm" visibility="1" rasterBorderWidth="0" rasterBorder="1" zValue="8" equalColumnWidth="1" fontColor="#000000" columnSpace="2" positionOnPage="15.6525,12.5708,mm" columnCount="1" map_uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" blendMode="0" resizeToContents="1" uuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" frame="false" boxSpace="2" background="true">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem lineSpacing="1" itemRotation="0" referencePoint="0" equalColumnWidth="1" splitLayer="0" wmsLegendHeight="25" groupUuid="" id="" title="" symbolWidth="7" positionLock="false" blendMode="0" background="true" boxSpace="2" rasterBorderColor="0,0,0,255" frameJoinStyle="miter" rasterBorderWidth="0" titleAlignment="1" size="21.6797,27,mm" opacity="1" position="15.6525,12.5708,mm" map_uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" wrapChar="" positionOnPage="15.6525,12.5708,mm" resizeToContents="1" symbolHeight="4" visibility="1" zValue="8" columnSpace="2" frame="false" type="65642" wmsLegendWidth="50" rasterBorder="1" legendFilterByAtlas="0" columnCount="1" excludeFromExports="0" outlineWidthM="0.3,mm" uuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" fontColor="#000000" templateUuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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/>
@@ -9284,125 +9257,125 @@ def my_form_open(dialog, layer, feature):
           <style name="symbol" marginTop="2">
             <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
           </style>
-          <style name="symbolLabel" marginTop="2" marginLeft="2">
+          <style name="symbolLabel" marginLeft="2" marginTop="2">
             <styleFont description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties/>
-          <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" name="Routes" expanded="1">
             <customproperties/>
-            <layer-tree-layer name="all_routes" source="./all_routes.shp" providerKey="ogr" expanded="1" checked="Qt::Checked" id="all_routes20170907054841602">
+            <layer-tree-layer id="all_routes20170907054841602" checked="Qt::Checked" source="./all_routes.shp" providerKey="ogr" name="all_routes" expanded="1">
               <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 position="5.69321,399.106,mm" frameJoinStyle="miter" templateUuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" visibility="1" opacity="1" valign="64" type="65641" uuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" background="false" groupUuid="" positionOnPage="5.69321,399.106,mm" marginY="1" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" halign="1" excludeFromExports="0" positionLock="false" zValue="7" labelText="MARSHAL POSITIONS" blendMode="0" size="45.1194,7.36972,mm" htmlState="0" marginX="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="7" marginY="1" background="false" type="65641" frameJoinStyle="miter" size="45.1194,7.36972,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" labelText="MARSHAL POSITIONS" referencePoint="0" valign="64" visibility="1" positionOnPage="5.69321,399.106,mm" uuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" templateUuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" htmlState="0" excludeFromExports="0" position="5.69321,399.106,mm" itemRotation="0" positionLock="false" halign="1" id="" blendMode="0" marginX="1">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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 description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
-        <FontColor blue="0" red="0" green="0"/>
+        <FontColor green="0" blue="0" red="0"/>
       </LayoutItem>
-      <LayoutItem position="5.69321,406.988,mm" frameJoinStyle="miter" templateUuid="{619c5aac-2a47-4730-9726-57b172205ef7}" visibility="1" opacity="1" valign="32" type="65641" uuid="{619c5aac-2a47-4730-9726-57b172205ef7}" background="false" groupUuid="" positionOnPage="5.69321,406.988,mm" marginY="1" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" halign="1" excludeFromExports="0" positionLock="false" zValue="6" labelText="Page [% &quot;page&quot; %]" blendMode="0" size="16.2476,7.80192,mm" htmlState="0" marginX="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="6" marginY="1" background="false" type="65641" frameJoinStyle="miter" size="16.2476,7.80192,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" labelText="Page [% &quot;page&quot; %]" referencePoint="0" valign="32" visibility="1" positionOnPage="5.69321,406.988,mm" uuid="{619c5aac-2a47-4730-9726-57b172205ef7}" templateUuid="{619c5aac-2a47-4730-9726-57b172205ef7}" htmlState="0" excludeFromExports="0" position="5.69321,406.988,mm" itemRotation="0" positionLock="false" halign="1" id="" blendMode="0" marginX="1">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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 description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" red="0" green="0"/>
+        <FontColor green="0" blue="0" red="0"/>
       </LayoutItem>
-      <LayoutItem position="214.292,406.988,mm" frameJoinStyle="miter" templateUuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" visibility="1" opacity="1" valign="32" type="65641" uuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" background="false" groupUuid="" positionOnPage="214.292,406.988,mm" marginY="1" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" halign="2" excludeFromExports="0" positionLock="false" zValue="5" labelText="REVISION 3.1" blendMode="0" size="27.7839,7.51682,mm" htmlState="0" marginX="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="5" marginY="1" background="false" type="65641" frameJoinStyle="miter" size="27.7839,7.51682,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" labelText="REVISION 3.1" referencePoint="0" valign="32" visibility="1" positionOnPage="214.292,406.988,mm" uuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" templateUuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" htmlState="0" excludeFromExports="0" position="214.292,406.988,mm" itemRotation="0" positionLock="false" halign="2" id="" blendMode="0" marginX="1">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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 description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" red="0" green="0"/>
+        <FontColor green="0" blue="0" red="0"/>
       </LayoutItem>
-      <LayoutItem position="185.72,399.107,mm" frameJoinStyle="miter" templateUuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" visibility="1" opacity="1" valign="64" type="65641" uuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" background="false" groupUuid="" positionOnPage="185.72,399.107,mm" marginY="1" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" halign="2" excludeFromExports="0" positionLock="false" zValue="4" labelText="Sunday, 14 October 2018" blendMode="0" size="56.3557,7.36902,mm" htmlState="0" marginX="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="4" marginY="1" background="false" type="65641" frameJoinStyle="miter" size="56.3557,7.36902,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" labelText="Sunday, 14 October 2018" referencePoint="0" valign="64" visibility="1" positionOnPage="185.72,399.107,mm" uuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" templateUuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" htmlState="0" excludeFromExports="0" position="185.72,399.107,mm" itemRotation="0" positionLock="false" halign="2" id="" blendMode="0" marginX="1">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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 description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" red="0" green="0"/>
+        <FontColor green="0" blue="0" red="0"/>
       </LayoutItem>
-      <LayoutItem position="243.319,382.696,mm" northOffset="0" resizeMode="0" frameJoinStyle="miter" templateUuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" visibility="1" opacity="1" file="../Gun_Run_Logo_2018.png" type="65640" uuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" background="false" groupUuid="" positionOnPage="243.319,382.696,mm" itemRotation="0" anchorPoint="8" svgBorderWidth="0.2" referencePoint="0" pictureWidth="49.3143" frame="false" id="" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" excludeFromExports="0" svgBorderColor="0,0,0,255" positionLock="false" zValue="3" mapUuid="" northMode="0" blendMode="0" pictureRotation="0" size="49.3143,31.2967,mm" pictureHeight="29.0084">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="3" svgFillColor="255,255,255,255" background="false" type="65640" frameJoinStyle="miter" pictureRotation="0" size="49.3143,31.2967,mm" groupUuid="" outlineWidthM="0.3,mm" svgBorderColor="0,0,0,255" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="243.319,382.696,mm" uuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" templateUuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" excludeFromExports="0" position="243.319,382.696,mm" northOffset="0" pictureHeight="29.0084" svgBorderWidth="0.2" itemRotation="0" positionLock="false" mapUuid="" northMode="0" resizeMode="0" file="../Gun_Run_Logo_2018.png" id="" blendMode="0" pictureWidth="49.3143" anchorPoint="8">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option 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 position="5.84321,406.626,mm" shapeType="1" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" templateUuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" visibility="1" opacity="1" type="65643" uuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" background="false" groupUuid="" positionOnPage="5.84321,406.626,mm" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" excludeFromExports="0" positionLock="false" zValue="2" blendMode="0" size="236.083,0.14328,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="2" background="false" type="65643" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" size="236.083,0.14328,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="5.84321,406.626,mm" uuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" templateUuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" shapeType="1" excludeFromExports="0" position="5.84321,406.626,mm" itemRotation="0" positionLock="false" id="" blendMode="0">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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="" type="fill" alpha="1" clip_to_extent="1">
-          <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+        <symbol type="fill" clip_to_extent="1" name="" alpha="1">
+          <layer class="SimpleFill" enabled="1" pass="0" 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"/>
@@ -9416,58 +9389,58 @@ 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 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 position="-8.18575,45.787,mm" frameJoinStyle="miter" templateUuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" visibility="1" opacity="1" type="65639" uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" background="true" groupUuid="" positionOnPage="-8.18575,45.787,mm" mapRotation="0" followPreset="true" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" excludeFromExports="0" positionLock="false" zValue="1" keepLayerSet="false" blendMode="0" size="286.94,392.396,mm" followPresetName="Marshal overview" drawCanvasItems="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="1" background="true" type="65639" frameJoinStyle="miter" size="286.94,392.396,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="-8.18575,45.787,mm" uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" templateUuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" keepLayerSet="false" excludeFromExports="0" position="-8.18575,45.787,mm" itemRotation="0" mapRotation="0" positionLock="false" drawCanvasItems="false" followPresetName="Marshal overview" id="" followPreset="true" blendMode="0">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="field" value="" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+              <Option 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="2046812.46911549428477883" ymin="-4021659.23377959709614515" xmin="2044778.48160414351150393" ymax="-4018877.7161276382394135"/>
+        <Extent ymin="-4021659.23377959709614515" xmin="2044778.48160414351150393" xmax="2046812.46911549428477883" ymax="-4018877.7161276382394135"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="1" margin="0" scalingMode="2"/>
+        <AtlasMap margin="0" atlasDriven="1" scalingMode="2"/>
       </LayoutItem>
       <customproperties>
-        <property value="png" key="atlasRasterFormat"/>
+        <property key="atlasRasterFormat" value="png"/>
       </customproperties>
-      <Atlas coverageLayerSource="/home/tim/Documents/GunRunMaps/GIS base files and routes/marshal overviews.shp" coverageLayerProvider="ogr" hideCoverage="1" coverageLayer="marshal_overviews_shp20160930210331241" filterFeatures="0" sortKey="page" pageNameExpression="&quot;page&quot;" sortFeatures="1" enabled="1" coverageLayerName="marshal overviews.shp" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1"/>
+      <Atlas filenamePattern="'output_'||@atlas_featurenumber" sortKey="page" sortAscending="1" sortFeatures="1" enabled="1" coverageLayer="marshal_overviews_shp20160930210331241" hideCoverage="1" pageNameExpression="&quot;page&quot;" coverageLayerProvider="ogr" coverageLayerName="marshal overviews.shp" coverageLayerSource="/home/tim/Documents/Projects/2018/Gun Run/Maps/GIS base files and routes/marshal overviews.shp" filterFeatures="0"/>
     </Layout>
-    <Layout name="Start &amp; Finish Backgrounds" printResolution="300" worldFileMap="" units="mm">
-      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
-      <Grid offsetX="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetY="0"/>
+    <Layout worldFileMap="" printResolution="300" name="Start &amp; Finish Backgrounds" units="mm">
+      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
+      <Grid offsetY="0" offsetUnits="mm" resolution="10" offsetX="0" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" type="fill" alpha="1" clip_to_extent="1">
-          <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+        <symbol type="fill" clip_to_extent="1" name="" alpha="1">
+          <layer class="SimpleFill" enabled="1" pass="0" 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"/>
@@ -9481,22 +9454,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 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 position="0,0,mm" frameJoinStyle="miter" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" visibility="1" opacity="1" type="65638" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" background="true" groupUuid="" positionOnPage="0,0,mm" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" excludeFromExports="0" positionLock="false" zValue="0" blendMode="0" size="297,210,mm">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem zValue="0" background="true" type="65638" frameJoinStyle="miter" size="297,210,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="0,0,mm" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" excludeFromExports="0" position="0,0,mm" itemRotation="0" positionLock="false" id="" blendMode="0">
+          <FrameColor green="0" blue="0" red="0" alpha="255"/>
+          <BackgroundColor green="255" blue="255" red="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/>
@@ -9504,99 +9477,99 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem position="286.027,2,mm" northOffset="0" resizeMode="0" frameJoinStyle="miter" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" visibility="1" opacity="1" file="arrows/NorthArrow_11.svg" type="65640" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" background="false" groupUuid="" positionOnPage="286.027,2,mm" itemRotation="0" anchorPoint="0" svgBorderWidth="0.2" referencePoint="0" pictureWidth="8.71429" frame="false" id="" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" excludeFromExports="0" svgBorderColor="0,0,0,255" positionLock="true" zValue="4" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" northMode="0" blendMode="0" pictureRotation="0" size="9.45865,11,mm" pictureHeight="11">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="4" svgFillColor="255,255,255,255" background="false" type="65640" frameJoinStyle="miter" pictureRotation="0" size="9.45865,11,mm" groupUuid="" outlineWidthM="0.3,mm" svgBorderColor="0,0,0,255" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="286.027,2,mm" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" excludeFromExports="0" position="286.027,2,mm" northOffset="0" pictureHeight="11" svgBorderWidth="0.2" itemRotation="0" positionLock="true" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" northMode="0" resizeMode="0" file="arrows/NorthArrow_11.svg" id="" blendMode="0" pictureWidth="8.71429" anchorPoint="0">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option 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 position="285.027,205.886,mm" frameJoinStyle="miter" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" visibility="1" opacity="1" valign="64" type="65641" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" background="false" groupUuid="" positionOnPage="285.027,205.886,mm" marginY="1" itemRotation="270" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" halign="1" excludeFromExports="0" positionLock="true" zValue="3" labelText="[%upper( &quot;area&quot; )%]" blendMode="0" size="142.543,10.3185,mm" htmlState="0" marginX="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="3" marginY="1" background="false" type="65641" frameJoinStyle="miter" size="142.543,10.3185,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" labelText="[%upper( &quot;area&quot; )%]" referencePoint="0" valign="64" visibility="1" positionOnPage="285.027,205.886,mm" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" htmlState="0" excludeFromExports="0" position="285.027,205.886,mm" itemRotation="270" positionLock="true" halign="1" id="" blendMode="0" marginX="1">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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 description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" red="0" green="0"/>
+        <FontColor green="0" blue="0" red="0"/>
       </LayoutItem>
-      <LayoutItem positionLock="true" outlineWidthM="0.3,mm" groupUuid="" labelBarSpace="3" referencePoint="0" type="65646" outlineWidth="0.3" itemRotation="0" style="Single Box" size="128.795,16.2165,mm" excludeFromExports="0" maxBarWidth="150" boxContentSpace="1" segmentMillimeters="23.069" numSegments="4" lineJoinStyle="miter" alignment="0" frameJoinStyle="miter" opacity="1" id="" numUnitsPerSegment="100" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" position="7,189.669,mm" visibility="1" zValue="2" numMapUnitsPerScaleBarUnit="1" segmentSizeMode="1" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" unitType="meters" positionOnPage="7,189.669,mm" lineCapStyle="square" blendMode="0" numSegmentsLeft="2" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" height="3" frame="false" minBarWidth="50" unitLabel="m" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" referencePoint="0" lineCapStyle="square" numSegments="4" unitLabel="m" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" groupUuid="" maxBarWidth="150" id="" positionLock="true" blendMode="0" background="false" frameJoinStyle="miter" size="128.795,16.2165,mm" opacity="1" segmentMillimeters="23.069" numSegmentsLeft="2" labelBarSpace="3" boxContentSpace="1" position="7,189.669,mm" positionOnPage="7,189.669,mm" visibility="1" zValue="2" numMapUnitsPerScaleBarUnit="1" height="3" numUnitsPerSegment="100" style="Single Box" frame="false" type="65646" excludeFromExports="0" alignment="0" outlineWidthM="0.3,mm" minBarWidth="50" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" unitType="meters" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" outlineWidth="0.3" segmentSizeMode="1" lineJoinStyle="miter">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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 blendMode="0" textOpacity="1" fontSizeUnit="Point" namedStyle="" fontSize="12" fontUnderline="0" fontLetterSpacing="0" fontStrikeout="0" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" fontWeight="50" fontItalic="0" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontCapitals="0">
-          <text-buffer bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeType="0" shapeSizeUnit="MM" shapeDraw="0" shapeJoinStyle="64" shapeOpacity="1" shapeSVGFile="" shapeOffsetUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetY="0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+        <text-style multilineHeight="1" fontWordSpacing="0" fontItalic="0" fontUnderline="0" blendMode="0" namedStyle="" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" fontSize="12" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOpacity="1" fontCapitals="0" fontLetterSpacing="0">
+          <text-buffer bufferNoFill="1" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <background shapeOffsetUnit="MM" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiY="0" shapeType="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeDraw="0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiUnit="MM" shapeOpacity="1"/>
+          <shadow shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.7" shadowOffsetAngle="135" shadowRadius="1.5" shadowBlendMode="6" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100"/>
         </text-style>
-        <fillColor alpha="255" blue="0" red="0" green="0"/>
-        <fillColor2 alpha="255" blue="255" red="255" green="255"/>
-        <strokeColor alpha="255" blue="0" red="0" green="0"/>
+        <fillColor green="0" blue="0" red="0" alpha="255"/>
+        <fillColor2 green="255" blue="255" red="255" alpha="255"/>
+        <strokeColor green="0" blue="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem position="7,5.5,mm" frameJoinStyle="miter" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" visibility="1" opacity="1" type="65639" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" background="false" groupUuid="" positionOnPage="7,5.5,mm" mapRotation="0" followPreset="false" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" excludeFromExports="0" positionLock="false" zValue="1" keepLayerSet="false" blendMode="0" size="278.027,180.318,mm" followPresetName="" drawCanvasItems="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="1" background="false" type="65639" frameJoinStyle="miter" size="278.027,180.318,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="7,5.5,mm" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" keepLayerSet="false" excludeFromExports="0" position="7,5.5,mm" itemRotation="0" mapRotation="0" positionLock="false" drawCanvasItems="false" followPresetName="" id="" followPreset="false" blendMode="0">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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="angle" 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="angle"/>
+                  <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="2049960.64797807228751481" ymin="-4016466.86311593884602189" xmin="2048510.00142486742697656" ymax="-4015526.02756694238632917"/>
+        <Extent ymin="-4016466.86311593884602189" xmin="2048510.00142486742697656" xmax="2049960.64797807228751481" ymax="-4015526.02756694238632917"/>
         <LayerSet/>
-        <ComposerMapGrid bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" gridFrameWidth="2" leftAnnotationDisplay="3" bottomAnnotationDirection="0" bottomAnnotationDisplay="3" topAnnotationDisplay="3" unit="1" gridFramePenThickness="0.5" frameAnnotationDistance="1" annotationPrecision="3" showAnnotation="0" annotationFormat="4" topAnnotationPosition="1" rightAnnotationPosition="1" annotationFontColor="0,0,0,255" frameFillColor1="255,255,255,255" topAnnotationDirection="0" gridFrameStyle="0" intervalX="5" bottomFrameDivisions="0" rightAnnotationDirection="0" gridStyle="0" topFrameDivisions="0" leftAnnotationDirection="0" show="0" rightFrameDivisions="0" name="Grid 1" offsetX="0" annotationExpression="" leftAnnotationPosition="1" crossLength="3" blendMode="0" rightAnnotationDisplay="3" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" intervalY="5" leftFrameDivisions="0" gridFrameSideFlags="15" offsetY="0">
+        <ComposerMapGrid crossLength="3" annotationExpression="" topFrameDivisions="0" offsetX="0" leftAnnotationPosition="1" rightAnnotationPosition="1" gridFramePenThickness="0.5" topAnnotationPosition="1" bottomFrameDivisions="0" leftFrameDivisions="0" bottomAnnotationDirection="0" blendMode="0" annotationFormat="4" gridFrameStyle="0" topAnnotationDisplay="3" bottomAnnotationPosition="1" gridFrameWidth="2" show="0" rightAnnotationDirection="0" unit="1" gridFrameSideFlags="15" intervalY="5" bottomAnnotationDisplay="3" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" leftAnnotationDirection="0" annotationFontColor="0,0,0,255" rightFrameDivisions="0" frameFillColor2="0,0,0,255" showAnnotation="0" intervalX="5" frameAnnotationDistance="1" offsetY="0" leftAnnotationDisplay="3" rightAnnotationDisplay="3" gridStyle="0" annotationPrecision="3" name="Grid 1" frameFillColor1="255,255,255,255" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}">
           <lineStyle>
-            <symbol name="" type="line" alpha="1" clip_to_extent="1">
-              <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+            <symbol type="line" clip_to_extent="1" name="" alpha="1">
+              <layer class="SimpleLine" enabled="1" pass="0" locked="0">
                 <prop v="square" k="capstyle"/>
                 <prop v="5;2" k="customdash"/>
                 <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -9614,17 +9587,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 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="" type="marker" alpha="1" clip_to_extent="1">
-              <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
+            <symbol type="marker" clip_to_extent="1" name="" alpha="1">
+              <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
                 <prop v="0" k="angle"/>
                 <prop v="0,0,0,255" k="color"/>
                 <prop v="1" k="horizontal_anchor_point"/>
@@ -9645,9 +9618,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 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>
@@ -9665,15 +9638,15 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
           <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="1" margin="0" scalingMode="2"/>
+        <AtlasMap margin="0" atlasDriven="1" scalingMode="2"/>
       </LayoutItem>
-      <LayoutMultiFrame wrapBehavior="0" showUniqueRowsOnly="0" resizeMode="0" gridStrokeWidth="0.5" templateUuid="{737c2bb8-5b53-425d-82dc-60beaf900cd9}" headerHAlignment="0" showEmptyRows="0" showGrid="1" type="65649" gridColor="0,0,0,255" uuid="{737c2bb8-5b53-425d-82dc-60beaf900cd9}" maxFeatures="30" horizontalGrid="1" emptyTableMessage="" headerMode="0" headerFontColor="0,0,0,255" relationId="" showOnlyVisibleFeatures="0" contentFontColor="0,0,0,255" cellMargin="1" featureFilter="" verticalGrid="1" backgroundColor="255,255,255,255" filterToAtlasIntersection="0" source="0" filterFeatures="false" wrapString="" emptyTableMode="0">
+      <LayoutMultiFrame type="65649" source="0" showGrid="1" gridColor="0,0,0,255" showUniqueRowsOnly="0" emptyTableMessage="" wrapBehavior="0" headerFontColor="0,0,0,255" contentFontColor="0,0,0,255" cellMargin="1" headerMode="0" horizontalGrid="1" showEmptyRows="0" showOnlyVisibleFeatures="0" featureFilter="" uuid="{737c2bb8-5b53-425d-82dc-60beaf900cd9}" templateUuid="{737c2bb8-5b53-425d-82dc-60beaf900cd9}" wrapString="" maxFeatures="30" headerHAlignment="0" relationId="" emptyTableMode="0" gridStrokeWidth="0.5" resizeMode="0" filterFeatures="false" verticalGrid="1" backgroundColor="255,255,255,255" filterToAtlasIntersection="0">
         <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/>
@@ -9682,28 +9655,28 @@ def my_form_open(dialog, layer, feature):
         <contentFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
         <displayColumns/>
         <cellStyles>
-          <oddColumns cellBackgroundColor="255,255,255,255" enabled="0"/>
-          <evenColumns cellBackgroundColor="255,255,255,255" enabled="0"/>
-          <oddRows cellBackgroundColor="255,255,255,255" enabled="0"/>
-          <evenRows cellBackgroundColor="255,255,255,255" enabled="0"/>
-          <firstColumn cellBackgroundColor="255,255,255,255" enabled="0"/>
-          <lastColumn cellBackgroundColor="255,255,255,255" enabled="0"/>
-          <headerRow cellBackgroundColor="255,255,255,255" enabled="0"/>
-          <firstRow cellBackgroundColor="255,255,255,255" enabled="0"/>
-          <lastRow cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <oddColumns enabled="0" cellBackgroundColor="255,255,255,255"/>
+          <evenColumns enabled="0" cellBackgroundColor="255,255,255,255"/>
+          <oddRows enabled="0" cellBackgroundColor="255,255,255,255"/>
+          <evenRows enabled="0" cellBackgroundColor="255,255,255,255"/>
+          <firstColumn enabled="0" cellBackgroundColor="255,255,255,255"/>
+          <lastColumn enabled="0" cellBackgroundColor="255,255,255,255"/>
+          <headerRow enabled="0" cellBackgroundColor="255,255,255,255"/>
+          <firstRow enabled="0" cellBackgroundColor="255,255,255,255"/>
+          <lastRow enabled="0" cellBackgroundColor="255,255,255,255"/>
         </cellStyles>
       </LayoutMultiFrame>
       <customproperties>
-        <property value="png" key="atlasRasterFormat"/>
+        <property key="atlasRasterFormat" value="png"/>
       </customproperties>
-      <Atlas hideCoverage="1" coverageLayer="" filterFeatures="0" sortKey="area" pageNameExpression="&quot;area&quot;" sortFeatures="1" enabled="1" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1"/>
+      <Atlas filenamePattern="'output_'||@atlas_featurenumber" sortKey="area" sortAscending="1" sortFeatures="1" enabled="1" coverageLayer="" hideCoverage="1" pageNameExpression="&quot;area&quot;" filterFeatures="0"/>
     </Layout>
-    <Layout name="Fencing" printResolution="300" worldFileMap="" units="mm">
-      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
-      <Grid offsetX="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetY="0"/>
+    <Layout worldFileMap="" printResolution="300" name="Fencing" units="mm">
+      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
+      <Grid offsetY="0" offsetUnits="mm" resolution="10" offsetX="0" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" type="fill" alpha="1" clip_to_extent="1">
-          <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+        <symbol type="fill" clip_to_extent="1" name="" alpha="1">
+          <layer class="SimpleFill" enabled="1" pass="0" 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"/>
@@ -9717,22 +9690,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 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 position="0,0,mm" frameJoinStyle="miter" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" visibility="1" opacity="1" type="65638" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" background="true" groupUuid="" positionOnPage="0,0,mm" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" excludeFromExports="0" positionLock="false" zValue="0" blendMode="0" size="297,210,mm">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem zValue="0" background="true" type="65638" frameJoinStyle="miter" size="297,210,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="0,0,mm" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" excludeFromExports="0" position="0,0,mm" itemRotation="0" positionLock="false" id="" blendMode="0">
+          <FrameColor green="0" blue="0" red="0" alpha="255"/>
+          <BackgroundColor green="255" blue="255" red="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/>
@@ -9740,105 +9713,105 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem position="6.76779,190.27,mm" frameJoinStyle="miter" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" visibility="1" opacity="1" valign="64" type="65641" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" background="false" groupUuid="" positionOnPage="6.76779,190.27,mm" marginY="1" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" halign="1" excludeFromExports="0" positionLock="true" zValue="9" labelText="FENCING: [% &quot;name&quot; %]" blendMode="0" size="148.46,7.36972,mm" htmlState="0" marginX="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="9" marginY="1" background="false" type="65641" frameJoinStyle="miter" size="148.46,7.36972,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" labelText="FENCING: [% &quot;name&quot; %]" referencePoint="0" valign="64" visibility="1" positionOnPage="6.76779,190.27,mm" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" htmlState="0" excludeFromExports="0" position="6.76779,190.27,mm" itemRotation="0" positionLock="true" halign="1" id="" blendMode="0" marginX="1">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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 description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
-        <FontColor blue="0" red="0" green="0"/>
+        <FontColor green="0" blue="0" red="0"/>
       </LayoutItem>
-      <LayoutItem position="6.76779,198.083,mm" frameJoinStyle="miter" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" visibility="1" opacity="1" valign="32" type="65641" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" background="false" groupUuid="" positionOnPage="6.76779,198.083,mm" marginY="1" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" halign="1" excludeFromExports="0" positionLock="true" zValue="8" labelText="Page [% &quot;group&quot; %]" blendMode="0" size="16.2476,7.80192,mm" htmlState="0" marginX="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="8" marginY="1" background="false" type="65641" frameJoinStyle="miter" size="16.2476,7.80192,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" labelText="Page [% &quot;group&quot; %]" referencePoint="0" valign="32" visibility="1" positionOnPage="6.76779,198.083,mm" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" htmlState="0" excludeFromExports="0" position="6.76779,198.083,mm" itemRotation="0" positionLock="true" halign="1" id="" blendMode="0" marginX="1">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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 description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" red="0" green="0"/>
+        <FontColor green="0" blue="0" red="0"/>
       </LayoutItem>
-      <LayoutItem position="211.295,197.64,mm" frameJoinStyle="miter" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" visibility="1" opacity="1" valign="32" type="65641" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" background="false" groupUuid="" positionOnPage="211.295,197.64,mm" marginY="1" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" halign="2" excludeFromExports="0" positionLock="true" zValue="7" labelText="REVISION 3.0" blendMode="0" size="27.7839,7.51682,mm" htmlState="0" marginX="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="7" marginY="1" background="false" type="65641" frameJoinStyle="miter" size="27.7839,7.51682,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" labelText="REVISION 3.0" referencePoint="0" valign="32" visibility="1" positionOnPage="211.295,197.64,mm" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" htmlState="0" excludeFromExports="0" position="211.295,197.64,mm" itemRotation="0" positionLock="true" halign="2" id="" blendMode="0" marginX="1">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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 description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" red="0" green="0"/>
+        <FontColor green="0" blue="0" red="0"/>
       </LayoutItem>
-      <LayoutItem position="182.723,190.271,mm" frameJoinStyle="miter" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" visibility="1" opacity="1" valign="64" type="65641" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" background="false" groupUuid="" positionOnPage="182.723,190.271,mm" marginY="1" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" halign="2" excludeFromExports="0" positionLock="true" zValue="6" labelText="Sunday, 14 October 2018" blendMode="0" size="56.3557,7.36902,mm" htmlState="0" marginX="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="6" marginY="1" background="false" type="65641" frameJoinStyle="miter" size="56.3557,7.36902,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" labelText="Sunday, 14 October 2018" referencePoint="0" valign="64" visibility="1" positionOnPage="182.723,190.271,mm" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" htmlState="0" excludeFromExports="0" position="182.723,190.271,mm" itemRotation="0" positionLock="true" halign="2" id="" blendMode="0" marginX="1">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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 description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" red="0" green="0"/>
+        <FontColor green="0" blue="0" red="0"/>
       </LayoutItem>
-      <LayoutItem position="243.098,175.353,mm" northOffset="0" resizeMode="0" frameJoinStyle="miter" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" visibility="1" opacity="1" file="../Gun_Run_Logo_2018.png" type="65640" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" background="false" groupUuid="" positionOnPage="243.098,175.353,mm" itemRotation="0" anchorPoint="8" svgBorderWidth="0.2" referencePoint="0" pictureWidth="49.3143" frame="false" id="" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" excludeFromExports="0" svgBorderColor="0,0,0,255" positionLock="true" zValue="5" mapUuid="" northMode="0" blendMode="0" pictureRotation="0" size="49.3143,29.8354,mm" pictureHeight="29.0084">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="5" svgFillColor="255,255,255,255" background="false" type="65640" frameJoinStyle="miter" pictureRotation="0" size="49.3143,29.8354,mm" groupUuid="" outlineWidthM="0.3,mm" svgBorderColor="0,0,0,255" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="243.098,175.353,mm" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" excludeFromExports="0" position="243.098,175.353,mm" northOffset="0" pictureHeight="29.0084" svgBorderWidth="0.2" itemRotation="0" positionLock="true" mapUuid="" northMode="0" resizeMode="0" file="../Gun_Run_Logo_2018.png" id="" blendMode="0" pictureWidth="49.3143" anchorPoint="8">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option 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 position="6.91779,197.79,mm" shapeType="1" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" visibility="1" opacity="1" type="65643" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" background="false" groupUuid="" positionOnPage="6.91779,197.79,mm" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" excludeFromExports="0" positionLock="true" zValue="4" blendMode="0" size="232.01,0.14328,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="4" background="false" type="65643" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" size="232.01,0.14328,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="6.91779,197.79,mm" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" shapeType="1" excludeFromExports="0" position="6.91779,197.79,mm" itemRotation="0" positionLock="true" id="" blendMode="0">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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="" type="fill" alpha="1" clip_to_extent="1">
-          <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+        <symbol type="fill" clip_to_extent="1" name="" alpha="1">
+          <layer class="SimpleFill" enabled="1" pass="0" 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"/>
@@ -9852,45 +9825,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 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 positionLock="true" outlineWidthM="0.3,mm" groupUuid="" labelBarSpace="1" referencePoint="0" type="65646" outlineWidth="0.2" itemRotation="0" style="Double Box" size="97.7059,15.8378,mm" excludeFromExports="0" maxBarWidth="100" boxContentSpace="0.2" segmentMillimeters="28.6853" numSegments="2" lineJoinStyle="round" alignment="0" frameJoinStyle="miter" opacity="1" id="" numUnitsPerSegment="100" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" position="6.76779,2.8482,mm" visibility="1" zValue="3" numMapUnitsPerScaleBarUnit="1" segmentSizeMode="1" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" unitType="meters" positionOnPage="6.76779,2.8482,mm" lineCapStyle="square" blendMode="0" numSegmentsLeft="2" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" height="2" frame="false" minBarWidth="25" unitLabel="m" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem itemRotation="0" referencePoint="0" lineCapStyle="square" numSegments="2" unitLabel="m" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" groupUuid="" maxBarWidth="100" id="" positionLock="true" blendMode="0" background="false" frameJoinStyle="miter" size="97.7059,15.8378,mm" opacity="1" segmentMillimeters="28.6853" numSegmentsLeft="2" labelBarSpace="1" boxContentSpace="0.2" position="6.76779,2.8482,mm" positionOnPage="6.76779,2.8482,mm" visibility="1" zValue="3" numMapUnitsPerScaleBarUnit="1" height="2" numUnitsPerSegment="100" style="Double Box" frame="false" type="65646" excludeFromExports="0" alignment="0" outlineWidthM="0.3,mm" minBarWidth="25" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" unitType="meters" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" outlineWidth="0.2" segmentSizeMode="1" lineJoinStyle="round">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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 blendMode="0" textOpacity="1" fontSizeUnit="Point" namedStyle="" fontSize="12" fontUnderline="0" fontLetterSpacing="0" fontStrikeout="0" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" fontWeight="50" fontItalic="0" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontCapitals="0">
-          <text-buffer bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeType="0" shapeSizeUnit="MM" shapeDraw="0" shapeJoinStyle="64" shapeOpacity="1" shapeSVGFile="" shapeOffsetUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetY="0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowDraw="0" shadowScale="100" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+        <text-style multilineHeight="1" fontWordSpacing="0" fontItalic="0" fontUnderline="0" blendMode="0" namedStyle="" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" fontSizeUnit="Point" fontSize="12" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOpacity="1" fontCapitals="0" fontLetterSpacing="0">
+          <text-buffer bufferNoFill="1" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <background shapeOffsetUnit="MM" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiY="0" shapeType="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeDraw="0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiUnit="MM" shapeOpacity="1"/>
+          <shadow shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.7" shadowOffsetAngle="135" shadowRadius="1.5" shadowBlendMode="6" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100"/>
         </text-style>
-        <fillColor alpha="255" blue="0" red="0" green="0"/>
-        <fillColor2 alpha="255" blue="255" red="255" green="255"/>
-        <strokeColor alpha="255" blue="0" red="0" green="0"/>
+        <fillColor green="0" blue="0" red="0" alpha="255"/>
+        <fillColor2 green="255" blue="255" red="255" alpha="255"/>
+        <strokeColor green="0" blue="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem positionLock="true" outlineWidthM="0.3,mm" splitLayer="0" groupUuid="" lineSpacing="1" titleAlignment="1" referencePoint="0" type="65642" itemRotation="0" wrapChar="" size="38.1563,54.6,mm" excludeFromExports="0" wmsLegendHeight="25" symbolHeight="4" legendFilterByAtlas="0" frameJoinStyle="miter" opacity="1" id="" wmsLegendWidth="50" title="" symbolWidth="7" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" rasterBorderColor="0,0,0,255" position="9.94906,16.8614,mm" visibility="1" rasterBorderWidth="0" rasterBorder="1" zValue="2" equalColumnWidth="1" fontColor="#000000" columnSpace="2" positionOnPage="9.94906,16.8614,mm" columnCount="1" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" blendMode="0" resizeToContents="0" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" frame="true" boxSpace="2" background="true">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem lineSpacing="1" itemRotation="0" referencePoint="0" equalColumnWidth="1" splitLayer="0" wmsLegendHeight="25" groupUuid="" id="" title="" symbolWidth="7" positionLock="true" blendMode="0" background="true" boxSpace="2" rasterBorderColor="0,0,0,255" frameJoinStyle="miter" rasterBorderWidth="0" titleAlignment="1" size="38.1563,54.6,mm" opacity="1" position="9.94906,16.8614,mm" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" wrapChar="" positionOnPage="9.94906,16.8614,mm" resizeToContents="0" symbolHeight="4" visibility="1" zValue="2" columnSpace="2" frame="true" type="65642" wmsLegendWidth="50" rasterBorder="1" legendFilterByAtlas="0" columnCount="1" excludeFromExports="0" outlineWidthM="0.3,mm" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" fontColor="#000000" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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/>
@@ -9908,78 +9881,78 @@ def my_form_open(dialog, layer, feature):
           <style name="symbol" marginTop="2.5">
             <styleFont description="Myriad Pro,9,-1,5,50,0,0,0,0,0" style=""/>
           </style>
-          <style name="symbolLabel" marginTop="2" marginLeft="2">
+          <style name="symbolLabel" marginLeft="2" marginTop="2">
             <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties/>
-          <layer-tree-group name="Fencing and Cones" expanded="1" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" name="Fencing and Cones" expanded="1">
             <customproperties/>
-            <layer-tree-layer name="fencing" source="./fencing.shp" providerKey="ogr" expanded="1" checked="Qt::Checked" id="fencing_504d8fa2_bdeb_4951_b151_966d5d257666">
+            <layer-tree-layer id="fencing_504d8fa2_bdeb_4951_b151_966d5d257666" checked="Qt::Checked" source="./fencing.shp" providerKey="ogr" name="fencing" expanded="1">
               <customproperties>
-                <property value="{6f66f64e-a034-49f3-a480-0837e467ccae}" key="expandedLegendNodes"/>
-                <property value="0,1,2" key="legend/node-order"/>
-                <property value="hidden" key="legend/title-style"/>
+                <property key="expandedLegendNodes" value="{6f66f64e-a034-49f3-a480-0837e467ccae}"/>
+                <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" expanded="1" checked="Qt::Unchecked">
+          <layer-tree-group checked="Qt::Unchecked" name="Routes" expanded="1">
             <customproperties/>
-            <layer-tree-layer name="all_routes" source="./all_routes.shp" providerKey="ogr" expanded="1" checked="Qt::Checked" id="all_routes20170907054841602">
+            <layer-tree-layer id="all_routes20170907054841602" checked="Qt::Checked" source="./all_routes.shp" providerKey="ogr" name="all_routes" expanded="1">
               <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 position="6.76779,9.35102,mm" frameJoinStyle="miter" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" visibility="1" opacity="0.9" type="65639" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" background="false" groupUuid="" positionOnPage="6.76779,9.35102,mm" mapRotation="0" followPreset="true" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" excludeFromExports="0" positionLock="true" zValue="1" keepLayerSet="false" blendMode="0" size="283.418,180.92,mm" followPresetName="Fencing" drawCanvasItems="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="1" background="false" type="65639" frameJoinStyle="miter" size="283.418,180.92,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="0.9" referencePoint="0" visibility="1" positionOnPage="6.76779,9.35102,mm" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" keepLayerSet="false" excludeFromExports="0" position="6.76779,9.35102,mm" itemRotation="0" mapRotation="0" positionLock="true" drawCanvasItems="false" followPresetName="Fencing" id="" followPreset="true" blendMode="0">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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="2049213.73264891747385263" ymin="-4016344.46716123353689909" xmin="2048024.4991738498210907" ymax="-4015585.32066458929330111"/>
+        <Extent ymin="-4016344.46716123353689909" xmin="2048024.4991738498210907" xmax="2049213.73264891747385263" ymax="-4015585.32066458929330111"/>
         <LayerSet/>
-        <ComposerMapGrid bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" gridFrameWidth="2" leftAnnotationDisplay="3" bottomAnnotationDirection="0" bottomAnnotationDisplay="3" topAnnotationDisplay="3" unit="1" gridFramePenThickness="0.5" frameAnnotationDistance="1" annotationPrecision="3" showAnnotation="0" annotationFormat="4" topAnnotationPosition="1" rightAnnotationPosition="1" annotationFontColor="0,0,0,255" frameFillColor1="255,255,255,255" topAnnotationDirection="0" gridFrameStyle="0" intervalX="5" bottomFrameDivisions="0" rightAnnotationDirection="0" gridStyle="0" topFrameDivisions="0" leftAnnotationDirection="0" show="0" rightFrameDivisions="0" name="Grid 1" offsetX="0" annotationExpression="" leftAnnotationPosition="1" crossLength="3" blendMode="0" rightAnnotationDisplay="3" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" intervalY="5" leftFrameDivisions="0" gridFrameSideFlags="15" offsetY="0">
+        <ComposerMapGrid crossLength="3" annotationExpression="" topFrameDivisions="0" offsetX="0" leftAnnotationPosition="1" rightAnnotationPosition="1" gridFramePenThickness="0.5" topAnnotationPosition="1" bottomFrameDivisions="0" leftFrameDivisions="0" bottomAnnotationDirection="0" blendMode="0" annotationFormat="4" gridFrameStyle="0" topAnnotationDisplay="3" bottomAnnotationPosition="1" gridFrameWidth="2" show="0" rightAnnotationDirection="0" unit="1" gridFrameSideFlags="15" intervalY="5" bottomAnnotationDisplay="3" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" leftAnnotationDirection="0" annotationFontColor="0,0,0,255" rightFrameDivisions="0" frameFillColor2="0,0,0,255" showAnnotation="0" intervalX="5" frameAnnotationDistance="1" offsetY="0" leftAnnotationDisplay="3" rightAnnotationDisplay="3" gridStyle="0" annotationPrecision="3" name="Grid 1" frameFillColor1="255,255,255,255" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}">
           <lineStyle>
-            <symbol name="" type="line" alpha="1" clip_to_extent="1">
-              <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+            <symbol type="line" clip_to_extent="1" name="" alpha="1">
+              <layer class="SimpleLine" enabled="1" pass="0" locked="0">
                 <prop v="square" k="capstyle"/>
                 <prop v="5;2" k="customdash"/>
                 <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -9997,17 +9970,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 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="" type="marker" alpha="1" clip_to_extent="1">
-              <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
+            <symbol type="marker" clip_to_extent="1" name="" alpha="1">
+              <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
                 <prop v="0" k="angle"/>
                 <prop v="0,0,0,255" k="color"/>
                 <prop v="1" k="horizontal_anchor_point"/>
@@ -10028,9 +10001,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 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>
@@ -10048,15 +10021,15 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
           <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="1" margin="0.40000000000000002" scalingMode="2"/>
+        <AtlasMap margin="0.40000000000000002" atlasDriven="1" scalingMode="2"/>
       </LayoutItem>
-      <LayoutMultiFrame wrapBehavior="0" showUniqueRowsOnly="0" resizeMode="0" gridStrokeWidth="0.5" templateUuid="{43340fd2-8050-4790-8e1c-aa5a6eed94bb}" headerHAlignment="0" showEmptyRows="0" showGrid="1" type="65649" gridColor="0,0,0,255" uuid="{43340fd2-8050-4790-8e1c-aa5a6eed94bb}" maxFeatures="30" horizontalGrid="1" emptyTableMessage="" headerMode="0" headerFontColor="0,0,0,255" relationId="" showOnlyVisibleFeatures="0" contentFontColor="0,0,0,255" cellMargin="1" featureFilter="" verticalGrid="1" backgroundColor="255,255,255,255" filterToAtlasIntersection="0" source="0" filterFeatures="false" wrapString="" emptyTableMode="0">
+      <LayoutMultiFrame type="65649" source="0" showGrid="1" gridColor="0,0,0,255" showUniqueRowsOnly="0" emptyTableMessage="" wrapBehavior="0" headerFontColor="0,0,0,255" contentFontColor="0,0,0,255" cellMargin="1" headerMode="0" horizontalGrid="1" showEmptyRows="0" showOnlyVisibleFeatures="0" featureFilter="" uuid="{43340fd2-8050-4790-8e1c-aa5a6eed94bb}" templateUuid="{43340fd2-8050-4790-8e1c-aa5a6eed94bb}" wrapString="" maxFeatures="30" headerHAlignment="0" relationId="" emptyTableMode="0" gridStrokeWidth="0.5" resizeMode="0" filterFeatures="false" verticalGrid="1" backgroundColor="255,255,255,255" filterToAtlasIntersection="0">
         <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/>
@@ -10065,41 +10038,41 @@ def my_form_open(dialog, layer, feature):
         <contentFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
         <displayColumns/>
         <cellStyles>
-          <oddColumns cellBackgroundColor="255,255,255,255" enabled="0"/>
-          <evenColumns cellBackgroundColor="255,255,255,255" enabled="0"/>
-          <oddRows cellBackgroundColor="255,255,255,255" enabled="0"/>
-          <evenRows cellBackgroundColor="255,255,255,255" enabled="0"/>
-          <firstColumn cellBackgroundColor="255,255,255,255" enabled="0"/>
-          <lastColumn cellBackgroundColor="255,255,255,255" enabled="0"/>
-          <headerRow cellBackgroundColor="255,255,255,255" enabled="0"/>
-          <firstRow cellBackgroundColor="255,255,255,255" enabled="0"/>
-          <lastRow cellBackgroundColor="255,255,255,255" enabled="0"/>
+          <oddColumns enabled="0" cellBackgroundColor="255,255,255,255"/>
+          <evenColumns enabled="0" cellBackgroundColor="255,255,255,255"/>
+          <oddRows enabled="0" cellBackgroundColor="255,255,255,255"/>
+          <evenRows enabled="0" cellBackgroundColor="255,255,255,255"/>
+          <firstColumn enabled="0" cellBackgroundColor="255,255,255,255"/>
+          <lastColumn enabled="0" cellBackgroundColor="255,255,255,255"/>
+          <headerRow enabled="0" cellBackgroundColor="255,255,255,255"/>
+          <firstRow enabled="0" cellBackgroundColor="255,255,255,255"/>
+          <lastRow enabled="0" cellBackgroundColor="255,255,255,255"/>
         </cellStyles>
       </LayoutMultiFrame>
-      <LayoutMultiFrame evaluateExpressions="true" templateUuid="{01484c91-0284-48d9-8117-8626ca23e6c1}" type="65648" html="" useSmartBreaks="true" maxBreakDistance="10" uuid="{01484c91-0284-48d9-8117-8626ca23e6c1}" contentMode="1" url="" resizeMode="0" stylesheet="" stylesheetEnabled="false">
+      <LayoutMultiFrame evaluateExpressions="true" useSmartBreaks="true" type="65648" stylesheet="" uuid="{01484c91-0284-48d9-8117-8626ca23e6c1}" templateUuid="{01484c91-0284-48d9-8117-8626ca23e6c1}" maxBreakDistance="10" stylesheetEnabled="false" html="" resizeMode="0" contentMode="1" url="">
         <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="png" key="atlasRasterFormat"/>
-        <property value="true" key="rasterize"/>
+        <property key="atlasRasterFormat" value="png"/>
+        <property key="rasterize" value="true"/>
       </customproperties>
-      <Atlas coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20fencing%20GROUP%20BY%20%22group%22&amp;geometry=geometry:3:0" coverageLayerProvider="virtual" hideCoverage="1" coverageLayer="fence_groups_b08dad12_5ae6_4ba8_b737_e74b37bd274c" filterFeatures="0" sortKey="group" pageNameExpression="&quot;name&quot;" sortFeatures="1" enabled="1" coverageLayerName="fence_groups" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1"/>
+      <Atlas filenamePattern="'output_'||@atlas_featurenumber" sortKey="group" sortAscending="1" sortFeatures="1" enabled="1" coverageLayer="fence_groups_b08dad12_5ae6_4ba8_b737_e74b37bd274c" hideCoverage="1" pageNameExpression="&quot;name&quot;" coverageLayerProvider="virtual" coverageLayerName="fence_groups" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20fencing%20GROUP%20BY%20%22group%22&amp;geometry=geometry:3:0" filterFeatures="0"/>
     </Layout>
-    <Layout name="Access Roads" printResolution="192" worldFileMap="" units="mm">
-      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
-      <Grid offsetX="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetY="0"/>
+    <Layout worldFileMap="" printResolution="192" name="Access Roads" units="mm">
+      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
+      <Grid offsetY="0" offsetUnits="mm" resolution="10" offsetX="0" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" type="fill" alpha="1" clip_to_extent="1">
-          <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+        <symbol type="fill" clip_to_extent="1" name="" alpha="1">
+          <layer class="SimpleFill" enabled="1" pass="0" 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"/>
@@ -10113,40 +10086,56 @@ 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 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 position="0,0,mm" frameJoinStyle="miter" templateUuid="{e7a46ede-6ed1-40d7-9752-ba4364902d22}" visibility="1" opacity="1" type="65638" uuid="{e7a46ede-6ed1-40d7-9752-ba4364902d22}" background="true" groupUuid="" positionOnPage="0,0,mm" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" excludeFromExports="0" positionLock="false" zValue="0" blendMode="0" size="297,210,mm">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem zValue="0" background="true" type="65638" frameJoinStyle="miter" size="297,210,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="0,0,mm" uuid="{e7a46ede-6ed1-40d7-9752-ba4364902d22}" templateUuid="{e7a46ede-6ed1-40d7-9752-ba4364902d22}" excludeFromExports="0" position="0,0,mm" itemRotation="0" positionLock="false" id="" blendMode="0">
+          <FrameColor green="0" blue="0" red="0" alpha="255"/>
+          <BackgroundColor green="255" blue="255" red="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" units="mm" orientation="2" position="0"/>
+          <Guide page="0" position="0" units="mm" orientation="2"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem positionLock="true" outlineWidthM="0.3,mm" splitLayer="0" groupUuid="" lineSpacing="1" titleAlignment="1" referencePoint="0" type="65642" itemRotation="0" wrapChar="" size="34.45,27.8,mm" excludeFromExports="0" wmsLegendHeight="25" symbolHeight="4" legendFilterByAtlas="0" frameJoinStyle="miter" opacity="1" id="" wmsLegendWidth="50" title="" symbolWidth="7" templateUuid="{ef1ab7a2-aa35-40d9-a9c1-feff185d19f4}" rasterBorderColor="0,0,0,255" position="249.711,156.015,mm" visibility="1" rasterBorderWidth="0" rasterBorder="1" zValue="8" equalColumnWidth="0" fontColor="#000000" columnSpace="2" positionOnPage="249.711,156.015,mm" columnCount="1" map_uuid="{6abeaf6e-4f52-413a-a7ff-23ce2850a84c}" blendMode="0" resizeToContents="1" uuid="{ef1ab7a2-aa35-40d9-a9c1-feff185d19f4}" frame="true" boxSpace="2" background="true">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="185" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="8" marginY="1" background="false" type="65641" frameJoinStyle="miter" size="110.769,6.8714,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" labelText="ACCESS ROADS FOR RESIDENTS" referencePoint="0" valign="64" visibility="1" positionOnPage="8.71559,188.218,mm" uuid="{01e42ab4-6e28-4fb2-b1a1-06b256ff505b}" templateUuid="{01e42ab4-6e28-4fb2-b1a1-06b256ff505b}" htmlState="0" excludeFromExports="0" position="8.71559,188.218,mm" itemRotation="0" positionLock="true" halign="1" id="" blendMode="0" marginX="1">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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 description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
+        <FontColor green="0" blue="0" red="0"/>
+      </LayoutItem>
+      <LayoutItem lineSpacing="1" itemRotation="0" referencePoint="0" equalColumnWidth="0" splitLayer="0" wmsLegendHeight="25" groupUuid="" id="" title="" symbolWidth="7" positionLock="true" blendMode="0" background="true" boxSpace="2" rasterBorderColor="0,0,0,255" frameJoinStyle="miter" rasterBorderWidth="0" titleAlignment="1" size="34.45,27.8,mm" opacity="1" position="249.711,156.015,mm" map_uuid="{6abeaf6e-4f52-413a-a7ff-23ce2850a84c}" wrapChar="" positionOnPage="249.711,156.015,mm" resizeToContents="1" symbolHeight="4" visibility="1" zValue="8" columnSpace="2" frame="true" type="65642" wmsLegendWidth="50" rasterBorder="1" legendFilterByAtlas="0" columnCount="1" excludeFromExports="0" outlineWidthM="0.3,mm" uuid="{ef1ab7a2-aa35-40d9-a9c1-feff185d19f4}" fontColor="#000000" templateUuid="{ef1ab7a2-aa35-40d9-a9c1-feff185d19f4}">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="255" alpha="185"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option type="QString" name="name" value=""/>
+              <Option name="properties"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
@@ -10164,106 +10153,90 @@ def my_form_open(dialog, layer, feature):
           <style name="symbol" marginTop="2.5">
             <styleFont description="Myriad Pro,9,-1,5,50,0,0,0,0,0" style=""/>
           </style>
-          <style name="symbolLabel" marginTop="2" marginLeft="2">
+          <style name="symbolLabel" marginLeft="2" marginTop="2">
             <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties/>
-          <layer-tree-group name="Residents Access" expanded="1" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" name="Residents Access" expanded="1">
             <customproperties/>
-            <layer-tree-layer name="residents_access_roads" source="./residents_access_roads.shp" providerKey="ogr" expanded="1" checked="Qt::Checked" id="residents_access_roads_a7a1b453_729e_4ac7_bb64_95381b84aa35">
+            <layer-tree-layer id="residents_access_roads_a7a1b453_729e_4ac7_bb64_95381b84aa35" checked="Qt::Checked" source="./residents_access_roads.shp" providerKey="ogr" name="residents_access_roads" expanded="1">
               <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 position="8.71559,188.218,mm" frameJoinStyle="miter" templateUuid="{01e42ab4-6e28-4fb2-b1a1-06b256ff505b}" visibility="1" opacity="1" valign="64" type="65641" uuid="{01e42ab4-6e28-4fb2-b1a1-06b256ff505b}" background="false" groupUuid="" positionOnPage="8.71559,188.218,mm" marginY="1" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" halign="1" excludeFromExports="0" positionLock="true" zValue="8" labelText="ACCESS ROADS FOR RESIDENTS" blendMode="0" size="110.769,6.8714,mm" htmlState="0" marginX="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="6" marginY="1" background="false" type="65641" frameJoinStyle="miter" size="27.7839,6.8714,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" labelText="REVISION 1.0" referencePoint="0" valign="32" visibility="1" positionOnPage="221.927,188.418,mm" uuid="{8ccb6d0c-ddd6-4cad-aadd-4083b1b576f7}" templateUuid="{8ccb6d0c-ddd6-4cad-aadd-4083b1b576f7}" htmlState="0" excludeFromExports="0" position="221.927,188.418,mm" itemRotation="0" positionLock="true" halign="2" id="" blendMode="0" marginX="1">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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>
-          </dataDefinedProperties>
-          <customproperties/>
-        </LayoutObject>
-        <LabelFont description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" red="0" green="0"/>
-      </LayoutItem>
-      <LayoutItem position="221.927,188.418,mm" frameJoinStyle="miter" templateUuid="{8ccb6d0c-ddd6-4cad-aadd-4083b1b576f7}" visibility="1" opacity="1" valign="32" type="65641" uuid="{8ccb6d0c-ddd6-4cad-aadd-4083b1b576f7}" background="false" groupUuid="" positionOnPage="221.927,188.418,mm" marginY="1" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" halign="2" excludeFromExports="0" positionLock="true" zValue="6" labelText="REVISION 1.0" blendMode="0" size="27.7839,6.8714,mm" htmlState="0" marginX="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" red="0" green="0"/>
+        <FontColor green="0" blue="0" red="0"/>
       </LayoutItem>
-      <LayoutItem position="198.04,195.289,mm" frameJoinStyle="miter" templateUuid="{3bbaa5f9-89ac-48d3-a353-2300ae2ee77a}" visibility="1" opacity="1" valign="64" type="65641" uuid="{3bbaa5f9-89ac-48d3-a353-2300ae2ee77a}" background="false" groupUuid="" positionOnPage="198.04,195.289,mm" marginY="1" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" halign="2" excludeFromExports="0" positionLock="true" zValue="5" labelText="Sunday, 14 October 2018" blendMode="0" size="51.6706,6.60801,mm" htmlState="0" marginX="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="5" marginY="1" background="false" type="65641" frameJoinStyle="miter" size="51.6706,6.60801,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" labelText="Sunday, 14 October 2018" referencePoint="0" valign="64" visibility="1" positionOnPage="198.04,195.289,mm" uuid="{3bbaa5f9-89ac-48d3-a353-2300ae2ee77a}" templateUuid="{3bbaa5f9-89ac-48d3-a353-2300ae2ee77a}" htmlState="0" excludeFromExports="0" position="198.04,195.289,mm" itemRotation="0" positionLock="true" halign="2" id="" blendMode="0" marginX="1">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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 description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" red="0" green="0"/>
+        <FontColor green="0" blue="0" red="0"/>
       </LayoutItem>
-      <LayoutItem position="258.483,187.425,mm" northOffset="0" resizeMode="0" frameJoinStyle="miter" templateUuid="{2cfcbf86-f98d-4d23-aa32-aeea01173940}" visibility="1" opacity="1" file="../Gun_Run_Logo_2018.png" type="65640" uuid="{2cfcbf86-f98d-4d23-aa32-aeea01173940}" background="false" groupUuid="" positionOnPage="258.483,187.425,mm" itemRotation="0" anchorPoint="4" svgBorderWidth="0.2" referencePoint="0" pictureWidth="29.7021" frame="false" id="" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" excludeFromExports="0" svgBorderColor="0,0,0,255" positionLock="true" zValue="4" mapUuid="" northMode="0" blendMode="0" pictureRotation="0" size="29.7523,17.4718,mm" pictureHeight="17.4718">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="4" svgFillColor="255,255,255,255" background="false" type="65640" frameJoinStyle="miter" pictureRotation="0" size="29.7523,17.4718,mm" groupUuid="" outlineWidthM="0.3,mm" svgBorderColor="0,0,0,255" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="258.483,187.425,mm" uuid="{2cfcbf86-f98d-4d23-aa32-aeea01173940}" templateUuid="{2cfcbf86-f98d-4d23-aa32-aeea01173940}" excludeFromExports="0" position="258.483,187.425,mm" northOffset="0" pictureHeight="17.4718" svgBorderWidth="0.2" itemRotation="0" positionLock="true" mapUuid="" northMode="0" resizeMode="0" file="../Gun_Run_Logo_2018.png" id="" blendMode="0" pictureWidth="29.7021" anchorPoint="4">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option 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 position="8.86559,195.239,mm" shapeType="1" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" templateUuid="{7a78f7dc-95f1-4b1c-a72d-cb0ca03341de}" visibility="1" opacity="1" type="65643" uuid="{7a78f7dc-95f1-4b1c-a72d-cb0ca03341de}" background="false" groupUuid="" positionOnPage="8.86559,195.239,mm" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" excludeFromExports="0" positionLock="true" zValue="3" blendMode="0" size="240.695,0.1,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="3" background="false" type="65643" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" size="240.695,0.1,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="8.86559,195.239,mm" uuid="{7a78f7dc-95f1-4b1c-a72d-cb0ca03341de}" templateUuid="{7a78f7dc-95f1-4b1c-a72d-cb0ca03341de}" shapeType="1" excludeFromExports="0" position="8.86559,195.239,mm" itemRotation="0" positionLock="true" id="" blendMode="0">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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="" type="fill" alpha="1" clip_to_extent="1">
-          <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+        <symbol type="fill" clip_to_extent="1" name="" alpha="1">
+          <layer class="SimpleFill" enabled="1" pass="0" 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"/>
@@ -10277,59 +10250,59 @@ 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 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 position="8.86559,6.09761,mm" frameJoinStyle="miter" templateUuid="{6abeaf6e-4f52-413a-a7ff-23ce2850a84c}" visibility="1" opacity="1" type="65639" uuid="{6abeaf6e-4f52-413a-a7ff-23ce2850a84c}" background="false" groupUuid="" positionOnPage="8.86559,6.09761,mm" mapRotation="0" followPreset="true" itemRotation="0" referencePoint="0" frame="true" id="" outlineWidthM="0.3,mm" excludeFromExports="0" positionLock="true" zValue="2" keepLayerSet="false" blendMode="0" size="67.7828,163.668,mm" followPresetName="Access Routes" drawCanvasItems="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="2" background="false" type="65639" frameJoinStyle="miter" size="67.7828,163.668,mm" groupUuid="" outlineWidthM="0.3,mm" frame="true" opacity="1" referencePoint="0" visibility="1" positionOnPage="8.86559,6.09761,mm" uuid="{6abeaf6e-4f52-413a-a7ff-23ce2850a84c}" templateUuid="{6abeaf6e-4f52-413a-a7ff-23ce2850a84c}" keepLayerSet="false" excludeFromExports="0" position="8.86559,6.09761,mm" itemRotation="0" mapRotation="0" positionLock="true" drawCanvasItems="false" followPresetName="Access Routes" id="" followPreset="true" blendMode="0">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="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" ymin="-4021465.24033112963661551" xmin="2045187.64490581233985722" ymax="-4017906.13508340576663613"/>
+        <Extent ymin="-4021465.24033112963661551" xmin="2045187.64490581233985722" xmax="2046661.64490731596015394" ymax="-4017906.13508340576663613"/>
         <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>
@@ -10343,10 +10316,10 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" gridFrameWidth="2" leftAnnotationDisplay="0" bottomAnnotationDirection="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" unit="0" gridFramePenThickness="0.5" frameAnnotationDistance="1" annotationPrecision="3" showAnnotation="0" annotationFormat="0" topAnnotationPosition="1" rightAnnotationPosition="1" annotationFontColor="0,0,0,255" frameFillColor1="255,255,255,255" topAnnotationDirection="0" gridFrameStyle="0" intervalX="0" bottomFrameDivisions="0" rightAnnotationDirection="0" gridStyle="0" topFrameDivisions="0" leftAnnotationDirection="0" show="0" rightFrameDivisions="0" name="Grid 1" offsetX="0" annotationExpression="" leftAnnotationPosition="1" crossLength="3" blendMode="0" rightAnnotationDisplay="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" intervalY="0" leftFrameDivisions="0" gridFrameSideFlags="15" offsetY="0">
+        <ComposerMapGrid crossLength="3" annotationExpression="" topFrameDivisions="0" offsetX="0" leftAnnotationPosition="1" rightAnnotationPosition="1" gridFramePenThickness="0.5" topAnnotationPosition="1" bottomFrameDivisions="0" leftFrameDivisions="0" bottomAnnotationDirection="0" blendMode="0" annotationFormat="0" gridFrameStyle="0" topAnnotationDisplay="0" bottomAnnotationPosition="1" gridFrameWidth="2" show="0" rightAnnotationDirection="0" unit="0" gridFrameSideFlags="15" intervalY="0" bottomAnnotationDisplay="0" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" leftAnnotationDirection="0" annotationFontColor="0,0,0,255" rightFrameDivisions="0" frameFillColor2="0,0,0,255" showAnnotation="0" intervalX="0" frameAnnotationDistance="1" offsetY="0" leftAnnotationDisplay="0" rightAnnotationDisplay="0" gridStyle="0" annotationPrecision="3" name="Grid 1" frameFillColor1="255,255,255,255" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}">
           <lineStyle>
-            <symbol name="" type="line" alpha="1" clip_to_extent="1">
-              <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+            <symbol type="line" clip_to_extent="1" name="" alpha="1">
+              <layer class="SimpleLine" enabled="1" pass="0" locked="0">
                 <prop v="square" k="capstyle"/>
                 <prop v="5;2" k="customdash"/>
                 <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -10364,17 +10337,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 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="" type="marker" alpha="1" clip_to_extent="1">
-              <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
+            <symbol type="marker" clip_to_extent="1" name="" alpha="1">
+              <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
                 <prop v="0" k="angle"/>
                 <prop v="0,0,0,255" k="color"/>
                 <prop v="1" k="horizontal_anchor_point"/>
@@ -10395,9 +10368,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 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>
@@ -10405,43 +10378,43 @@ def my_form_open(dialog, layer, feature):
           </markerStyle>
           <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" margin="0.05" scalingMode="2"/>
+        <AtlasMap margin="0.05" atlasDriven="0" scalingMode="2"/>
       </LayoutItem>
-      <LayoutItem position="13.1173,10.4109,mm" frameJoinStyle="miter" templateUuid="{e6d5cba2-adb8-4057-b9c6-f66d2bf54203}" visibility="1" opacity="1" type="65639" uuid="{e6d5cba2-adb8-4057-b9c6-f66d2bf54203}" background="true" groupUuid="" positionOnPage="13.1173,10.4109,mm" mapRotation="0" followPreset="true" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" excludeFromExports="0" positionLock="true" zValue="1" keepLayerSet="false" blendMode="0" size="275.118,177.014,mm" followPresetName="Access Routes" drawCanvasItems="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="1" background="true" type="65639" frameJoinStyle="miter" size="275.118,177.014,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="13.1173,10.4109,mm" uuid="{e6d5cba2-adb8-4057-b9c6-f66d2bf54203}" templateUuid="{e6d5cba2-adb8-4057-b9c6-f66d2bf54203}" keepLayerSet="false" excludeFromExports="0" position="13.1173,10.4109,mm" itemRotation="0" mapRotation="0" positionLock="true" drawCanvasItems="false" followPresetName="Access Routes" id="" followPreset="true" blendMode="0">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="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" ymin="-4019029.07624835893511772" xmin="2044625.64756297133862972" ymax="-4015136.43659120844677091"/>
+        <Extent ymin="-4019029.07624835893511772" xmin="2044625.64756297133862972" xmax="2050675.64756914228200912" ymax="-4015136.43659120844677091"/>
         <LayerSet/>
-        <ComposerMapGrid bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" gridFrameWidth="2" leftAnnotationDisplay="0" bottomAnnotationDirection="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" unit="0" gridFramePenThickness="0.5" frameAnnotationDistance="1" annotationPrecision="3" showAnnotation="0" annotationFormat="0" topAnnotationPosition="1" rightAnnotationPosition="1" annotationFontColor="0,0,0,255" frameFillColor1="255,255,255,255" topAnnotationDirection="0" gridFrameStyle="0" intervalX="0" bottomFrameDivisions="0" rightAnnotationDirection="0" gridStyle="0" topFrameDivisions="0" leftAnnotationDirection="0" show="0" rightFrameDivisions="0" name="Grid 1" offsetX="0" annotationExpression="" leftAnnotationPosition="1" crossLength="3" blendMode="0" rightAnnotationDisplay="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" intervalY="0" leftFrameDivisions="0" gridFrameSideFlags="15" offsetY="0">
+        <ComposerMapGrid crossLength="3" annotationExpression="" topFrameDivisions="0" offsetX="0" leftAnnotationPosition="1" rightAnnotationPosition="1" gridFramePenThickness="0.5" topAnnotationPosition="1" bottomFrameDivisions="0" leftFrameDivisions="0" bottomAnnotationDirection="0" blendMode="0" annotationFormat="0" gridFrameStyle="0" topAnnotationDisplay="0" bottomAnnotationPosition="1" gridFrameWidth="2" show="0" rightAnnotationDirection="0" unit="0" gridFrameSideFlags="15" intervalY="0" bottomAnnotationDisplay="0" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" leftAnnotationDirection="0" annotationFontColor="0,0,0,255" rightFrameDivisions="0" frameFillColor2="0,0,0,255" showAnnotation="0" intervalX="0" frameAnnotationDistance="1" offsetY="0" leftAnnotationDisplay="0" rightAnnotationDisplay="0" gridStyle="0" annotationPrecision="3" name="Grid 1" frameFillColor1="255,255,255,255" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}">
           <lineStyle>
-            <symbol name="" type="line" alpha="1" clip_to_extent="1">
-              <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+            <symbol type="line" clip_to_extent="1" name="" alpha="1">
+              <layer class="SimpleLine" enabled="1" pass="0" locked="0">
                 <prop v="square" k="capstyle"/>
                 <prop v="5;2" k="customdash"/>
                 <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -10459,17 +10432,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 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="" type="marker" alpha="1" clip_to_extent="1">
-              <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
+            <symbol type="marker" clip_to_extent="1" name="" alpha="1">
+              <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
                 <prop v="0" k="angle"/>
                 <prop v="0,0,0,255" k="color"/>
                 <prop v="1" k="horizontal_anchor_point"/>
@@ -10490,9 +10463,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 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>
@@ -10500,26 +10473,26 @@ def my_form_open(dialog, layer, feature):
           </markerStyle>
           <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
       </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 coverageLayerSource="/home/tim/Documents/GunRunMaps/GIS base files and routes/residents_access.shp" coverageLayerProvider="ogr" hideCoverage="0" coverageLayer="residents_access_12d1da3e_b4fe_4986_b6af_fb68f68c5a89" filterFeatures="0" pageNameExpression="&quot;type&quot;" sortFeatures="0" enabled="1" coverageLayerName="residents_access" filenamePattern="'Gun Run 2018 - Residents Access'"/>
+      <Atlas filenamePattern="'Gun Run 2018 - Residents Access'" sortFeatures="0" enabled="1" coverageLayer="residents_access_12d1da3e_b4fe_4986_b6af_fb68f68c5a89" hideCoverage="0" pageNameExpression="&quot;type&quot;" coverageLayerProvider="ogr" coverageLayerName="residents_access" coverageLayerSource="/home/tim/Documents/Projects/2018/Gun Run/Maps/GIS base files and routes/residents_access.shp" filterFeatures="0"/>
     </Layout>
-    <Layout name="Ask Me" printResolution="192" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" units="mm">
-      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
-      <Grid offsetX="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetY="0"/>
+    <Layout worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" printResolution="192" name="Ask Me" units="mm">
+      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
+      <Grid offsetY="0" offsetUnits="mm" resolution="10" offsetX="0" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" type="fill" alpha="1" clip_to_extent="1">
-          <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+        <symbol type="fill" clip_to_extent="1" name="" alpha="1">
+          <layer class="SimpleFill" enabled="1" pass="0" 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"/>
@@ -10533,72 +10506,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 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 position="0,0,mm" frameJoinStyle="miter" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" visibility="1" opacity="1" type="65638" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" background="true" groupUuid="" positionOnPage="0,0,mm" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" excludeFromExports="0" positionLock="false" zValue="0" blendMode="0" size="297,210,mm">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem zValue="0" background="true" type="65638" frameJoinStyle="miter" size="297,210,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="0,0,mm" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" excludeFromExports="0" position="0,0,mm" itemRotation="0" positionLock="false" id="" blendMode="0">
+          <FrameColor green="0" blue="0" red="0" alpha="255"/>
+          <BackgroundColor green="255" blue="255" red="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" units="mm" orientation="2" position="0"/>
+          <Guide page="0" position="0" units="mm" orientation="2"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem position="7.9389,188.218,mm" frameJoinStyle="miter" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" visibility="1" opacity="1" valign="64" type="65641" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" background="false" groupUuid="" positionOnPage="7.9389,188.218,mm" marginY="1" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" halign="1" excludeFromExports="0" positionLock="false" zValue="8" labelText="Directions to Start" blendMode="0" size="48.2923,7.071,mm" htmlState="0" marginX="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="8" marginY="1" background="false" type="65641" frameJoinStyle="miter" size="83.9998,7.071,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" labelText="Directions to Start of Race" referencePoint="0" valign="64" visibility="1" positionOnPage="7.9389,188.218,mm" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" htmlState="0" excludeFromExports="0" position="7.9389,188.218,mm" itemRotation="0" positionLock="true" halign="1" id="" blendMode="0" marginX="1">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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 description="Myriad Pro,12,-1,5,50,0,0,0,0,0" style=""/>
-        <FontColor blue="0" red="0" green="0"/>
+        <FontColor green="0" blue="0" red="0"/>
       </LayoutItem>
-      <LayoutItem position="7.93888,195.489,mm" frameJoinStyle="miter" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" visibility="1" opacity="1" valign="32" type="65641" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" background="false" groupUuid="" positionOnPage="7.93888,195.489,mm" marginY="1" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" halign="1" excludeFromExports="0" positionLock="false" zValue="7" labelText="Gun Run 2018" blendMode="0" size="48.2923,6.60801,mm" htmlState="0" marginX="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="7" marginY="1" background="false" type="65641" frameJoinStyle="miter" size="48.2923,6.60801,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" labelText="Gun Run 2018" referencePoint="0" valign="32" visibility="1" positionOnPage="7.93888,195.489,mm" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" htmlState="0" excludeFromExports="0" position="7.93888,195.489,mm" itemRotation="0" positionLock="true" halign="1" id="" blendMode="0" marginX="1">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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 description="Myriad Pro,12,-1,5,50,0,0,0,0,0" style=""/>
-        <FontColor blue="0" red="0" green="0"/>
+        <FontColor green="0" blue="0" red="0"/>
       </LayoutItem>
-      <LayoutItem positionLock="true" outlineWidthM="0.3,mm" splitLayer="0" groupUuid="" lineSpacing="1" titleAlignment="1" referencePoint="0" type="65642" itemRotation="0" wrapChar="" size="43.9781,72,mm" excludeFromExports="0" wmsLegendHeight="25" symbolHeight="4" legendFilterByAtlas="0" frameJoinStyle="miter" opacity="1" id="" wmsLegendWidth="50" title="" symbolWidth="7" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" rasterBorderColor="0,0,0,255" position="10.096,10.8563,mm" visibility="1" rasterBorderWidth="0" rasterBorder="1" zValue="6" equalColumnWidth="0" fontColor="#000000" columnSpace="2" positionOnPage="10.096,10.8563,mm" columnCount="1" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" blendMode="0" resizeToContents="0" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" frame="false" boxSpace="2" background="true">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem lineSpacing="1" itemRotation="0" referencePoint="0" equalColumnWidth="0" splitLayer="0" wmsLegendHeight="25" groupUuid="" id="" title="" symbolWidth="7" positionLock="true" blendMode="0" background="true" boxSpace="2" rasterBorderColor="0,0,0,255" frameJoinStyle="round" rasterBorderWidth="0" titleAlignment="1" size="53.2969,71,mm" opacity="1" position="10.096,10.8563,mm" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" wrapChar="" positionOnPage="10.096,10.8563,mm" resizeToContents="1" symbolHeight="4" visibility="1" zValue="6" columnSpace="2" frame="true" type="65642" wmsLegendWidth="50" rasterBorder="1" legendFilterByAtlas="0" columnCount="1" excludeFromExports="0" outlineWidthM="0.3,mm" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" fontColor="#000000" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}">
+        <FrameColor green="139" blue="139" red="139" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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/>
@@ -10616,106 +10589,106 @@ def my_form_open(dialog, layer, feature):
           <style name="symbol" marginTop="2.5">
             <styleFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0" style=""/>
           </style>
-          <style name="symbolLabel" marginTop="2" marginLeft="2">
+          <style name="symbolLabel" marginLeft="2" marginTop="2">
             <styleFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0" style=""/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties/>
-          <layer-tree-group name="Ask Me" expanded="1" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" name="Ask Me" expanded="1">
             <customproperties>
-              <property value="hidden" key="legend/title-style"/>
+              <property key="legend/title-style" value="hidden"/>
             </customproperties>
-            <layer-tree-layer name="poi_labels" source="../../../poi_labels.shp" providerKey="ogr" expanded="1" checked="Qt::Checked" id="poi_labels_59d3855d_466f_419c_8119_94b9ad7c140d">
+            <layer-tree-layer id="poi_labels_59d3855d_466f_419c_8119_94b9ad7c140d" checked="Qt::Checked" source="./poi_labels.shp" providerKey="ogr" name="poi_labels" expanded="1">
               <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 Closure" 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 Closure"/>
+                <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" source="../../../directions_to_start.shp" providerKey="ogr" expanded="1" checked="Qt::Checked" id="directions_to_start_cf338b4b_1403_45e8_b11f_47b48dd39657">
+            <layer-tree-layer id="directions_to_start_cf338b4b_1403_45e8_b11f_47b48dd39657" checked="Qt::Checked" source="./directions_to_start.shp" providerKey="ogr" name="directions_to_start" expanded="1">
               <customproperties>
-                <property value="To 21KM start" key="legend/label-0"/>
-                <property value="To 10KM start" key="legend/label-1"/>
-                <property value="To 5KM start" 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 position="228.202,188.218,mm" frameJoinStyle="miter" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" visibility="1" opacity="1" valign="32" type="65641" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" background="false" groupUuid="" positionOnPage="228.202,188.218,mm" marginY="1" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" halign="2" excludeFromExports="0" positionLock="true" zValue="5" labelText="REVISION 1.0" blendMode="0" size="27.7839,6.8714,mm" htmlState="0" marginX="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="5" marginY="1" background="false" type="65641" frameJoinStyle="miter" size="27.7839,6.8714,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" labelText="REVISION 1.1" referencePoint="0" valign="32" visibility="1" positionOnPage="228.202,188.218,mm" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" htmlState="0" excludeFromExports="0" position="228.202,188.218,mm" itemRotation="0" positionLock="true" halign="2" id="" blendMode="0" marginX="1">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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 description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" red="0" green="0"/>
+        <FontColor green="0" blue="0" red="0"/>
       </LayoutItem>
-      <LayoutItem position="204.316,195.489,mm" frameJoinStyle="miter" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" visibility="1" opacity="1" valign="64" type="65641" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" background="false" groupUuid="" positionOnPage="204.316,195.489,mm" marginY="1" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" halign="2" excludeFromExports="0" positionLock="true" zValue="4" labelText="Sunday, 14 October 2018" blendMode="0" size="51.6706,6.60801,mm" htmlState="0" marginX="1">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="4" marginY="1" background="false" type="65641" frameJoinStyle="miter" size="51.6706,6.60801,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" labelText="Sunday, 14 October 2018" referencePoint="0" valign="64" visibility="1" positionOnPage="204.316,195.489,mm" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" htmlState="0" excludeFromExports="0" position="204.316,195.489,mm" itemRotation="0" positionLock="true" halign="2" id="" blendMode="0" marginX="1">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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 description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" red="0" green="0"/>
+        <FontColor green="0" blue="0" red="0"/>
       </LayoutItem>
-      <LayoutItem position="258.483,187.425,mm" northOffset="0" resizeMode="0" frameJoinStyle="miter" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" visibility="1" opacity="1" file="../Gun_Run_Logo_2018.png" type="65640" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" background="false" groupUuid="" positionOnPage="258.483,187.425,mm" itemRotation="0" anchorPoint="4" svgBorderWidth="0.2" referencePoint="0" pictureWidth="29.7021" frame="false" id="" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" excludeFromExports="0" svgBorderColor="0,0,0,255" positionLock="true" zValue="3" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" northMode="0" blendMode="0" pictureRotation="0" size="29.7523,17.4718,mm" pictureHeight="17.4718">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="3" svgFillColor="255,255,255,255" background="false" type="65640" frameJoinStyle="miter" pictureRotation="0" size="29.7523,17.4718,mm" groupUuid="" outlineWidthM="0.3,mm" svgBorderColor="0,0,0,255" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="258.483,187.425,mm" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" excludeFromExports="0" position="258.483,187.425,mm" northOffset="0" pictureHeight="17.4718" svgBorderWidth="0.2" itemRotation="0" positionLock="true" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" northMode="0" resizeMode="0" file="../Gun_Run_Logo_2018.png" id="" blendMode="0" pictureWidth="29.7021" anchorPoint="4">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option 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 position="8.08888,195.239,mm" shapeType="1" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" visibility="1" opacity="1" type="65643" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" background="false" groupUuid="" positionOnPage="8.08888,195.239,mm" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" excludeFromExports="0" positionLock="true" zValue="2" blendMode="0" size="247.747,0.1,mm">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="2" background="false" type="65643" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" size="247.747,0.1,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="8.08888,195.239,mm" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" shapeType="1" excludeFromExports="0" position="8.08888,195.239,mm" itemRotation="0" positionLock="true" id="" blendMode="0">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="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="" type="fill" alpha="1" clip_to_extent="1">
-          <layer locked="0" class="SimpleFill" pass="0" enabled="1">
+        <symbol type="fill" clip_to_extent="1" name="" alpha="1">
+          <layer class="SimpleFill" enabled="1" pass="0" 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"/>
@@ -10729,49 +10702,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 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 position="7.93888,6.411,mm" frameJoinStyle="miter" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" visibility="1" opacity="1" type="65639" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" background="true" groupUuid="" positionOnPage="7.93888,6.411,mm" mapRotation="0" followPreset="true" itemRotation="0" referencePoint="0" frame="false" id="" outlineWidthM="0.3,mm" excludeFromExports="0" positionLock="true" zValue="1" keepLayerSet="false" blendMode="0" size="280.297,177.014,mm" followPresetName="Ask Me" drawCanvasItems="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem zValue="1" background="true" type="65639" frameJoinStyle="miter" size="280.297,177.014,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" opacity="1" referencePoint="0" visibility="1" positionOnPage="7.93888,6.411,mm" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" keepLayerSet="false" excludeFromExports="0" position="7.93888,6.411,mm" itemRotation="0" mapRotation="0" positionLock="true" drawCanvasItems="false" followPresetName="Ask Me" id="" followPreset="true" blendMode="0">
+        <FrameColor green="0" blue="0" red="0" alpha="255"/>
+        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="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" ymin="-4016655.25382941775023937" xmin="2047764.97328699217177927" ymax="-4015152.22678980929777026"/>
+        <Extent ymin="-4016655.25382941775023937" xmin="2047764.97328699217177927" xmax="2050144.97328941966407001" ymax="-4015152.22678980929777026"/>
         <LayerSet/>
-        <ComposerMapGrid bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" gridFrameWidth="2" leftAnnotationDisplay="0" bottomAnnotationDirection="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" unit="0" gridFramePenThickness="0.5" frameAnnotationDistance="1" annotationPrecision="3" showAnnotation="0" annotationFormat="0" topAnnotationPosition="1" rightAnnotationPosition="1" annotationFontColor="0,0,0,255" frameFillColor1="255,255,255,255" topAnnotationDirection="0" gridFrameStyle="0" intervalX="0" bottomFrameDivisions="0" rightAnnotationDirection="0" gridStyle="0" topFrameDivisions="0" leftAnnotationDirection="0" show="0" rightFrameDivisions="0" name="Grid 1" offsetX="0" annotationExpression="" leftAnnotationPosition="1" crossLength="3" blendMode="0" rightAnnotationDisplay="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" intervalY="0" leftFrameDivisions="0" gridFrameSideFlags="15" offsetY="0">
+        <ComposerMapGrid crossLength="3" annotationExpression="" topFrameDivisions="0" offsetX="0" leftAnnotationPosition="1" rightAnnotationPosition="1" gridFramePenThickness="0.5" topAnnotationPosition="1" bottomFrameDivisions="0" leftFrameDivisions="0" bottomAnnotationDirection="0" blendMode="0" annotationFormat="0" gridFrameStyle="0" topAnnotationDisplay="0" bottomAnnotationPosition="1" gridFrameWidth="2" show="0" rightAnnotationDirection="0" unit="0" gridFrameSideFlags="15" intervalY="0" bottomAnnotationDisplay="0" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" leftAnnotationDirection="0" annotationFontColor="0,0,0,255" rightFrameDivisions="0" frameFillColor2="0,0,0,255" showAnnotation="0" intervalX="0" frameAnnotationDistance="1" offsetY="0" leftAnnotationDisplay="0" rightAnnotationDisplay="0" gridStyle="0" annotationPrecision="3" name="Grid 1" frameFillColor1="255,255,255,255" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}">
           <lineStyle>
-            <symbol name="" type="line" alpha="1" clip_to_extent="1">
-              <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+            <symbol type="line" clip_to_extent="1" name="" alpha="1">
+              <layer class="SimpleLine" enabled="1" pass="0" locked="0">
                 <prop v="square" k="capstyle"/>
                 <prop v="5;2" k="customdash"/>
                 <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -10789,17 +10762,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 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="" type="marker" alpha="1" clip_to_extent="1">
-              <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
+            <symbol type="marker" clip_to_extent="1" name="" alpha="1">
+              <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
                 <prop v="0" k="angle"/>
                 <prop v="0,0,0,255" k="color"/>
                 <prop v="1" k="horizontal_anchor_point"/>
@@ -10820,9 +10793,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 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>
@@ -10830,19 +10803,19 @@ def my_form_open(dialog, layer, feature):
           </markerStyle>
           <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
       </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 coverageLayerSource="/home/tim/directions_to_start.shp" coverageLayerProvider="ogr" hideCoverage="0" coverageLayer="directions_to_start_cf338b4b_1403_45e8_b11f_47b48dd39657" filterFeatures="0" pageNameExpression="" sortFeatures="0" enabled="0" coverageLayerName="directions_to_start" filenamePattern="'Gun Run 2018 - '||&quot;RouteLen&quot;||'KM rev '"/>
+      <Atlas filenamePattern="'Gun Run 2018 - '||&quot;RouteLen&quot;||'KM rev '" sortFeatures="0" enabled="0" coverageLayer="directions_to_start_cf338b4b_1403_45e8_b11f_47b48dd39657" hideCoverage="0" pageNameExpression="" coverageLayerProvider="ogr" coverageLayerName="directions_to_start" coverageLayerSource="/home/tim/Documents/Projects/2018/Gun Run/Maps/GIS base files and routes/directions_to_start.shp" filterFeatures="0"/>
     </Layout>
   </Layouts>
 </qgis>
diff --git a/GIS base files and routes/Residents/Gun Run 2018 - Residents Access.pdf b/GIS base files and routes/Residents/20181001 - Gun Run 2018 - Residents Access.pdf
similarity index 100%
rename from GIS base files and routes/Residents/Gun Run 2018 - Residents Access.pdf
rename to GIS base files and routes/Residents/20181001 - Gun Run 2018 - Residents Access.pdf
diff --git a/GIS base files and routes/Residents/Gun Run 2018 - Residents Access.png b/GIS base files and routes/Residents/20181001 - Gun Run 2018 - Residents Access.png
similarity index 100%
rename from GIS base files and routes/Residents/Gun Run 2018 - Residents Access.png
rename to GIS base files and routes/Residents/20181001 - Gun Run 2018 - Residents Access.png
diff --git a/GIS base files and routes/directions_to_start.dbf b/GIS base files and routes/directions_to_start.dbf
new file mode 100644
index 0000000000000000000000000000000000000000..972e92a5e5e38004455991221718f9a641945f63
GIT binary patch
literal 245
zcmZQB<KkdvU|>jO5CxK$ATtFn<_BVN!MPBIOJ;FNVqS78kmn2%L6_%M(1HU~Z(ju{
XfQxAv8o)&nf<}hK3KFj!VY?IndifqE

literal 0
HcmV?d00001

diff --git a/GIS base files and routes/directions_to_start.prj b/GIS base files and routes/directions_to_start.prj
new file mode 100644
index 0000000..5c6f76d
--- /dev/null
+++ b/GIS base files and routes/directions_to_start.prj	
@@ -0,0 +1 @@
+PROJCS["WGS_1984_Web_Mercator_Auxiliary_Sphere",GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Mercator_Auxiliary_Sphere"],PARAMETER["False_Easting",0.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",0.0],PARAMETER["Standard_Parallel_1",0.0],PARAMETER["Auxiliary_Sphere_Type",0.0],UNIT["Meter",1.0]]
\ No newline at end of file
diff --git a/GIS base files and routes/directions_to_start.qpj b/GIS base files and routes/directions_to_start.qpj
new file mode 100644
index 0000000..1928e8b
--- /dev/null
+++ b/GIS base files and routes/directions_to_start.qpj	
@@ -0,0 +1 @@
+PROJCS["WGS 84 / Pseudo-Mercator",GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]],PROJECTION["Mercator_1SP"],PARAMETER["central_meridian",0],PARAMETER["scale_factor",1],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["X",EAST],AXIS["Y",NORTH],EXTENSION["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"],AUTHORITY["EPSG","3857"]]
diff --git a/GIS base files and routes/directions_to_start.shp b/GIS base files and routes/directions_to_start.shp
new file mode 100644
index 0000000000000000000000000000000000000000..5ead28b186c0fd84f9c2825e89b0b4bf71e15684
GIT binary patch
literal 1776
zcmZwH2~d+q6bJAiC__L2xiMln1Q};4hzF5Mqyj;7@SxfTp#lSFP=ZF{!6jCZlGutI
zDHJgX1W`LcX`}%`IVuU|XiHQ?QKV{%p_*b46%_m5nSN8txRYh(mwmhY-uL)Iqq)#&
z?;W~_hIMH)d}!;!IO~giSw3qn=MG;g4{DJ!%Q*`JSU#3!Hc7FiK`rmy{{Js^z+La2
zm0cLobD}J$<&J0nsd&Ht&LV+SLcRfREC$x7SW%@zZYA<q#cxUX#$E<T*e!)S;x$)S
z!L$asS2>)e{_MNuaAcO?b_IO5=c~ta;qc&^gXdtQUskFnk@qq67MJtz=}WF^2~5?Q
z@6@+B0iK@QbR*Rnn9ZcF$tHtXKYy0b*_y|*Z1IeqrWi2i;Tb)#Jz%H6S)?utOfsg&
z-nNcd$irTXsAvxZ?EO|5GLi?Iy9DdKLEaZb+QY8EnfWXKdIl>71^h?w+S;Q7YIvbM
zxnMS%<#S$p<-<XEfn$WTH_XYi_w0ms%PNa};C5T*nF=`joJ1!OUSAkv+6L!J`;9|j
z_TRmnW|;d!k%S9Rg@%kZ!tCBGu{CN5ylLrv7^Z3~KI5X{!&ze)=~h@j%>2!o2S@3g
zv@?b;s;;uRuqcq(_ZsJQE0ZM=a9|xjaTJagM|*6Cx6~K%4#V|HKN&59OUKz+Y&gYh
z#KaCBULg?8hyBZ?U3563F1BPJ>ZhJ99w}+Tee%cjMA?%KSW8UiCNFsBe|7QqGvZqR
z?Sl>C$e14MwO3UijlBte@qOmlJ8N4}%@H`myQ9t!PBr<ws}gny3JZFRJnjs0KOTT{
z&a7c*VUv3^_-c6VwNqLR>>z*K=!m?9Vhx-0#g(%}y8>Qp5zv1NPHdKS`oUrON~;@i
ztK0P(TVb9HFT58vUTvBZ4lkPM@9c){MOLyH`1zZHBT86f_ImX`xZ{v?q7^P+RrQ{R
zOC!^SwXmq^n0p)S+|cu=9NtqI`p_PIDY$ie{!uuoFN5I-OIEdykiJsywLYDh7Y}<H
zZ?3Y#I$c)n8w;myOsyHidE+L&J3fWKei_aC5uQ0zc;6Q`>-nfX8*V9Mb*+HscQ)Po
z62AWI&tTHm?WQ~H=fD+9H2f*_V(FsNxd-sPsNSF@dYI&$B4Z|IIO*w)xMG6|{0@|y
zj=5KbKHOy2S_rVuc4!kl3?}cE0VWyL8Wn5nCX~%VEGO#0uW5+YDmKI!!Q6(o8Ao8Q
zHmHOSJL<fcoeGCWbvwMqUFLj2c0BAT-Y6w^XQtI=$H7!Cm0flTyJ3c5_cpSwoctu1
z3lC@&SEpbqH>5NRa}%k9Uv*q<g}Wrh>-s7X>yZ+`JqCNrWi>lsQinb!8PpmTD;+34
z=!Do;d(tBgAa+n_u5SY;)*ZJbd59`nU9I7%p~eQ12Xz<EbSrBYoOZ#9PS(dgU3GWD
zA3T`!XTa3mxRPAGm*n|$|9HCsHBi6z$K`H05r{n*GboP4UXrIFCK=Qk6?^S$^_y4N
zo1)6OAVO?W@y(?#;T_9vT^7QE<%J{9;W**g-Yob<U0VM$*hr-e&4hWse_=EV|7_Fz
zFay>T&g;~`Nq5$^rNiGaN5w<1>Q(E60RAJPx^WOT@iHIX4>RQMWp`nAs<>|-Ow~f=
F{tw&G-ah~U

literal 0
HcmV?d00001

diff --git a/GIS base files and routes/directions_to_start.shx b/GIS base files and routes/directions_to_start.shx
new file mode 100644
index 0000000000000000000000000000000000000000..65f3018ecd2636f04f15bd8f8813da0cf739976a
GIT binary patch
literal 156
zcmZQzQ0HR64*Xs)GcW)VgJ*1{_iPt?M~B^$Uu<3CcW{U0l1Nn#dq**0$?B{{eh0B@
tM-epw@-l#U9uOa3U|>uF(hnFInB0Ig6A<|T=>#CX0Z0b`ZDj${1pv%y6jT5J

literal 0
HcmV?d00001

diff --git a/GIS base files and routes/poi_labels.dbf b/GIS base files and routes/poi_labels.dbf
new file mode 100644
index 0000000000000000000000000000000000000000..7db6a11a560702903de00b6f1b4c188ef0f79dc0
GIT binary patch
literal 3239
zcmZQB<KhrxU|?9tuoXyRg3J`Sm>-D61?NH-C6xuKP$6d!9RTIPsJz5nyz(iT#U+V(
z$sjdg{pjZNDrmt$a!!76X;G@e5CCvDYmGXZw$U}jLpm)pFS9s<dO_qyW%H0+h6rh3
zmMtnllA)9tOl9+s+=Fm*Nq%}#Vmgx4AY+<(`@&o_bR2DH0C)A!akP;kR!3*%q?Q!J
zqF^x7$RR!IXj;b95D)3x%H+(FOzH)YZ>2L;%|mh-BBTovi?TEGs8>)27#btlLscd%
V9c@Hamm(QPOGld^*+WgH6adRdyAS{X

literal 0
HcmV?d00001

diff --git a/GIS base files and routes/poi_labels.prj b/GIS base files and routes/poi_labels.prj
new file mode 100644
index 0000000..5c6f76d
--- /dev/null
+++ b/GIS base files and routes/poi_labels.prj	
@@ -0,0 +1 @@
+PROJCS["WGS_1984_Web_Mercator_Auxiliary_Sphere",GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Mercator_Auxiliary_Sphere"],PARAMETER["False_Easting",0.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",0.0],PARAMETER["Standard_Parallel_1",0.0],PARAMETER["Auxiliary_Sphere_Type",0.0],UNIT["Meter",1.0]]
\ No newline at end of file
diff --git a/GIS base files and routes/poi_labels.qpj b/GIS base files and routes/poi_labels.qpj
new file mode 100644
index 0000000..1928e8b
--- /dev/null
+++ b/GIS base files and routes/poi_labels.qpj	
@@ -0,0 +1 @@
+PROJCS["WGS 84 / Pseudo-Mercator",GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]],PROJECTION["Mercator_1SP"],PARAMETER["central_meridian",0],PARAMETER["scale_factor",1],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["X",EAST],AXIS["Y",NORTH],EXTENSION["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"],AUTHORITY["EPSG","3857"]]
diff --git a/GIS base files and routes/poi_labels.shp b/GIS base files and routes/poi_labels.shp
new file mode 100644
index 0000000000000000000000000000000000000000..9d400f491dc64f94007446515999e42fabe4d523
GIT binary patch
literal 576
zcmZQzQ0HR63K$h$Ff%YP0_B3u&)vyzuy_32F3`4fiQmEXd1lrk9`=s&WhP0-FY-Hx
zRXeI6$QUkUvkqQ(dQ<~w7EqiCCO7k8c@U4Az2mer&RI?nIiL$5`e1g>zSpoQZ82CM
z3rue3^DVu%o$VdJG+dF4g6Ly~$tnN3Hsb(L&UBkX#d3%~HkjPP8quU}uJ(=_|GZt6
z1@Q+vOpen~=YOk<y`$R+!F`DkIS!Z{*QHNu0^IE#4=AZ$F@u=N36oQi<qymQ%DL}3
z%H{--1BEZx@6(OKR+|Fl_B+Yl`U^3W8zv_`OLgNepnXVT$^(<@mMYKD1M2GuoEfhQ
zF_RZ2ci-pP=`BDx$@1lfCJ;G3m|Vq4^_=Oz@Px%1P@Eqocl1U1>i16ej+vPqXImj*
pCIFM`{j~qM7tk#?JEXX)A##E+xpP7B&bf~Ej*I>UU+f3U0RS?*k5&Kx

literal 0
HcmV?d00001

diff --git a/GIS base files and routes/poi_labels.shx b/GIS base files and routes/poi_labels.shx
new file mode 100644
index 0000000000000000000000000000000000000000..b24a43c8d056b7680957fddb3e5b66ed00e5e551
GIT binary patch
literal 236
zcmZQzQ0HR64$59IGcYg$<$}%6-N|sUcl_Kg(6)1l-@)~HX4WDe_Kx#qCP~LH@;iuK
zJBp|gkO#8I0ZRKp=@=-T1*I#XbQ_eO0;Ly0=?zeNACx`=rEfv$7f|{egl1%c(n25_
E0EtW(yZ`_I

literal 0
HcmV?d00001

diff --git a/gym-bag.svg b/images/gym-bag.svg
similarity index 96%
rename from gym-bag.svg
rename to images/gym-bag.svg
index de4e3fe..934b308 100644
--- a/gym-bag.svg
+++ b/images/gym-bag.svg
@@ -36,4 +36,4 @@
    inkscape:connector-curvature="0"
    d="M 99.66692,70.421078 93.77715,43.915938 C 92.281856,37.191998 86.426656,32.496354 79.539826,32.496354 H 78.720892 C 77.788871,29.300105 74.828753,22.687297 65.983746,18.798675 l 0.574015,-2.274972 c 0.262497,-1.043738 -0.311324,-2.115794 -1.324396,-2.473993 -4.471821,-1.582793 -9.602811,-2.386494 -15.248444,-2.386494 -5.651882,0 -10.792834,0.805654 -15.28106,2.39665 -1.017175,0.360151 -1.590995,1.438459 -1.322444,2.482 l 0.583196,2.264426 C 25.137574,22.697258 22.18136,29.302644 21.249341,32.496354 h -0.819325 c -6.886635,0 -12.7420311,4.695644 -14.237325,11.419584 L 0.30487379,70.41893 c -0.2115208,0.946081 -0.31933204,1.920679 -0.31933204,2.897229 0,1.083385 0.16523235,2.122239 0.41015122,3.131602 0.0246095,0.105858 0.052343,0.198825 0.0931633,0.299605 1.52556683,5.69075 6.67765103,9.914916 12.84280873,9.914916 H 86.63798 c 7.358894,0 13.346319,-5.987425 13.346319,-13.346123 0,-0.97655 -0.107811,-1.951148 -0.317379,-2.895081 z M 24.985232,82.495732 h -4.16655 V 36.662904 h 4.16655 z m 41.666083,-16.66659 c 0,4.595842 -3.737258,8.333296 -8.333294,8.333296 H 41.651627 c -4.595843,0 -8.333296,-3.737259 -8.333296,-8.333296 V 55.412671 c 0,-1.151548 0.931825,-2.083372 2.083373,-2.083372 h 29.166238 c 1.151549,0 2.083373,0.931824 2.083373,2.083372 z M 25.66784,32.496354 c 1.002723,-2.588053 3.522614,-6.710268 9.36922,-9.524881 l 0.425776,1.653495 c 0.148436,0.577728 0.537103,1.062096 1.066003,1.334553 0.528899,0.272654 1.147446,0.30527 1.704861,0.08946 3.232772,-1.251157 7.185848,-1.885915 11.751221,-1.885915 4.565373,0 8.520402,0.636711 11.753174,1.894117 0.242184,0.0957 0.498431,0.142382 0.754873,0.142382 0.329684,0 0.657218,-0.07734 0.956238,-0.232029 0.5289,-0.274607 0.917567,-0.762882 1.06405,-1.340803 l 0.41933,-1.66209 c 5.873365,2.821059 8.382514,6.941124 9.377619,9.531522 H 25.66784 Z M 79.15116,82.495732 H 74.98461 V 36.662904 h 4.16655 z"
    id="path2"
-   style="fill:param(fill) #FFF;stroke:param(outline) #000;stroke-width:param(outline-width) 1;fill-opacity:1;stroke-opacity:1;" /></svg>
+   style="fill:param(fill) #000;stroke:param(outline) #000;stroke-width:param(outline-width) 0;fill-opacity:1;stroke-opacity:1;" /></svg>
diff --git a/road_closure.svg b/images/road_closure.svg
similarity index 100%
rename from road_closure.svg
rename to images/road_closure.svg