diff --git a/GIS Base Map/Gun Run.qgs b/GIS Base Map/Gun Run.qgs
index 1715b0d..2a60b9f 100644
--- a/GIS Base Map/Gun Run.qgs	
+++ b/GIS Base Map/Gun Run.qgs	
@@ -1,5 +1,5 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis version="3.8.3-Zanzibar" projectname="Gun Run">
+<qgis projectname="Gun Run" version="3.8.3-Zanzibar">
   <homePath path=""/>
   <title>Gun Run</title>
   <autotransaction active="0"/>
@@ -19,57 +19,55 @@
   </projectCrs>
   <layer-tree-group>
     <customproperties/>
-    <layer-tree-group checked="Qt::Unchecked" name="Marshals" expanded="1">
+    <layer-tree-group checked="Qt::Checked" name="Marshals" expanded="0">
       <customproperties/>
-      <layer-tree-layer source="./marshal_positions.shp|layername=marshal_positions" checked="Qt::Checked" name="marshal_positions" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" providerKey="ogr">
+      <layer-tree-layer source="./marshal_positions.shp|layername=marshal_positions" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" providerKey="ogr" checked="Qt::Checked" name="marshal_positions" expanded="1">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-layer source="./extra_security.shp" checked="Qt::Unchecked" name="extra_security" expanded="1" id="extra_security20170921130834191" providerKey="ogr">
+      <layer-tree-layer source="./extra_security.shp" id="extra_security20170921130834191" providerKey="ogr" checked="Qt::Unchecked" name="extra_security" expanded="1">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" checked="Qt::Unchecked" name="marshals_by_position" expanded="1" id="marshals_by_position20161003112326575" providerKey="delimitedtext">
+      <layer-tree-layer source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" id="marshals_by_position20161003112326575" providerKey="delimitedtext" checked="Qt::Unchecked" name="marshals_by_position" expanded="1">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-layer source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" checked="Qt::Unchecked" name="complete_marshal_overview" expanded="1" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" providerKey="virtual">
+      <layer-tree-layer source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" providerKey="virtual" checked="Qt::Unchecked" name="complete_marshal_overview" expanded="1">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-layer source="./marshal overviews.shp|layername=marshal overviews" checked="Qt::Unchecked" name="marshal_overviews" expanded="0" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" providerKey="ogr">
+      <layer-tree-layer source="./marshal overviews.shp|layername=marshal overviews" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" providerKey="ogr" checked="Qt::Unchecked" name="marshal_overviews" expanded="0">
         <customproperties/>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Checked" name="Fencing and Cones" expanded="1">
+    <layer-tree-group checked="Qt::Unchecked" name="Fencing and Cones" expanded="0">
       <customproperties/>
-      <layer-tree-layer source="./fencing.shp|layername=fencing" checked="Qt::Checked" name="fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr">
+      <layer-tree-layer source="./fencing.shp|layername=fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" checked="Qt::Checked" name="fencing" expanded="1">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-layer source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20[name],%20[group]%20FROM%20fencing%20GROUP%20BY%20%22group%22" checked="Qt::Unchecked" name="fence_groups" expanded="1" id="fence_groups_2daa8372_dd22_4979_afdf_08d74ee6b4b1" providerKey="virtual">
+      <layer-tree-layer source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20[name],%20[group]%20FROM%20fencing%20GROUP%20BY%20%22group%22" id="fence_groups_2daa8372_dd22_4979_afdf_08d74ee6b4b1" providerKey="virtual" checked="Qt::Unchecked" name="fence_groups" expanded="1">
         <customproperties/>
       </layer-tree-layer>
     </layer-tree-group>
     <layer-tree-group checked="Qt::Checked" name="Routes" expanded="1">
       <customproperties/>
-      <layer-tree-layer source="./timelapse.shp|layername=timelapse" checked="Qt::Unchecked" name="timelapse" expanded="1" id="timelapse_1e9371ed_fd46_407b_8e2a_21ea46053bfe" providerKey="ogr">
-        <customproperties>
-          <property key="showFeatureCount" value="1"/>
-        </customproperties>
+      <layer-tree-layer source="./timelapse.shp|layername=timelapse" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" providerKey="ogr" checked="Qt::Unchecked" name="timelapse" expanded="1">
+        <customproperties/>
       </layer-tree-layer>
       <layer-tree-group checked="Qt::Checked" name="Markers" expanded="1">
         <customproperties/>
-        <layer-tree-layer source="Point?crs=EPSG:4326&amp;uid={92473fdf-e0f9-4b27-ad1c-fa2cfc7b925d}" checked="Qt::Checked" name="route markers" expanded="1" id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" providerKey="memory">
+        <layer-tree-layer 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=Source:String(20,0)&amp;field=length_m:integer(6,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=org_fid:(0,0)&amp;field=distance:(0,0)&amp;uid={66ec81d1-efa9-4920-b869-b4386f16dabe}" id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" providerKey="memory" checked="Qt::Checked" name="route markers" expanded="1">
           <customproperties>
-            <property key="showFeatureCount" value="1"/>
+            <property value="1" key="showFeatureCount"/>
           </customproperties>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-layer source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" name="all_routes" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr">
+      <layer-tree-layer source="./all_routes.shp|layername=all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" checked="Qt::Checked" name="all_routes" expanded="1">
         <customproperties/>
       </layer-tree-layer>
     </layer-tree-group>
     <layer-tree-group checked="Qt::Checked" name="Feeding Stations" expanded="1">
       <customproperties/>
-      <layer-tree-layer source="./water_tables.shp" checked="Qt::Checked" name="water_tables" expanded="1" id="water_tables20170921142016467" providerKey="ogr">
+      <layer-tree-layer source="./water_tables.shp" id="water_tables20170921142016467" providerKey="ogr" checked="Qt::Checked" name="water_tables" expanded="1">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
@@ -77,47 +75,47 @@
     </layer-tree-group>
     <layer-tree-group checked="Qt::Unchecked" name="Ask Me" expanded="0">
       <customproperties/>
-      <layer-tree-layer source="./poi_labels.shp|layername=poi_labels" checked="Qt::Checked" name="poi_labels" expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" providerKey="ogr">
+      <layer-tree-layer source="./poi_labels.shp|layername=poi_labels" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" providerKey="ogr" checked="Qt::Checked" name="poi_labels" expanded="1">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-layer source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Checked" name="directions_to_start" expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" providerKey="ogr">
+      <layer-tree-layer source="./directions_to_start.shp|layername=directions_to_start" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" providerKey="ogr" checked="Qt::Checked" name="directions_to_start" expanded="1">
         <customproperties/>
       </layer-tree-layer>
     </layer-tree-group>
     <layer-tree-group checked="Qt::Unchecked" name="Residents Access" expanded="0">
       <customproperties/>
-      <layer-tree-layer source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Checked" name="residents_access_roads" expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" providerKey="ogr">
+      <layer-tree-layer source="./residents_access_roads.shp|layername=residents_access_roads" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" providerKey="ogr" checked="Qt::Checked" name="residents_access_roads" expanded="1">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="./residents_access.shp|layername=residents_access" checked="Qt::Unchecked" name="residents_access" expanded="1" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" providerKey="ogr">
+      <layer-tree-layer source="./residents_access.shp|layername=residents_access" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" providerKey="ogr" checked="Qt::Unchecked" name="residents_access" expanded="1">
         <customproperties/>
       </layer-tree-layer>
     </layer-tree-group>
     <layer-tree-group checked="Qt::Checked" name="OSM data" expanded="1">
       <customproperties/>
-      <layer-tree-layer source="./osm_roads.shp" checked="Qt::Checked" name="osm_roads" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" providerKey="ogr">
+      <layer-tree-layer source="./osm_roads.shp" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" providerKey="ogr" checked="Qt::Checked" name="osm_roads" expanded="0">
         <customproperties>
           <property key="expandedLegendNodes"/>
-          <property key="showFeatureCount" value="1"/>
+          <property value="1" key="showFeatureCount"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="./osm_places.shp|layername=osm_places" checked="Qt::Checked" name="osm_places" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" providerKey="ogr">
+      <layer-tree-layer source="./osm_places.shp|layername=osm_places" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" providerKey="ogr" checked="Qt::Checked" name="osm_places" expanded="1">
         <customproperties>
           <property key="expandedLegendNodes"/>
-          <property key="showFeatureCount" value="1"/>
+          <property value="1" key="showFeatureCount"/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
     <layer-tree-group checked="Qt::Unchecked" name="Start and Finish pages" expanded="0">
       <customproperties/>
-      <layer-tree-layer source="./data-comments.shp" checked="Qt::Unchecked" name="data-comments" expanded="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" providerKey="ogr">
+      <layer-tree-layer source="./data-comments.shp" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" providerKey="ogr" checked="Qt::Unchecked" name="data-comments" expanded="1">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="./start_finish_area.shp" checked="Qt::Unchecked" name="start_finish_area" expanded="1" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" providerKey="ogr">
+      <layer-tree-layer source="./start_finish_area.shp" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" providerKey="ogr" checked="Qt::Unchecked" name="start_finish_area" expanded="1">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
@@ -125,20 +123,20 @@
     </layer-tree-group>
     <layer-tree-group checked="Qt::Unchecked" name="Elevation" expanded="0">
       <customproperties/>
-      <layer-tree-layer source="./capetownelevation-1m.shp" checked="Qt::Unchecked" name="capetownelevation-1m" expanded="1" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" providerKey="ogr">
+      <layer-tree-layer source="./capetownelevation-1m.shp" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" providerKey="ogr" checked="Qt::Unchecked" name="capetownelevation-1m" expanded="1">
         <customproperties>
-          <property key="showFeatureCount" value="1"/>
+          <property value="1" key="showFeatureCount"/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
     <layer-tree-group checked="Qt::Checked" name="Map" expanded="1">
       <customproperties/>
-      <layer-tree-layer source="./GDAL-City of Cape Town 2015 Aerial.xml" checked="Qt::Checked" name="GDAL-City of Cape Town 2015 Aerial" expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" providerKey="gdal">
+      <layer-tree-layer source="./GDAL-City of Cape Town 2015 Aerial.xml" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" providerKey="gdal" checked="Qt::Unchecked" name="GDAL-City of Cape Town 2015 Aerial" expanded="1">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="contextualWMSLegend=0&amp;crs=EPSG:3857&amp;dpiMode=7&amp;featureCount=10&amp;format=image/png&amp;layers=ciry26ojy003tgynmznkc1a6q&amp;styles=default&amp;tileMatrixSet=GoogleMapsCompatible&amp;url=https://api.mapbox.com/styles/v1/ragtagtag/ciry26ojy003tgynmznkc1a6q/wmts?access_token%3Dpk.eyJ1IjoicmFndGFndGFnIiwiYSI6ImNpcnh3bnowbTAwMDUyemw1enBtbm50bTgifQ.WXKQzAfdJjsuQ6P6-BLZhg%2314.88/-33.91505/18.39137" checked="Qt::Unchecked" name="Outlines" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" providerKey="wms">
+      <layer-tree-layer 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" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" providerKey="wms" checked="Qt::Checked" name="Outlines" expanded="1">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
@@ -164,45 +162,45 @@
       <item>complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8</item>
       <item>fence_groups_2daa8372_dd22_4979_afdf_08d74ee6b4b1</item>
       <item>all_routes_5833accf_77da_42ef_a24a_197208cd2190</item>
-      <item>timelapse_1e9371ed_fd46_407b_8e2a_21ea46053bfe</item>
       <item>route_markers_137272a0_69df_47f0_82f8_521b9f4bef83</item>
+      <item>timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings intersection-snapping="1" tolerance="10" mode="3" unit="1" type="1" enabled="0">
+  <snapping-settings mode="3" enabled="0" intersection-snapping="1" type="1" tolerance="10" unit="1">
     <individual-layer-settings>
-      <layer-setting units="1" tolerance="12" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" type="2" enabled="0"/>
-      <layer-setting units="1" tolerance="12" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" type="2" enabled="0"/>
-      <layer-setting units="1" tolerance="12" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" type="2" enabled="0"/>
-      <layer-setting units="1" tolerance="12" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" type="2" enabled="0"/>
-      <layer-setting units="1" tolerance="12" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" type="2" enabled="0"/>
-      <layer-setting units="1" tolerance="12" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" type="2" enabled="0"/>
-      <layer-setting units="1" tolerance="12" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" type="2" enabled="0"/>
-      <layer-setting units="1" tolerance="12" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" type="2" enabled="0"/>
-      <layer-setting units="1" tolerance="12" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" type="2" enabled="0"/>
-      <layer-setting units="1" tolerance="12" id="timelapse_1e9371ed_fd46_407b_8e2a_21ea46053bfe" type="2" enabled="0"/>
-      <layer-setting units="1" tolerance="12" id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" type="1" enabled="0"/>
-      <layer-setting units="1" tolerance="12" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" type="2" enabled="0"/>
-      <layer-setting units="1" tolerance="12" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" type="2" enabled="0"/>
-      <layer-setting units="1" tolerance="12" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" type="2" enabled="0"/>
-      <layer-setting units="2" tolerance="0" id="water_tables20170921142016467" type="2" enabled="0"/>
-      <layer-setting units="2" tolerance="0" id="extra_security20170921130834191" type="2" enabled="0"/>
-      <layer-setting units="1" tolerance="12" id="fence_groups_2daa8372_dd22_4979_afdf_08d74ee6b4b1" type="2" enabled="0"/>
-      <layer-setting units="1" tolerance="12" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" type="2" enabled="0"/>
-      <layer-setting units="1" tolerance="20" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" type="2" enabled="1"/>
+      <layer-setting id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" enabled="0" type="2" units="1" tolerance="12"/>
+      <layer-setting id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" enabled="0" type="2" units="1" tolerance="12"/>
+      <layer-setting id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" enabled="0" type="2" units="1" tolerance="12"/>
+      <layer-setting id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" enabled="1" type="2" units="1" tolerance="20"/>
+      <layer-setting id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" enabled="0" type="2" units="1" tolerance="12"/>
+      <layer-setting id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" enabled="0" type="2" units="1" tolerance="12"/>
+      <layer-setting id="water_tables20170921142016467" enabled="0" type="2" units="2" tolerance="0"/>
+      <layer-setting id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" enabled="0" type="2" units="1" tolerance="12"/>
+      <layer-setting id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" enabled="0" type="2" units="1" tolerance="12"/>
+      <layer-setting id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" enabled="0" type="2" units="1" tolerance="12"/>
+      <layer-setting id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" enabled="0" type="2" units="1" tolerance="12"/>
+      <layer-setting id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" enabled="0" type="2" units="1" tolerance="12"/>
+      <layer-setting id="extra_security20170921130834191" enabled="0" type="2" units="2" tolerance="0"/>
+      <layer-setting id="fence_groups_2daa8372_dd22_4979_afdf_08d74ee6b4b1" enabled="0" type="2" units="1" tolerance="12"/>
+      <layer-setting id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" enabled="0" type="1" units="1" tolerance="12"/>
+      <layer-setting id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" enabled="0" type="2" units="1" tolerance="12"/>
+      <layer-setting id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" enabled="0" type="2" units="1" tolerance="12"/>
+      <layer-setting id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" enabled="0" type="2" units="1" tolerance="12"/>
+      <layer-setting id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" enabled="0" type="2" units="1" tolerance="12"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations>
-    <relation strength="Association" name="fence_group_relationship" id="fence_group_rel" referencingLayer="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" referencedLayer="fence_groups_2daa8372_dd22_4979_afdf_08d74ee6b4b1">
-      <fieldRef referencingField="group" referencedField="group"/>
+    <relation referencedLayer="fence_groups_2daa8372_dd22_4979_afdf_08d74ee6b4b1" id="fence_group_rel" strength="Association" name="fence_group_relationship" referencingLayer="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+      <fieldRef referencedField="group" referencingField="group"/>
     </relation>
   </relations>
   <mapcanvas annotationsVisible="1" name="theMapCanvas">
     <units>degrees</units>
     <extent>
-      <xmin>18.40437472216478199</xmin>
-      <ymin>-33.90415462296931537</ymin>
-      <xmax>18.4068947122138411</xmax>
-      <ymax>-33.90273256048882899</ymax>
+      <xmin>18.3516864610643502</xmin>
+      <ymin>-33.94665807501495891</ymin>
+      <xmax>18.4410370362969509</xmax>
+      <ymax>-33.8962364073994209</ymax>
     </extent>
     <rotation>0</rotation>
     <destinationsrs>
@@ -222,135 +220,135 @@
   </mapcanvas>
   <projectModels/>
   <legend updateDrawingOrder="true">
-    <legendgroup open="true" checked="Qt::Unchecked" name="Marshals">
-      <legendlayer open="true" checked="Qt::Checked" name="marshal_positions" drawingOrder="-1" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0"/>
+    <legendgroup checked="Qt::Checked" open="false" name="Marshals">
+      <legendlayer showFeatureCount="0" checked="Qt::Checked" open="true" name="marshal_positions" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="1" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" checked="Qt::Unchecked" name="extra_security" drawingOrder="-1" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="extra_security20170921130834191" visible="0"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" open="true" name="extra_security" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="0" layerid="extra_security20170921130834191" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" checked="Qt::Unchecked" name="marshals_by_position" drawingOrder="-1" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="marshals_by_position20161003112326575" visible="0"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" open="true" name="marshals_by_position" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="0" layerid="marshals_by_position20161003112326575" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" checked="Qt::Unchecked" name="complete_marshal_overview" drawingOrder="-1" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" visible="0"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" open="true" name="complete_marshal_overview" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="false" checked="Qt::Unchecked" name="marshal_overviews" drawingOrder="-1" showFeatureCount="0">
-        <filegroup open="false" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" visible="0"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" open="false" name="marshal_overviews" drawingOrder="-1">
+        <filegroup hidden="false" open="false">
+          <legendlayerfile visible="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" checked="Qt::Checked" name="Fencing and Cones">
-      <legendlayer open="true" checked="Qt::Checked" name="fencing" drawingOrder="-1" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1"/>
+    <legendgroup checked="Qt::Unchecked" open="false" name="Fencing and Cones">
+      <legendlayer showFeatureCount="0" checked="Qt::Checked" open="true" name="fencing" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" checked="Qt::Unchecked" name="fence_groups" drawingOrder="-1" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="fence_groups_2daa8372_dd22_4979_afdf_08d74ee6b4b1" visible="0"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" open="true" name="fence_groups" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="0" layerid="fence_groups_2daa8372_dd22_4979_afdf_08d74ee6b4b1" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" checked="Qt::Checked" name="Routes">
-      <legendlayer open="true" checked="Qt::Unchecked" name="timelapse" drawingOrder="-1" showFeatureCount="1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="timelapse_1e9371ed_fd46_407b_8e2a_21ea46053bfe" visible="0"/>
+    <legendgroup checked="Qt::Checked" open="true" name="Routes">
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" open="true" name="timelapse" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="0" layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendgroup open="true" checked="Qt::Checked" name="Markers">
-        <legendlayer open="true" checked="Qt::Checked" name="route markers" drawingOrder="-1" showFeatureCount="1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile isInOverview="0" layerid="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" visible="1"/>
+      <legendgroup checked="Qt::Checked" open="true" name="Markers">
+        <legendlayer showFeatureCount="1" checked="Qt::Checked" open="true" name="route markers" drawingOrder="-1">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="1" layerid="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" isInOverview="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendlayer open="true" checked="Qt::Checked" name="all_routes" drawingOrder="-1" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Checked" open="true" name="all_routes" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="1" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" checked="Qt::Checked" name="Feeding Stations">
-      <legendlayer open="true" checked="Qt::Checked" name="water_tables" drawingOrder="-1" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="water_tables20170921142016467" visible="1"/>
+    <legendgroup checked="Qt::Checked" open="true" name="Feeding Stations">
+      <legendlayer showFeatureCount="0" checked="Qt::Checked" open="true" name="water_tables" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="1" layerid="water_tables20170921142016467" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" checked="Qt::Unchecked" name="Ask Me">
-      <legendlayer open="true" checked="Qt::Checked" name="poi_labels" drawingOrder="-1" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" visible="0"/>
+    <legendgroup checked="Qt::Unchecked" open="false" name="Ask Me">
+      <legendlayer showFeatureCount="0" checked="Qt::Checked" open="true" name="poi_labels" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" checked="Qt::Checked" name="directions_to_start" drawingOrder="-1" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="0"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Checked" open="true" name="directions_to_start" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" checked="Qt::Unchecked" name="Residents Access">
-      <legendlayer open="true" checked="Qt::Checked" name="residents_access_roads" drawingOrder="-1" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="0"/>
+    <legendgroup checked="Qt::Unchecked" open="false" name="Residents Access">
+      <legendlayer showFeatureCount="0" checked="Qt::Checked" open="true" name="residents_access_roads" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" checked="Qt::Unchecked" name="residents_access" drawingOrder="-1" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" visible="0"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" open="true" name="residents_access" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" checked="Qt::Checked" name="OSM data">
-      <legendlayer open="false" checked="Qt::Checked" name="osm_roads" drawingOrder="-1" showFeatureCount="1">
-        <filegroup open="false" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
+    <legendgroup checked="Qt::Checked" open="true" name="OSM data">
+      <legendlayer showFeatureCount="1" checked="Qt::Checked" open="false" name="osm_roads" drawingOrder="-1">
+        <filegroup hidden="false" open="false">
+          <legendlayerfile visible="1" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" checked="Qt::Checked" name="osm_places" drawingOrder="-1" showFeatureCount="1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1"/>
+      <legendlayer showFeatureCount="1" checked="Qt::Checked" open="true" name="osm_places" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="1" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" checked="Qt::Unchecked" name="Start and Finish pages">
-      <legendlayer open="true" checked="Qt::Unchecked" name="data-comments" drawingOrder="-1" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" visible="0"/>
+    <legendgroup checked="Qt::Unchecked" open="false" name="Start and Finish pages">
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" open="true" name="data-comments" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" checked="Qt::Unchecked" name="start_finish_area" drawingOrder="-1" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" visible="0"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" open="true" name="start_finish_area" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" checked="Qt::Unchecked" name="Elevation">
-      <legendlayer open="true" checked="Qt::Unchecked" name="capetownelevation-1m" drawingOrder="-1" showFeatureCount="1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" visible="0"/>
+    <legendgroup checked="Qt::Unchecked" open="false" name="Elevation">
+      <legendlayer showFeatureCount="1" checked="Qt::Unchecked" open="true" name="capetownelevation-1m" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" checked="Qt::Checked" name="Map">
-      <legendlayer open="true" checked="Qt::Checked" name="GDAL-City of Cape Town 2015 Aerial" drawingOrder="-1" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1"/>
+    <legendgroup checked="Qt::Checked" open="true" name="Map">
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" open="true" name="GDAL-City of Cape Town 2015 Aerial" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" checked="Qt::Unchecked" name="Outlines" drawingOrder="-1" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="0"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Checked" open="true" name="Outlines" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="1" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
@@ -358,7 +356,7 @@
   <mapViewDocks/>
   <mapViewDocks3D/>
   <projectlayers>
-    <maplayer autoRefreshEnabled="0" maxScale="100000" refreshOnNotifyEnabled="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" type="raster" minScale="1e+08">
+    <maplayer hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" maxScale="100000" refreshOnNotifyEnabled="0" minScale="1e+08" type="raster" autoRefreshEnabled="0" autoRefreshTime="0">
       <extent>
         <xmin>-20037508.33999999985098839</xmin>
         <ymin>-20037508.33999999985098839</ymin>
@@ -415,7 +413,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
+          <spatial minz="0" minx="0" maxz="0" maxy="0" maxx="0" crs="" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -426,9 +424,9 @@
       </resourceMetadata>
       <provider>gdal</provider>
       <noData>
-        <noDataList bandNo="1" useSrcNoData="0"/>
-        <noDataList bandNo="2" useSrcNoData="0"/>
-        <noDataList bandNo="3" useSrcNoData="0"/>
+        <noDataList useSrcNoData="0" bandNo="1"/>
+        <noDataList useSrcNoData="0" bandNo="2"/>
+        <noDataList useSrcNoData="0" bandNo="3"/>
       </noData>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -439,13 +437,13 @@
         <Searchable>0</Searchable>
       </flags>
       <customproperties>
-        <property key="WMSBackgroundLayer" value="false"/>
-        <property key="WMSPublishDataSourceUrl" value="false"/>
-        <property key="embeddedWidgets/count" value="0"/>
-        <property key="identify/format" value="Value"/>
+        <property value="false" key="WMSBackgroundLayer"/>
+        <property value="false" key="WMSPublishDataSourceUrl"/>
+        <property value="0" key="embeddedWidgets/count"/>
+        <property value="Value" key="identify/format"/>
       </customproperties>
       <pipe>
-        <rasterrenderer alphaBand="-1" redBand="1" greenBand="2" type="multibandcolor" opacity="0.6" blueBand="3">
+        <rasterrenderer alphaBand="-1" opacity="0.6" blueBand="3" greenBand="2" type="multibandcolor" redBand="1">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -457,12 +455,12 @@
           </minMaxOrigin>
         </rasterrenderer>
         <brightnesscontrast brightness="0" contrast="0"/>
-        <huesaturation colorizeStrength="100" colorizeGreen="128" colorizeOn="0" grayscaleMode="0" colorizeRed="255" colorizeBlue="128" saturation="0"/>
+        <huesaturation saturation="0" colorizeRed="255" colorizeGreen="128" colorizeBlue="128" colorizeOn="0" colorizeStrength="100" grayscaleMode="0"/>
         <rasterresampler maxOversampling="2"/>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" maxScale="0" refreshOnNotifyEnabled="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" type="raster" minScale="1e+08">
+    <maplayer hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" maxScale="0" refreshOnNotifyEnabled="0" minScale="1e+08" type="raster" autoRefreshEnabled="0" autoRefreshTime="0">
       <extent>
         <xmin>-20037508.34278924390673637</xmin>
         <ymin>-20037508.62692910060286522</ymin>
@@ -519,7 +517,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
+          <spatial minz="0" minx="0" maxz="0" maxy="0" maxx="0" crs="" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -530,7 +528,7 @@
       </resourceMetadata>
       <provider>wms</provider>
       <noData>
-        <noDataList bandNo="1" useSrcNoData="0"/>
+        <noDataList useSrcNoData="0" bandNo="1"/>
       </noData>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -541,13 +539,13 @@
         <Searchable>0</Searchable>
       </flags>
       <customproperties>
-        <property key="WMSBackgroundLayer" value="true"/>
-        <property key="WMSPublishDataSourceUrl" value="false"/>
-        <property key="embeddedWidgets/count" value="0"/>
-        <property key="identify/format" value="Undefined"/>
+        <property value="true" key="WMSBackgroundLayer"/>
+        <property value="false" key="WMSPublishDataSourceUrl"/>
+        <property value="0" key="embeddedWidgets/count"/>
+        <property value="Undefined" key="identify/format"/>
       </customproperties>
       <pipe>
-        <rasterrenderer alphaBand="-1" band="1" type="singlebandcolordata" opacity="0.75">
+        <rasterrenderer alphaBand="-1" opacity="0.75" band="1" type="singlebandcolordata">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -559,12 +557,12 @@
           </minMaxOrigin>
         </rasterrenderer>
         <brightnesscontrast brightness="0" contrast="0"/>
-        <huesaturation colorizeStrength="100" colorizeGreen="128" colorizeOn="0" grayscaleMode="0" colorizeRed="255" colorizeBlue="128" saturation="0"/>
+        <huesaturation saturation="0" colorizeRed="255" colorizeGreen="128" colorizeBlue="128" colorizeOn="0" colorizeStrength="100" grayscaleMode="0"/>
         <rasterresampler maxOversampling="2"/>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer maxScale="100000" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Line" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" simplifyDrawingTol="1">
+    <maplayer styleCategories="AllStyleCategories" refreshOnNotifyMessage="" simplifyAlgorithm="0" maxScale="100000" geometry="Line" simplifyMaxScale="1" simplifyLocal="1" labelsEnabled="1" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" type="vector" minScale="1e+08" readOnly="0" autoRefreshTime="0" autoRefreshEnabled="0" simplifyDrawingTol="1" wkbType="MultiLineString" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37527226735897301</xmin>
         <ymin>-33.94586066151139647</ymin>
@@ -621,7 +619,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
+          <spatial minz="0" minx="0" maxz="0" maxy="0" maxx="0" crs="" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -636,8 +634,8 @@
       <dataDependencies/>
       <legend type="default-vector"/>
       <expressionfields>
-        <field name="length_m" expression="$length" typeName="integer" length="6" subType="0" precision="0" comment="" type="2"/>
-        <field name="length_km" expression="$length / 1000" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
+        <field precision="0" subType="0" typeName="integer" name="length_m" type="2" length="6" comment="" expression="$length"/>
+        <field precision="0" subType="0" typeName="double precision" name="length_km" type="6" length="-1" comment="" expression="$length / 1000"/>
       </expressionfields>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -648,18 +646,18 @@
         <Removable>0</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" type="RuleRenderer" forceraster="0" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" enableorderby="0" forceraster="0" symbollevels="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule symbol="0" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" description="Only show when active in Atlas" label="Active Routes" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )">
-            <rule symbol="1" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" description="This should be disabled, since it's only for legends" label="21KM" checkstate="0" filter="&quot;Distance&quot; = '21KM'"/>
-            <rule symbol="2" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" description="This should be disabled, since it's only for legends" label="10KM" filter="&quot;Distance&quot; = '10KM'"/>
-            <rule symbol="3" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" description="This should be disabled, since it's only for legends" label="5KM" checkstate="0" filter="&quot;Distance&quot; = '25'"/>
+          <rule symbol="0" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )" label="Active Routes" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" description="Only show when active in Atlas">
+            <rule symbol="1" filter="&quot;Distance&quot; = '21KM'" checkstate="0" label="21KM" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" description="This should be disabled, since it's only for legends"/>
+            <rule symbol="2" filter="&quot;Distance&quot; = '10KM'" label="10KM" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" description="This should be disabled, since it's only for legends"/>
+            <rule symbol="3" filter="&quot;Distance&quot; = '25'" checkstate="0" label="5KM" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" description="This should be disabled, since it's only for legends"/>
           </rule>
-          <rule symbol="4" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" label="Always show" checkstate="0"/>
+          <rule symbol="4" checkstate="0" label="Always show" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
         </rules>
         <symbols>
-          <symbol name="0" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+          <symbol force_rhr="0" name="0" clip_to_extent="1" type="line" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="MarkerLine">
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="average_angle_unit" v="MM"/>
@@ -693,8 +691,8 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@0@0" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+              <symbol force_rhr="0" name="@0@0" clip_to_extent="1" type="marker" alpha="1">
+                <layer pass="0" locked="0" enabled="1" class="FilledMarker">
                   <prop k="angle" v="0"/>
                   <prop k="color" v="0,0,0,255"/>
                   <prop k="horizontal_anchor_point" v="1"/>
@@ -714,8 +712,8 @@
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@0@0@0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                  <symbol force_rhr="0" name="@@0@0@0" clip_to_extent="1" type="fill" alpha="1">
+                    <layer pass="0" locked="0" enabled="1" class="SimpleFill">
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,0,0,255"/>
                       <prop k="joinstyle" v="bevel"/>
@@ -745,7 +743,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleLine">
               <prop k="capstyle" v="square"/>
               <prop k="customdash" v="5;2"/>
               <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -776,7 +774,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer pass="0" locked="0" enabled="1" class="MarkerLine">
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="average_angle_unit" v="MM"/>
@@ -799,8 +797,8 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@0@2" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <symbol force_rhr="0" name="@0@2" clip_to_extent="1" type="marker" alpha="1">
+                <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
                   <prop k="angle" v="0"/>
                   <prop k="color" v="0,0,0,255"/>
                   <prop k="horizontal_anchor_point" v="1"/>
@@ -835,7 +833,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer pass="0" locked="0" enabled="1" class="MarkerLine">
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="average_angle_unit" v="MM"/>
@@ -858,8 +856,8 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@0@3" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <symbol force_rhr="0" name="@0@3" clip_to_extent="1" type="marker" alpha="1">
+                <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
                   <prop k="angle" v="0"/>
                   <prop k="color" v="0,0,0,255"/>
                   <prop k="horizontal_anchor_point" v="1"/>
@@ -895,8 +893,8 @@
               </symbol>
             </layer>
           </symbol>
-          <symbol name="1" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+          <symbol force_rhr="0" name="1" clip_to_extent="1" type="line" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="MarkerLine">
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="average_angle_unit" v="MM"/>
@@ -930,8 +928,8 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@1@0" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+              <symbol force_rhr="0" name="@1@0" clip_to_extent="1" type="marker" alpha="1">
+                <layer pass="0" locked="0" enabled="1" class="FilledMarker">
                   <prop k="angle" v="0"/>
                   <prop k="color" v="210,32,39,255"/>
                   <prop k="horizontal_anchor_point" v="1"/>
@@ -951,8 +949,8 @@
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@1@0@0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                  <symbol force_rhr="0" name="@@1@0@0" clip_to_extent="1" type="fill" alpha="1">
+                    <layer pass="0" locked="0" enabled="1" class="SimpleFill">
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="210,32,39,255"/>
                       <prop k="joinstyle" v="bevel"/>
@@ -982,7 +980,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleLine">
               <prop k="capstyle" v="square"/>
               <prop k="customdash" v="5;2"/>
               <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1013,7 +1011,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer pass="0" locked="0" enabled="1" class="MarkerLine">
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="average_angle_unit" v="MM"/>
@@ -1036,8 +1034,8 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@1@2" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <symbol force_rhr="0" name="@1@2" clip_to_extent="1" type="marker" alpha="1">
+                <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
                   <prop k="angle" v="0"/>
                   <prop k="color" v="210,32,39,255"/>
                   <prop k="horizontal_anchor_point" v="1"/>
@@ -1072,7 +1070,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer pass="0" locked="0" enabled="1" class="MarkerLine">
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="average_angle_unit" v="MM"/>
@@ -1095,8 +1093,8 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@1@3" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <symbol force_rhr="0" name="@1@3" clip_to_extent="1" type="marker" alpha="1">
+                <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
                   <prop k="angle" v="0"/>
                   <prop k="color" v="210,32,39,255"/>
                   <prop k="horizontal_anchor_point" v="1"/>
@@ -1132,8 +1130,8 @@
               </symbol>
             </layer>
           </symbol>
-          <symbol name="2" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+          <symbol force_rhr="0" name="2" clip_to_extent="1" type="line" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="MarkerLine">
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="average_angle_unit" v="MM"/>
@@ -1167,8 +1165,8 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@0" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+              <symbol force_rhr="0" name="@2@0" clip_to_extent="1" type="marker" alpha="1">
+                <layer pass="0" locked="0" enabled="1" class="FilledMarker">
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
                   <prop k="horizontal_anchor_point" v="1"/>
@@ -1188,8 +1186,8 @@
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@2@0@0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                  <symbol force_rhr="0" name="@@2@0@0" clip_to_extent="1" type="fill" alpha="1">
+                    <layer pass="0" locked="0" enabled="1" class="SimpleFill">
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
                       <prop k="joinstyle" v="bevel"/>
@@ -1219,7 +1217,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleLine">
               <prop k="capstyle" v="square"/>
               <prop k="customdash" v="5;2"/>
               <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1250,7 +1248,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer pass="0" locked="0" enabled="1" class="MarkerLine">
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="average_angle_unit" v="MM"/>
@@ -1273,8 +1271,8 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@2" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <symbol force_rhr="0" name="@2@2" clip_to_extent="1" type="marker" alpha="1">
+                <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
                   <prop k="horizontal_anchor_point" v="1"/>
@@ -1309,7 +1307,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer pass="0" locked="0" enabled="1" class="MarkerLine">
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="average_angle_unit" v="MM"/>
@@ -1332,8 +1330,8 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@3" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <symbol force_rhr="0" name="@2@3" clip_to_extent="1" type="marker" alpha="1">
+                <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
                   <prop k="horizontal_anchor_point" v="1"/>
@@ -1369,8 +1367,8 @@
               </symbol>
             </layer>
           </symbol>
-          <symbol name="3" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+          <symbol force_rhr="0" name="3" clip_to_extent="1" type="line" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="MarkerLine">
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="average_angle_unit" v="MM"/>
@@ -1404,8 +1402,8 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@3@0" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+              <symbol force_rhr="0" name="@3@0" clip_to_extent="1" type="marker" alpha="1">
+                <layer pass="0" locked="0" enabled="1" class="FilledMarker">
                   <prop k="angle" v="0"/>
                   <prop k="color" v="145,211,55,255"/>
                   <prop k="horizontal_anchor_point" v="1"/>
@@ -1425,8 +1423,8 @@
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@3@0@0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                  <symbol force_rhr="0" name="@@3@0@0" clip_to_extent="1" type="fill" alpha="1">
+                    <layer pass="0" locked="0" enabled="1" class="SimpleFill">
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="145,211,55,255"/>
                       <prop k="joinstyle" v="bevel"/>
@@ -1456,7 +1454,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleLine">
               <prop k="capstyle" v="square"/>
               <prop k="customdash" v="5;2"/>
               <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1487,7 +1485,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer pass="0" locked="0" enabled="1" class="MarkerLine">
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="average_angle_unit" v="MM"/>
@@ -1510,8 +1508,8 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@3@2" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <symbol force_rhr="0" name="@3@2" clip_to_extent="1" type="marker" alpha="1">
+                <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
                   <prop k="angle" v="0"/>
                   <prop k="color" v="145,211,55,255"/>
                   <prop k="horizontal_anchor_point" v="1"/>
@@ -1546,7 +1544,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer pass="0" locked="0" enabled="1" class="MarkerLine">
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="average_angle_unit" v="MM"/>
@@ -1569,8 +1567,8 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@3@3" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <symbol force_rhr="0" name="@3@3" clip_to_extent="1" type="marker" alpha="1">
+                <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
                   <prop k="angle" v="0"/>
                   <prop k="color" v="145,211,55,255"/>
                   <prop k="horizontal_anchor_point" v="1"/>
@@ -1606,8 +1604,8 @@
               </symbol>
             </layer>
           </symbol>
-          <symbol name="4" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+          <symbol force_rhr="0" name="4" clip_to_extent="1" type="line" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleLine">
               <prop k="capstyle" v="square"/>
               <prop k="customdash" v="5;2"/>
               <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1641,22 +1639,22 @@
           </symbol>
         </symbols>
         <orderby>
-          <orderByClause asc="0" nullsFirst="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
+          <orderByClause nullsFirst="0" asc="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
         </orderby>
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{86cc78bd-cf95-435a-99c5-13093c859aa5}">
-          <rule key="{68d5cde2-f285-4651-b007-1511cc17bfbe}" description="Active routes" active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
+          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{68d5cde2-f285-4651-b007-1511cc17bfbe}" active="0" description="Active routes">
             <settings>
-              <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="1" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="1" fontSizeUnit="Point" fieldName="round($length / 1000, 0)" fontSize="10" blendMode="0" textColor="255,255,255,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
-                <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
-                <background shapeFillColor="0,0,0,255" shapeJoinStyle="128" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="1" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="1" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="1" shapeRadiiX="1" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+              <text-style fontLetterSpacing="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Semibold" textColor="255,255,255,255" multilineHeight="1" fontSize="10" fontWeight="63" fieldName="round($length / 1000, 0)" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="1" useSubstitutions="0" fontUnderline="0">
+                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeType="0" shapeFillColor="0,0,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiY="1" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="128" shapeBorderWidthUnit="MM" shapeDraw="1" shapeOpacity="1" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="0" shapeRadiiX="1" shapeBorderWidth="1" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0" wrapChar="" decimals="0"/>
-              <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="0" geometryGeneratorEnabled="1" repeatDistanceUnits="MM" quadOffset="3" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="km_marker()" dist="2" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="10" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
-              <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="2" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
+              <text-format multilineAlign="0" autoWrapLength="0" plussign="0" addDirectionSymbol="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+              <placement maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="0" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" geometryGeneratorType="PointGeometry" quadOffset="3" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="2" centroidInside="0" geometryGenerator="km_marker()" placementFlags="10" geometryGeneratorEnabled="1" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" maxCurvedCharAngleIn="20" priority="10"/>
+              <rendering displayAll="1" upsidedownLabels="0" mergeLines="0" fontLimitPixelSize="0" maxNumLabels="2000" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="1" scaleMax="10000000" minFeatureSize="0" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="0" fontMaxPixelSize="10000" scaleMin="1" obstacleFactor="2"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -1712,20 +1710,20 @@
           <value>COALESCE( "Name", '&lt;NULL>' )</value>
           <value>COALESCE( "Name", '&lt;NULL>' )</value>
         </property>
-        <property key="embeddedWidgets/count" value="0"/>
+        <property value="0" key="embeddedWidgets/count"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory enabled="0" minScaleDenominator="100000" width="15" rotationOffset="270" penColor="#000000" penAlpha="255" height="15" penWidth="0" diagramOrientation="Up" backgroundColor="#ffffff" scaleDependency="Area" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" opacity="1" lineSizeType="MM" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeType="MM" scaleBasedVisibility="0" backgroundAlpha="255" barWidth="5">
           <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
-          <attribute field="" color="#000000" label=""/>
+          <attribute color="#000000" label="" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" priority="0" dist="0" placement="2" obstacle="0" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" showAll="1" placement="2" linePlacementFlags="2" obstacle="0" dist="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -1734,7 +1732,7 @@
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -1841,16 +1839,16 @@
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" index="0" name=""/>
-        <alias field="descriptio" index="1" name=""/>
-        <alias field="timestamp" index="2" name=""/>
-        <alias field="begin" index="3" name=""/>
-        <alias field="end" index="4" name=""/>
-        <alias field="Distance" index="5" name=""/>
-        <alias field="RouteLen" index="6" name=""/>
-        <alias field="Source" index="7" name=""/>
-        <alias field="length_m" index="8" name=""/>
-        <alias field="length_km" index="9" name=""/>
+        <alias index="0" field="Name" name=""/>
+        <alias index="1" field="descriptio" name=""/>
+        <alias index="2" field="timestamp" name=""/>
+        <alias index="3" field="begin" name=""/>
+        <alias index="4" field="end" name=""/>
+        <alias index="5" field="Distance" name=""/>
+        <alias index="6" field="RouteLen" name=""/>
+        <alias index="7" field="Source" name=""/>
+        <alias index="8" field="length_m" name=""/>
+        <alias index="9" field="length_km" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -1867,49 +1865,49 @@
         <default field="length_km" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="Name" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="descriptio" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="timestamp" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="begin" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="end" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="Distance" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="RouteLen" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="Source" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="length_m" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="length_km" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint exp_strength="0" field="Name" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="descriptio" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="timestamp" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="begin" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="end" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="Distance" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="RouteLen" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="Source" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="length_m" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="length_km" constraints="0" notnull_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="Name" exp="" desc=""/>
-        <constraint field="descriptio" exp="" desc=""/>
-        <constraint field="timestamp" exp="" desc=""/>
-        <constraint field="begin" exp="" desc=""/>
-        <constraint field="end" exp="" desc=""/>
-        <constraint field="Distance" exp="" desc=""/>
-        <constraint field="RouteLen" exp="" desc=""/>
-        <constraint field="Source" exp="" desc=""/>
-        <constraint field="length_m" exp="" desc=""/>
-        <constraint field="length_km" exp="" desc=""/>
+        <constraint exp="" field="Name" desc=""/>
+        <constraint exp="" field="descriptio" desc=""/>
+        <constraint exp="" field="timestamp" desc=""/>
+        <constraint exp="" field="begin" desc=""/>
+        <constraint exp="" field="end" desc=""/>
+        <constraint exp="" field="Distance" desc=""/>
+        <constraint exp="" field="RouteLen" desc=""/>
+        <constraint exp="" field="Source" desc=""/>
+        <constraint exp="" field="length_m" desc=""/>
+        <constraint exp="" field="length_km" desc=""/>
       </constraintExpressions>
       <expressionfields>
-        <field name="length_m" expression="$length" typeName="integer" length="6" subType="0" precision="0" comment="" type="2"/>
-        <field name="length_km" expression="$length / 1000" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
+        <field precision="0" subType="0" typeName="integer" name="length_m" type="2" length="6" comment="" expression="$length"/>
+        <field precision="0" subType="0" typeName="double precision" name="length_km" type="6" length="-1" comment="" expression="$length / 1000"/>
       </expressionfields>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;Name&quot;">
+      <attributetableconfig sortExpression="&quot;Name&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" name="Name" hidden="0" type="field"/>
-          <column width="-1" name="descriptio" hidden="0" type="field"/>
-          <column width="-1" name="timestamp" hidden="0" type="field"/>
-          <column width="163" name="begin" hidden="0" type="field"/>
-          <column width="-1" name="end" hidden="0" type="field"/>
-          <column width="-1" name="Distance" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="RouteLen" hidden="0" type="field"/>
-          <column width="-1" name="Source" hidden="0" type="field"/>
-          <column width="-1" name="length_m" hidden="0" type="field"/>
-          <column width="-1" name="length_km" hidden="0" type="field"/>
+          <column hidden="0" name="Name" type="field" width="-1"/>
+          <column hidden="0" name="descriptio" type="field" width="-1"/>
+          <column hidden="0" name="timestamp" type="field" width="-1"/>
+          <column hidden="0" name="begin" type="field" width="163"/>
+          <column hidden="0" name="end" type="field" width="-1"/>
+          <column hidden="0" name="Distance" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="RouteLen" type="field" width="-1"/>
+          <column hidden="0" name="Source" type="field" width="-1"/>
+          <column hidden="0" name="length_m" type="field" width="-1"/>
+          <column hidden="0" name="length_km" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -1940,34 +1938,34 @@ 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="0"/>
-        <field name="length_m" editable="0"/>
-        <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="0" name="length_km"/>
+        <field editable="0" name="length_m"/>
+        <field editable="1" name="timestamp"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="Distance"/>
-        <field labelOnTop="0" name="Name"/>
-        <field labelOnTop="0" name="RouteLen"/>
-        <field labelOnTop="0" name="Source"/>
-        <field labelOnTop="0" name="begin"/>
-        <field labelOnTop="0" name="descriptio"/>
-        <field labelOnTop="0" name="end"/>
-        <field labelOnTop="0" name="length_km"/>
-        <field labelOnTop="0" name="length_m"/>
-        <field labelOnTop="0" name="timestamp"/>
+        <field name="Distance" labelOnTop="0"/>
+        <field name="Name" labelOnTop="0"/>
+        <field name="RouteLen" labelOnTop="0"/>
+        <field name="Source" labelOnTop="0"/>
+        <field name="begin" labelOnTop="0"/>
+        <field name="descriptio" labelOnTop="0"/>
+        <field name="end" labelOnTop="0"/>
+        <field name="length_km" labelOnTop="0"/>
+        <field name="length_m" labelOnTop="0"/>
+        <field name="timestamp" labelOnTop="0"/>
       </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" simplifyLocal="1" readOnly="0" geometry="Line" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" wkbType="MultiLineString" simplifyDrawingTol="1">
+    <maplayer styleCategories="AllStyleCategories" refreshOnNotifyMessage="" simplifyAlgorithm="0" maxScale="0" geometry="Line" simplifyMaxScale="1" simplifyLocal="1" labelsEnabled="0" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" type="vector" minScale="1e+08" readOnly="0" autoRefreshTime="0" autoRefreshEnabled="0" simplifyDrawingTol="1" wkbType="MultiLineString" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>17.99958333333333371</xmin>
         <ymin>-34.00041666666666629</ymin>
@@ -2031,10 +2029,10 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" type="singleSymbol" forceraster="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" enableorderby="0" forceraster="0" symbollevels="0">
         <symbols>
-          <symbol name="0" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+          <symbol force_rhr="0" name="0" clip_to_extent="1" type="line" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleLine">
               <prop k="capstyle" v="square"/>
               <prop k="customdash" v="5;2"/>
               <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2068,7 +2066,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -2096,9 +2094,9 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="ID" index="0" name=""/>
-        <alias field="height" index="1" name=""/>
-        <alias field="elevation" index="2" name=""/>
+        <alias index="0" field="ID" name=""/>
+        <alias index="1" field="height" name=""/>
+        <alias index="2" field="elevation" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -2108,20 +2106,20 @@ def my_form_open(dialog, layer, feature):
         <default field="elevation" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="ID" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="height" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="elevation" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint exp_strength="0" field="ID" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="height" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="elevation" constraints="0" notnull_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="ID" exp="" desc=""/>
-        <constraint field="height" exp="" desc=""/>
-        <constraint field="elevation" exp="" desc=""/>
+        <constraint exp="" field="ID" desc=""/>
+        <constraint exp="" field="height" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -2141,7 +2139,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" simplifyLocal="1" readOnly="0" geometry="Polygon" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" wkbType="Polygon" simplifyDrawingTol="1">
+    <maplayer styleCategories="AllStyleCategories" refreshOnNotifyMessage="" simplifyAlgorithm="0" maxScale="0" geometry="Polygon" simplifyMaxScale="1" simplifyLocal="1" labelsEnabled="0" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" type="vector" minScale="1e+08" readOnly="0" autoRefreshTime="0" autoRefreshEnabled="0" simplifyDrawingTol="1" wkbType="Polygon" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.94678832168284544</ymin>
@@ -2207,10 +2205,10 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" type="singleSymbol" forceraster="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" enableorderby="0" forceraster="0" symbollevels="0">
         <symbols>
-          <symbol name="0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+          <symbol force_rhr="0" name="0" clip_to_extent="1" type="fill" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleFill">
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="225,89,137,255"/>
               <prop k="joinstyle" v="bevel"/>
@@ -2239,7 +2237,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option value="" type="QString"/>
         </activeChecks>
@@ -2269,9 +2267,9 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="page" index="2" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
+        <alias index="2" field="page" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -2281,20 +2279,20 @@ def my_form_open(dialog, layer, feature):
         <default field="page" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="type" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="page" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint exp_strength="0" field="id" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="page" constraints="0" notnull_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="page" exp="" desc=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="type" desc=""/>
+        <constraint exp="" field="page" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -2314,7 +2312,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Line" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" wkbType="MultiLineString" simplifyDrawingTol="1">
+    <maplayer styleCategories="AllStyleCategories" refreshOnNotifyMessage="" simplifyAlgorithm="0" maxScale="0" geometry="Line" simplifyMaxScale="1" simplifyLocal="1" labelsEnabled="1" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" type="vector" minScale="1e+08" readOnly="0" autoRefreshTime="0" autoRefreshEnabled="0" simplifyDrawingTol="1" wkbType="MultiLineString" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.41275838185438474</xmin>
         <ymin>-33.90124710387746632</ymin>
@@ -2371,7 +2369,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
+          <spatial minz="0" minx="0" maxz="0" maxy="0" maxx="0" crs="" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -2395,10 +2393,10 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" type="singleSymbol" forceraster="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" enableorderby="0" forceraster="0" symbollevels="0">
         <symbols>
-          <symbol name="0" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+          <symbol force_rhr="0" name="0" clip_to_extent="1" type="line" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleLine">
               <prop k="capstyle" v="square"/>
               <prop k="customdash" v="5;2"/>
               <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2430,15 +2428,15 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings>
-          <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="1" fontSizeUnit="Point" fieldName="Name" fontSize="10" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <text-buffer bufferOpacity="1" bufferNoFill="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1"/>
-            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="0" shapeRotationType="0" shapeSizeX="0" shapeRadiiX="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+          <text-style fontLetterSpacing="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Semibold" textColor="0,0,0,255" multilineHeight="1" fontSize="10" fontWeight="63" fieldName="Name" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="1" useSubstitutions="0" fontUnderline="0">
+            <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiY="0" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeDraw="0" shapeOpacity="1" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="0" shapeRadiiX="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
             <substitutions/>
           </text-style>
-          <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
-          <placement centroidInside="0" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="2" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" geometryGenerator="" dist="2" yOffset="0" geometryGeneratorType="LineGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="5" placementFlags="10" offsetType="0" offsetUnits="MM"/>
-          <rendering labelPerPart="0" obstacleType="0" scaleMax="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="0" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="0"/>
+          <text-format multilineAlign="0" autoWrapLength="0" plussign="0" addDirectionSymbol="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+          <placement maxCurvedCharAngleOut="-25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="2" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" geometryGeneratorType="LineGeometry" quadOffset="4" distUnits="MM" offsetUnits="MM" repeatDistanceUnits="MM" dist="2" centroidInside="0" geometryGenerator="" placementFlags="10" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" maxCurvedCharAngleIn="25" priority="5"/>
+          <rendering displayAll="0" upsidedownLabels="0" mergeLines="0" fontLimitPixelSize="0" maxNumLabels="2000" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="1" scaleMax="0" minFeatureSize="0" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="0" fontMaxPixelSize="10000" scaleMin="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -2449,21 +2447,21 @@ def my_form_open(dialog, layer, feature):
         </settings>
       </labeling>
       <customproperties>
-        <property key="dualview/previewExpressions" value="Name"/>
-        <property key="embeddedWidgets/count" value="0"/>
+        <property value="Name" key="dualview/previewExpressions"/>
+        <property value="0" key="embeddedWidgets/count"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory enabled="0" minScaleDenominator="0" width="15" rotationOffset="270" penColor="#000000" penAlpha="255" height="15" penWidth="0" diagramOrientation="Up" backgroundColor="#ffffff" scaleDependency="Area" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" opacity="1" lineSizeType="MM" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeType="MM" scaleBasedVisibility="0" backgroundAlpha="255" barWidth="5">
           <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-          <attribute field="" color="#000000" label=""/>
+          <attribute color="#000000" label="" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" priority="0" dist="0" placement="2" obstacle="0" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" showAll="1" placement="2" linePlacementFlags="18" obstacle="0" dist="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -2472,7 +2470,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -2493,8 +2491,8 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="Name" index="1" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="Name" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -2503,22 +2501,22 @@ def my_form_open(dialog, layer, feature):
         <default field="Name" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="Name" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint exp_strength="0" field="id" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="Name" constraints="0" notnull_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="Name" exp="" desc=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="Name" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="-1" name="Name" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="0" name="Name" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -2549,18 +2547,18 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="Name" editable="1"/>
-        <field name="id" editable="1"/>
+        <field editable="1" name="Name"/>
+        <field editable="1" name="id"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="Name"/>
-        <field labelOnTop="0" name="id"/>
+        <field name="Name" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
       </labelOnTop>
       <widgets/>
       <previewExpression>Name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="100000" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" simplifyLocal="1" readOnly="0" geometry="Line" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" simplifyDrawingTol="1">
+    <maplayer styleCategories="AllStyleCategories" refreshOnNotifyMessage="" simplifyAlgorithm="0" maxScale="100000" geometry="Line" simplifyMaxScale="1" simplifyLocal="1" labelsEnabled="0" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" type="vector" minScale="1e+08" readOnly="0" autoRefreshTime="0" autoRefreshEnabled="0" simplifyDrawingTol="1" wkbType="MultiLineString" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.40814103070666974</xmin>
         <ymin>-33.90827185075657724</ymin>
@@ -2617,7 +2615,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
+          <spatial minz="0" minx="0" maxz="0" maxy="0" maxx="0" crs="" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -2641,15 +2639,15 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" type="RuleRenderer" forceraster="0" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" enableorderby="0" forceraster="0" symbollevels="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule symbol="0" key="{85adf11b-f941-44b6-8847-c828ab845cdc}" description="Only show when active in Atlas" label="21KM" filter="&quot;distance&quot; = '21KM'"/>
-          <rule symbol="1" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" description="Only show when active in Atlas" label="10KM" filter="&quot;distance&quot; = '10KM'"/>
-          <rule symbol="2" key="{cf733f0f-ab72-441e-b213-841aa39c1671}" description="Only show when active in Atlas" label="5KM" filter="&quot;distance&quot; = '5KM'"/>
+          <rule symbol="0" filter="&quot;distance&quot; = '21KM'" label="21KM" key="{85adf11b-f941-44b6-8847-c828ab845cdc}" description="Only show when active in Atlas"/>
+          <rule symbol="1" filter="&quot;distance&quot; = '10KM'" label="10KM" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" description="Only show when active in Atlas"/>
+          <rule symbol="2" filter="&quot;distance&quot; = '5KM'" label="5KM" key="{cf733f0f-ab72-441e-b213-841aa39c1671}" description="Only show when active in Atlas"/>
         </rules>
         <symbols>
-          <symbol name="0" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+          <symbol force_rhr="0" name="0" clip_to_extent="1" type="line" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="MarkerLine">
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="average_angle_unit" v="MM"/>
@@ -2672,8 +2670,8 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@0@0" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <symbol force_rhr="0" name="@0@0" clip_to_extent="1" type="marker" alpha="1">
+                <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
                   <prop k="angle" v="0"/>
                   <prop k="color" v="210,32,39,255"/>
                   <prop k="horizontal_anchor_point" v="1"/>
@@ -2702,7 +2700,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer pass="0" locked="0" enabled="1" class="MarkerLine">
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="average_angle_unit" v="MM"/>
@@ -2736,8 +2734,8 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@0@1" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+              <symbol force_rhr="0" name="@0@1" clip_to_extent="1" type="marker" alpha="1">
+                <layer pass="0" locked="0" enabled="1" class="FilledMarker">
                   <prop k="angle" v="0"/>
                   <prop k="color" v="210,32,39,255"/>
                   <prop k="horizontal_anchor_point" v="1"/>
@@ -2757,8 +2755,8 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@0@1@0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                  <symbol force_rhr="0" name="@@0@1@0" clip_to_extent="1" type="fill" alpha="1">
+                    <layer pass="0" locked="0" enabled="1" class="SimpleFill">
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="210,32,39,255"/>
                       <prop k="joinstyle" v="bevel"/>
@@ -2782,7 +2780,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleLine">
               <prop k="capstyle" v="flat"/>
               <prop k="customdash" v="5;2"/>
               <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2808,8 +2806,8 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+          <symbol force_rhr="0" name="1" clip_to_extent="1" type="line" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="MarkerLine">
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="average_angle_unit" v="MM"/>
@@ -2843,8 +2841,8 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@1@0" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+              <symbol force_rhr="0" name="@1@0" clip_to_extent="1" type="marker" alpha="1">
+                <layer pass="0" locked="0" enabled="1" class="FilledMarker">
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
                   <prop k="horizontal_anchor_point" v="1"/>
@@ -2864,8 +2862,8 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@1@0@0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                  <symbol force_rhr="0" name="@@1@0@0" clip_to_extent="1" type="fill" alpha="1">
+                    <layer pass="0" locked="0" enabled="1" class="SimpleFill">
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
                       <prop k="joinstyle" v="miter"/>
@@ -2889,7 +2887,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer pass="0" locked="0" enabled="1" class="MarkerLine">
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="average_angle_unit" v="MM"/>
@@ -2923,8 +2921,8 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@1@1" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+              <symbol force_rhr="0" name="@1@1" clip_to_extent="1" type="marker" alpha="1">
+                <layer pass="0" locked="0" enabled="1" class="FilledMarker">
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
                   <prop k="horizontal_anchor_point" v="1"/>
@@ -2944,8 +2942,8 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@1@1@0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                  <symbol force_rhr="0" name="@@1@1@0" clip_to_extent="1" type="fill" alpha="1">
+                    <layer pass="0" locked="0" enabled="1" class="SimpleFill">
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
                       <prop k="joinstyle" v="bevel"/>
@@ -2969,7 +2967,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleLine">
               <prop k="capstyle" v="flat"/>
               <prop k="customdash" v="5;2"/>
               <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2995,8 +2993,8 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+          <symbol force_rhr="0" name="2" clip_to_extent="1" type="line" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="MarkerLine">
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="average_angle_unit" v="MM"/>
@@ -3030,8 +3028,8 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@0" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+              <symbol force_rhr="0" name="@2@0" clip_to_extent="1" type="marker" alpha="1">
+                <layer pass="0" locked="0" enabled="1" class="FilledMarker">
                   <prop k="angle" v="0"/>
                   <prop k="color" v="69,100,25,255"/>
                   <prop k="horizontal_anchor_point" v="1"/>
@@ -3051,8 +3049,8 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@2@0@0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                  <symbol force_rhr="0" name="@@2@0@0" clip_to_extent="1" type="fill" alpha="1">
+                    <layer pass="0" locked="0" enabled="1" class="SimpleFill">
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="69,100,25,255"/>
                       <prop k="joinstyle" v="miter"/>
@@ -3076,7 +3074,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer pass="0" locked="0" enabled="1" class="MarkerLine">
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="average_angle_unit" v="MM"/>
@@ -3110,8 +3108,8 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@1" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+              <symbol force_rhr="0" name="@2@1" clip_to_extent="1" type="marker" alpha="1">
+                <layer pass="0" locked="0" enabled="1" class="FilledMarker">
                   <prop k="angle" v="0"/>
                   <prop k="color" v="69,100,25,255"/>
                   <prop k="horizontal_anchor_point" v="1"/>
@@ -3131,8 +3129,8 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@2@1@0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                  <symbol force_rhr="0" name="@@2@1@0" clip_to_extent="1" type="fill" alpha="1">
+                    <layer pass="0" locked="0" enabled="1" class="SimpleFill">
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="69,100,25,255"/>
                       <prop k="joinstyle" v="bevel"/>
@@ -3156,7 +3154,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleLine">
               <prop k="capstyle" v="flat"/>
               <prop k="customdash" v="5;2"/>
               <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -3184,25 +3182,25 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </symbols>
         <orderby>
-          <orderByClause asc="0" nullsFirst="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
+          <orderByClause nullsFirst="0" asc="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
         </orderby>
       </renderer-v2>
       <customproperties>
-        <property key="dualview/previewExpressions" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-        <property key="embeddedWidgets/count" value="0"/>
+        <property value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" key="dualview/previewExpressions"/>
+        <property value="0" key="embeddedWidgets/count"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory enabled="0" minScaleDenominator="100000" width="15" rotationOffset="270" penColor="#000000" penAlpha="255" height="15" penWidth="0" diagramOrientation="Up" backgroundColor="#ffffff" scaleDependency="Area" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" opacity="1" lineSizeType="MM" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeType="MM" scaleBasedVisibility="0" backgroundAlpha="255" barWidth="5">
           <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
-          <attribute field="" color="#000000" label=""/>
+          <attribute color="#000000" label="" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" priority="0" dist="0" placement="2" obstacle="0" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" showAll="1" placement="2" linePlacementFlags="2" obstacle="0" dist="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -3211,7 +3209,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -3235,8 +3233,8 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="Distance" index="1" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="Distance" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -3245,22 +3243,22 @@ def my_form_open(dialog, layer, feature):
         <default field="Distance" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="Distance" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint exp_strength="0" field="id" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="Distance" constraints="0" notnull_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="Distance" exp="" desc=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="Distance" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;Distance&quot;">
+      <attributetableconfig sortExpression="&quot;Distance&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" name="Distance" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="id" hidden="0" type="field"/>
+          <column hidden="0" name="Distance" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3291,36 +3289,36 @@ 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 labelOnTop="0" name="Distance"/>
-        <field labelOnTop="0" name="Name"/>
-        <field labelOnTop="0" name="RouteLen"/>
-        <field labelOnTop="0" name="Source"/>
-        <field labelOnTop="0" name="begin"/>
-        <field labelOnTop="0" name="descriptio"/>
-        <field labelOnTop="0" name="end"/>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="length_km"/>
-        <field labelOnTop="0" name="length_m"/>
-        <field labelOnTop="0" name="timestamp"/>
+        <field name="Distance" labelOnTop="0"/>
+        <field name="Name" labelOnTop="0"/>
+        <field name="RouteLen" labelOnTop="0"/>
+        <field name="Source" labelOnTop="0"/>
+        <field name="begin" labelOnTop="0"/>
+        <field name="descriptio" labelOnTop="0"/>
+        <field name="end" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="length_km" labelOnTop="0"/>
+        <field name="length_m" labelOnTop="0"/>
+        <field name="timestamp" labelOnTop="0"/>
       </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="100000" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Point" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" wkbType="Point" simplifyDrawingTol="1">
+    <maplayer styleCategories="AllStyleCategories" refreshOnNotifyMessage="" simplifyAlgorithm="0" maxScale="100000" geometry="Point" simplifyMaxScale="1" simplifyLocal="1" labelsEnabled="1" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" type="vector" minScale="1e+08" readOnly="0" autoRefreshTime="0" autoRefreshEnabled="0" simplifyDrawingTol="1" wkbType="Point" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.38517016505928936</xmin>
         <ymin>-33.91987011678683217</ymin>
@@ -3384,10 +3382,10 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" type="singleSymbol" forceraster="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" enableorderby="0" forceraster="0" symbollevels="0">
         <symbols>
-          <symbol name="0" clip_to_extent="1" force_rhr="0" type="marker" alpha="0.796078">
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+          <symbol force_rhr="0" name="0" clip_to_extent="1" type="marker" alpha="0.796078">
+            <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
               <prop k="angle" v="0"/>
               <prop k="color" v="227,0,185,255"/>
               <prop k="horizontal_anchor_point" v="1"/>
@@ -3427,17 +3425,17 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{de1ff1b5-a53a-4841-835f-57785b684a9d}">
-          <rule key="{9ea624c1-7179-4746-8777-84b8008475a1}" description="Show in marshal maps" filter="'marshal' = attribute( $atlasfeature , 'type' )">
+          <rule filter="'marshal' = attribute( $atlasfeature , 'type' )" key="{9ea624c1-7179-4746-8777-84b8008475a1}" description="Show in marshal maps">
             <settings>
-              <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="1" fontSizeUnit="Point" fieldName="position" fontSize="8" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
-                <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
-                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0.4" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0.2" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="0.2" shapeRadiiX="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+              <text-style fontLetterSpacing="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Semibold" textColor="0,0,0,255" multilineHeight="1" fontSize="8" fontWeight="63" fieldName="position" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="1" useSubstitutions="0" fontUnderline="0">
+                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeType="3" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiY="0" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeDraw="1" shapeOpacity="1" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.2" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="0.2" shapeRadiiX="0" shapeBorderWidth="0.4" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
-              <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="1" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="0" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="8" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
-              <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="1" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
+              <text-format multilineAlign="0" autoWrapLength="0" plussign="0" addDirectionSymbol="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+              <placement maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="1" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" geometryGeneratorType="PointGeometry" quadOffset="4" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="0" centroidInside="0" geometryGenerator="" placementFlags="10" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" maxCurvedCharAngleIn="20" priority="8"/>
+              <rendering displayAll="1" upsidedownLabels="0" mergeLines="0" fontLimitPixelSize="0" maxNumLabels="2000" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="1" scaleMax="10000000" minFeatureSize="0" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="0" fontMaxPixelSize="10000" scaleMin="1" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -3478,17 +3476,17 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </settings>
           </rule>
-          <rule key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}" description="Show in marshal overview" filter="'marshal plan' = attribute( $atlasfeature , 'type' )">
+          <rule filter="'marshal plan' = attribute( $atlasfeature , 'type' )" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}" description="Show in marshal overview">
             <settings>
-              <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.9" fontSizeUnit="Point" fieldName="position" fontSize="4" blendMode="0" textColor="227,0,185,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
-                <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
-                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0.1" shapeOpacity="0.5" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="0" shapeRadiiX="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+              <text-style fontLetterSpacing="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Semibold" textColor="227,0,185,255" multilineHeight="1" fontSize="4" fontWeight="63" fieldName="position" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="0.9" useSubstitutions="0" fontUnderline="0">
+                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeType="3" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiY="0" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeDraw="1" shapeOpacity="0.5" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="0" shapeRadiiX="0" shapeBorderWidth="0.1" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
-              <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="6" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="1" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="10" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
-              <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="1" upsidedownLabels="0" obstacle="0" fontMaxPixelSize="10000" zIndex="2" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
+              <text-format multilineAlign="0" autoWrapLength="0" plussign="0" addDirectionSymbol="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+              <placement maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="6" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" geometryGeneratorType="PointGeometry" quadOffset="4" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="1" centroidInside="0" geometryGenerator="" placementFlags="10" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" maxCurvedCharAngleIn="20" priority="10"/>
+              <rendering displayAll="1" upsidedownLabels="0" mergeLines="0" fontLimitPixelSize="0" maxNumLabels="2000" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="0" scaleMax="10000000" minFeatureSize="0" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="2" fontMaxPixelSize="10000" scaleMin="1" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -3517,155 +3515,155 @@ def my_form_open(dialog, layer, feature):
         </rules>
       </labeling>
       <customproperties>
-        <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 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="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory enabled="0" minScaleDenominator="100000" width="15" rotationOffset="270" penColor="#000000" penAlpha="255" height="15" penWidth="0" diagramOrientation="Up" backgroundColor="#ffffff" scaleDependency="Area" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" opacity="1" lineSizeType="MM" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeType="MM" scaleBasedVisibility="0" backgroundAlpha="255" barWidth="5">
           <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
-          <attribute field="" color="#000000" label=""/>
+          <attribute color="#000000" label="" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="10" priority="0" dist="0" placement="0" obstacle="0" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" showAll="1" placement="0" linePlacementFlags="10" obstacle="0" dist="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -3674,7 +3672,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -3711,9 +3709,9 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="position" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="position" name=""/>
+        <alias index="2" field="type" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -3723,25 +3721,25 @@ def my_form_open(dialog, layer, feature):
         <default field="type" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="position" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="type" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint exp_strength="0" field="id" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="position" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" constraints="0" notnull_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="position" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="position" desc=""/>
+        <constraint exp="" field="type" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;position&quot;">
+      <attributetableconfig sortExpression="&quot;position&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="position" hidden="0" type="field"/>
-          <column width="-1" name="type" hidden="0" type="field"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="position" type="field" width="-1"/>
+          <column hidden="0" name="type" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3814,7 +3812,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer maxScale="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" simplifyLocal="1" readOnly="0" geometry="Polygon" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" wkbType="Polygon" simplifyDrawingTol="1">
+    <maplayer styleCategories="AllStyleCategories" refreshOnNotifyMessage="" simplifyAlgorithm="0" maxScale="0" geometry="Polygon" simplifyMaxScale="1" simplifyLocal="1" labelsEnabled="0" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" type="vector" minScale="1e+08" readOnly="0" autoRefreshTime="0" autoRefreshEnabled="0" simplifyDrawingTol="1" wkbType="Polygon" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -3871,7 +3869,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
+          <spatial minz="0" minx="0" maxz="0" maxy="0" maxx="0" crs="" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -3888,12 +3886,12 @@ def my_form_open(dialog, layer, feature):
       <dataDependencies/>
       <legend type="default-vector"/>
       <expressionfields>
-        <field name="fence_length" expression="round( relation_aggregate( 'fence_group_rel', 'sum', &quot;fence_len&quot; ), 0)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
-        <field name="cone_length" expression="round( relation_aggregate( 'fence_group_rel', 'sum', &quot;cone_len&quot; ), 0)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
-        <field name="fence_length" expression="round(relation_aggregate( 'fence_group_rel', 'sum', $length, '', regexp_match(&quot;type&quot;, '^fenc') ), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
-        <field name="fence_length" expression="round( relation_aggregate( 'fence_group_rel', 'sum', $length, '', regexp_match(&quot;type&quot;, '^fenc') ), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
-        <field name="cone_length" expression="relation_aggregate( 'fence_group_rel', 'sum', &quot;cone_len&quot; )" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
-        <field name="type" expression="'fencing'" typeName="string" length="0" subType="0" precision="0" comment="" type="10"/>
+        <field precision="0" subType="0" typeName="double precision" name="fence_length" type="6" length="-1" comment="" expression="round( relation_aggregate( 'fence_group_rel', 'sum', &quot;fence_len&quot; ), 0)"/>
+        <field precision="0" subType="0" typeName="double precision" name="cone_length" type="6" length="-1" comment="" expression="round( relation_aggregate( 'fence_group_rel', 'sum', &quot;cone_len&quot; ), 0)"/>
+        <field precision="0" subType="0" typeName="double precision" name="fence_length" type="6" length="-1" comment="" expression="round(relation_aggregate( 'fence_group_rel', 'sum', $length, '', regexp_match(&quot;type&quot;, '^fenc') ), 1)"/>
+        <field precision="0" subType="0" typeName="double precision" name="fence_length" type="6" length="-1" comment="" expression="round( relation_aggregate( 'fence_group_rel', 'sum', $length, '', regexp_match(&quot;type&quot;, '^fenc') ), 1)"/>
+        <field precision="0" subType="0" typeName="double precision" name="cone_length" type="6" length="-1" comment="" expression="relation_aggregate( 'fence_group_rel', 'sum', &quot;cone_len&quot; )"/>
+        <field precision="0" subType="0" typeName="string" name="type" type="10" length="0" comment="" expression="'fencing'"/>
       </expressionfields>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -3904,10 +3902,10 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" type="singleSymbol" forceraster="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" enableorderby="0" forceraster="0" symbollevels="0">
         <symbols>
-          <symbol name="0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+          <symbol force_rhr="0" name="0" clip_to_extent="1" type="fill" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleFill">
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="0,170,0,255"/>
               <prop k="joinstyle" v="bevel"/>
@@ -3933,21 +3931,21 @@ def my_form_open(dialog, layer, feature):
         <sizescale/>
       </renderer-v2>
       <customproperties>
-        <property key="dualview/previewExpressions" value="name"/>
-        <property key="embeddedWidgets/count" value="0"/>
+        <property value="name" key="dualview/previewExpressions"/>
+        <property value="0" key="embeddedWidgets/count"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory enabled="0" minScaleDenominator="0" width="15" rotationOffset="270" penColor="#000000" penAlpha="255" height="15" penWidth="0" diagramOrientation="Up" backgroundColor="#ffffff" scaleDependency="Area" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" opacity="1" lineSizeType="MM" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeType="MM" scaleBasedVisibility="0" backgroundAlpha="255" barWidth="5">
           <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-          <attribute field="" color="#000000" label=""/>
+          <attribute color="#000000" label="" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" priority="0" dist="0" placement="1" obstacle="0" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" showAll="1" placement="1" linePlacementFlags="18" obstacle="0" dist="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -3956,7 +3954,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -3998,11 +3996,11 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="name" index="0" name=""/>
-        <alias field="group" index="1" name=""/>
-        <alias field="fence_length" index="2" name=""/>
-        <alias field="cone_length" index="3" name=""/>
-        <alias field="type" index="4" name=""/>
+        <alias index="0" field="name" name=""/>
+        <alias index="1" field="group" name=""/>
+        <alias index="2" field="fence_length" name=""/>
+        <alias index="3" field="cone_length" name=""/>
+        <alias index="4" field="type" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -4014,37 +4012,37 @@ def my_form_open(dialog, layer, feature):
         <default field="type" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="name" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="group" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="fence_length" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="cone_length" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="type" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint exp_strength="0" field="name" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="group" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="fence_length" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="cone_length" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" constraints="0" notnull_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="group" exp="" desc=""/>
-        <constraint field="fence_length" exp="" desc=""/>
-        <constraint field="cone_length" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="group" desc=""/>
+        <constraint exp="" field="fence_length" desc=""/>
+        <constraint exp="" field="cone_length" desc=""/>
+        <constraint exp="" field="type" desc=""/>
       </constraintExpressions>
       <expressionfields>
-        <field name="fence_length" expression="round( relation_aggregate( 'fence_group_rel', 'sum', &quot;fence_len&quot; ), 0)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
-        <field name="cone_length" expression="round( relation_aggregate( 'fence_group_rel', 'sum', &quot;cone_len&quot; ), 0)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
-        <field name="fence_length" expression="round(relation_aggregate( 'fence_group_rel', 'sum', $length, '', regexp_match(&quot;type&quot;, '^fenc') ), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
-        <field name="fence_length" expression="round( relation_aggregate( 'fence_group_rel', 'sum', $length, '', regexp_match(&quot;type&quot;, '^fenc') ), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
-        <field name="cone_length" expression="relation_aggregate( 'fence_group_rel', 'sum', &quot;cone_len&quot; )" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
-        <field name="type" expression="'fencing'" typeName="string" length="0" subType="0" precision="0" comment="" type="10"/>
+        <field precision="0" subType="0" typeName="double precision" name="fence_length" type="6" length="-1" comment="" expression="round( relation_aggregate( 'fence_group_rel', 'sum', &quot;fence_len&quot; ), 0)"/>
+        <field precision="0" subType="0" typeName="double precision" name="cone_length" type="6" length="-1" comment="" expression="round( relation_aggregate( 'fence_group_rel', 'sum', &quot;cone_len&quot; ), 0)"/>
+        <field precision="0" subType="0" typeName="double precision" name="fence_length" type="6" length="-1" comment="" expression="round(relation_aggregate( 'fence_group_rel', 'sum', $length, '', regexp_match(&quot;type&quot;, '^fenc') ), 1)"/>
+        <field precision="0" subType="0" typeName="double precision" name="fence_length" type="6" length="-1" comment="" expression="round( relation_aggregate( 'fence_group_rel', 'sum', $length, '', regexp_match(&quot;type&quot;, '^fenc') ), 1)"/>
+        <field precision="0" subType="0" typeName="double precision" name="cone_length" type="6" length="-1" comment="" expression="relation_aggregate( 'fence_group_rel', 'sum', &quot;cone_len&quot; )"/>
+        <field precision="0" subType="0" typeName="string" name="type" type="10" length="0" comment="" expression="'fencing'"/>
       </expressionfields>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="1" sortExpression="&quot;fence_length&quot;">
+      <attributetableconfig sortExpression="&quot;fence_length&quot;" sortOrder="1" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" name="name" hidden="0" type="field"/>
-          <column width="-1" name="group" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="148" name="fence_length" hidden="0" type="field"/>
-          <column width="157" name="cone_length" hidden="0" type="field"/>
+          <column hidden="0" name="name" type="field" width="-1"/>
+          <column hidden="0" name="group" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="fence_length" type="field" width="148"/>
+          <column hidden="0" name="cone_length" type="field" width="157"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -4075,16 +4073,16 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="cone_length" editable="0"/>
-        <field name="fence_length" editable="0"/>
-        <field name="group" editable="1"/>
-        <field name="name" editable="1"/>
+        <field editable="0" name="cone_length"/>
+        <field editable="0" name="fence_length"/>
+        <field editable="1" name="group"/>
+        <field editable="1" name="name"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="cone_length"/>
-        <field labelOnTop="0" name="fence_length"/>
-        <field labelOnTop="0" name="group"/>
-        <field labelOnTop="0" name="name"/>
+        <field name="cone_length" labelOnTop="0"/>
+        <field name="fence_length" labelOnTop="0"/>
+        <field name="group" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
       </labelOnTop>
       <widgets>
         <widget name="fence_group_rel">
@@ -4096,7 +4094,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Line" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" wkbType="MultiLineString" simplifyDrawingTol="1">
+    <maplayer styleCategories="AllStyleCategories" refreshOnNotifyMessage="" simplifyAlgorithm="0" maxScale="0" geometry="Line" simplifyMaxScale="1" simplifyLocal="1" labelsEnabled="1" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" type="vector" minScale="1e+08" readOnly="0" autoRefreshTime="0" autoRefreshEnabled="0" simplifyDrawingTol="1" wkbType="MultiLineString" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -4153,7 +4151,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
+          <spatial minz="0" minx="0" maxz="0" maxy="0" maxx="0" crs="" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -4168,26 +4166,26 @@ def my_form_open(dialog, layer, feature):
       <dataDependencies/>
       <legend type="default-vector"/>
       <expressionfields>
-        <field name="fence_len" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
-        <field name="fence_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
-        <field name="cone_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
+        <field precision="0" subType="0" typeName="double precision" name="fence_len" type="6" length="-1" comment="" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)"/>
+        <field precision="0" subType="0" typeName="double precision" name="fence_len" type="6" length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)"/>
+        <field precision="0" subType="0" typeName="double precision" name="cone_len" type="6" length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)"/>
       </expressionfields>
       <map-layer-style-manager current="Fencing">
         <map-layer-style name="Fencing"/>
         <map-layer-style name="Simple">
-          <qgis labelsEnabled="1" simplifyDrawingTol="1" simplifyMaxScale="1" simplifyDrawingHints="1" simplifyLocal="1" readOnly="0" maxScale="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" version="3.8.3-Zanzibar" hasScaleBasedVisibilityFlag="0" minScale="1e+08">
+          <qgis hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyAlgorithm="0" simplifyDrawingHints="1" simplifyLocal="1" maxScale="0" styleCategories="AllStyleCategories" minScale="1e+08" readOnly="0" labelsEnabled="1" version="3.8.3-Zanzibar" simplifyMaxScale="1">
             <flags>
               <Identifiable>1</Identifiable>
               <Removable>1</Removable>
               <Searchable>1</Searchable>
             </flags>
-            <renderer-v2 symbollevels="1" type="RuleRenderer" forceraster="0" enableorderby="0">
+            <renderer-v2 enableorderby="0" type="RuleRenderer" forceraster="0" symbollevels="1">
               <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-                <rule symbol="0" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" label="Visible" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL"/>
+                <rule symbol="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" label="Visible" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}"/>
               </rules>
               <symbols>
-                <symbol name="0" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-                  <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+                <symbol force_rhr="0" name="0" clip_to_extent="1" type="line" alpha="1">
+                  <layer pass="0" locked="0" enabled="1" class="SimpleLine">
                     <prop k="capstyle" v="square"/>
                     <prop k="customdash" v="5;2"/>
                     <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4217,17 +4215,17 @@ def my_form_open(dialog, layer, feature):
             </renderer-v2>
             <labeling type="rule-based">
               <rules key="{7b0a59ec-9387-4d8e-badd-0d99ebc42174}">
-                <rule key="{4961744d-6387-45d0-90bf-01e48d575e6e}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
+                <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{4961744d-6387-45d0-90bf-01e48d575e6e}">
                   <settings>
-                    <text-style previewBkgrdColor="#ffffff" namedStyle="Regular" fontWeight="50" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.8" fontSizeUnit="Point" fieldName="comment" fontSize="11" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
-                      <text-buffer bufferOpacity="1" bufferNoFill="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
-                      <background shapeFillColor="255,255,255,255" shapeJoinStyle="128" shapeBlendMode="0" shapeBorderWidth="0.6" shapeOffsetX="0" shapeOpacity="0.6" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeBorderColor="255,255,0,255" shapeSizeType="0" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="1" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="1" shapeRadiiX="1" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                      <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+                    <text-style fontLetterSpacing="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Regular" textColor="0,0,0,255" multilineHeight="1" fontSize="11" fontWeight="50" fieldName="comment" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="0.8" useSubstitutions="0" fontUnderline="0">
+                      <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                      <background shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="255,255,0,255" shapeSizeUnit="MM" shapeRadiiY="1" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="128" shapeBorderWidthUnit="MM" shapeDraw="1" shapeOpacity="0.6" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeSizeX="1" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="1" shapeRadiiX="1" shapeBorderWidth="0.6" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                      <shadow shadowBlendMode="6" shadowScale="100" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowRadiusUnit="MM"/>
                       <substitutions/>
                     </text-style>
-                    <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="4294967295" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
-                    <placement centroidInside="0" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="4" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" geometryGenerator="" dist="5" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="5" placementFlags="2" offsetType="0" offsetUnits="MM"/>
-                    <rendering labelPerPart="0" obstacleType="0" scaleMax="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="0" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="1" displayAll="1"/>
+                    <text-format multilineAlign="4294967295" autoWrapLength="0" plussign="0" placeDirectionSymbol="0" addDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+                    <placement maxCurvedCharAngleOut="-25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="4" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorType="PointGeometry" repeatDistance="0" quadOffset="4" distUnits="MM" offsetUnits="MM" repeatDistanceUnits="MM" dist="5" centroidInside="0" geometryGenerator="" placementFlags="2" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" xOffset="0" priority="5"/>
+                    <rendering displayAll="1" upsidedownLabels="0" mergeLines="1" fontLimitPixelSize="0" maxNumLabels="2000" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="1" scaleMax="0" minFeatureSize="0" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="0" fontMaxPixelSize="10000" scaleMin="0" obstacleFactor="1"/>
                     <dd_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -4248,17 +4246,17 @@ def my_form_open(dialog, layer, feature):
                     </dd_properties>
                   </settings>
                 </rule>
-                <rule key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}" filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')">
+                <rule filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}">
                   <settings>
-                    <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="1" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="1" fontSizeUnit="Point" fieldName="round( $length, 1) || 'm'" fontSize="12" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
-                      <text-buffer bufferOpacity="1" bufferNoFill="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1"/>
-                      <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeBorderWidth="0" shapeOffsetX="0" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeSizeType="0" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="0" shapeRotationType="0" shapeSizeX="0" shapeRadiiX="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                      <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+                    <text-style fontLetterSpacing="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Semibold" textColor="0,0,0,255" multilineHeight="1" fontSize="12" fontWeight="63" fieldName="round( $length, 1) || 'm'" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="1" useSubstitutions="0" fontUnderline="0">
+                      <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                      <background shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiY="0" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeDraw="0" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeSizeX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="0" shapeRadiiX="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                      <shadow shadowBlendMode="6" shadowScale="100" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowRadiusUnit="MM"/>
                       <substitutions/>
                     </text-style>
-                    <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="4294967295" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
-                    <placement centroidInside="0" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="2" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" geometryGenerator="" dist="1" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="5" placementFlags="15" offsetType="0" offsetUnits="MM"/>
-                    <rendering labelPerPart="0" obstacleType="0" scaleMax="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="0" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="0"/>
+                    <text-format multilineAlign="4294967295" autoWrapLength="0" plussign="0" placeDirectionSymbol="0" addDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+                    <placement maxCurvedCharAngleOut="-25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="2" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorType="PointGeometry" repeatDistance="0" quadOffset="4" distUnits="MM" offsetUnits="MM" repeatDistanceUnits="MM" dist="1" centroidInside="0" geometryGenerator="" placementFlags="15" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" xOffset="0" priority="5"/>
+                    <rendering displayAll="0" upsidedownLabels="0" mergeLines="0" fontLimitPixelSize="0" maxNumLabels="2000" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="1" scaleMax="0" minFeatureSize="0" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="0" fontMaxPixelSize="10000" scaleMin="0" obstacleFactor="1"/>
                     <dd_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -4282,8 +4280,8 @@ def my_form_open(dialog, layer, feature):
               </rules>
             </labeling>
             <customproperties>
-              <property key="dualview/previewExpressions" value="id"/>
-              <property key="embeddedWidgets/count" value="0"/>
+              <property value="id" key="dualview/previewExpressions"/>
+              <property value="0" key="embeddedWidgets/count"/>
               <property key="variableNames"/>
               <property key="variableValues"/>
             </customproperties>
@@ -4291,12 +4289,12 @@ def my_form_open(dialog, layer, feature):
             <featureBlendMode>0</featureBlendMode>
             <layerOpacity>1</layerOpacity>
             <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-              <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+              <DiagramCategory enabled="0" minScaleDenominator="0" width="15" rotationOffset="270" penColor="#000000" penAlpha="255" height="15" penWidth="0" diagramOrientation="Up" backgroundColor="#ffffff" scaleDependency="Area" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" opacity="1" lineSizeType="MM" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" scaleBasedVisibility="0" sizeType="MM" backgroundAlpha="255" barWidth="5">
                 <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-                <attribute field="" color="#000000" label=""/>
+                <attribute color="#000000" label="" field=""/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings zIndex="0" linePlacementFlags="18" priority="0" dist="0" placement="2" obstacle="0" showAll="1">
+            <DiagramLayerSettings priority="0" zIndex="0" showAll="1" placement="2" linePlacementFlags="18" obstacle="0" dist="0">
               <properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -4305,7 +4303,7 @@ def my_form_open(dialog, layer, feature):
                 </Option>
               </properties>
             </DiagramLayerSettings>
-            <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+            <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
               <activeChecks/>
               <checkConfiguration/>
             </geometryOptions>
@@ -4389,17 +4387,17 @@ def my_form_open(dialog, layer, feature):
               </field>
             </fieldConfiguration>
             <aliases>
-              <alias field="id" index="0" name=""/>
-              <alias field="group" index="1" name=""/>
-              <alias field="comment" index="2" name=""/>
-              <alias field="moveable" index="3" name=""/>
-              <alias field="type" index="4" name=""/>
-              <alias field="name" index="5" name=""/>
-              <alias field="hidden" index="6" name=""/>
-              <alias field="auxiliary_storage_labeling_positiony" index="7" name=""/>
-              <alias field="auxiliary_storage_labeling_positionx" index="8" name=""/>
-              <alias field="fence_len" index="9" name=""/>
-              <alias field="cone_len" index="10" name=""/>
+              <alias index="0" field="id" name=""/>
+              <alias index="1" field="group" name=""/>
+              <alias index="2" field="comment" name=""/>
+              <alias index="3" field="moveable" name=""/>
+              <alias index="4" field="type" name=""/>
+              <alias index="5" field="name" name=""/>
+              <alias index="6" field="hidden" name=""/>
+              <alias index="7" field="auxiliary_storage_labeling_positiony" name=""/>
+              <alias index="8" field="auxiliary_storage_labeling_positionx" name=""/>
+              <alias index="9" field="fence_len" name=""/>
+              <alias index="10" field="cone_len" name=""/>
             </aliases>
             <excludeAttributesWMS/>
             <excludeAttributesWFS/>
@@ -4417,53 +4415,53 @@ def my_form_open(dialog, layer, feature):
               <default field="cone_len" applyOnUpdate="0" expression=""/>
             </defaults>
             <constraints>
-              <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
-              <constraint notnull_strength="0" field="group" constraints="0" unique_strength="0" exp_strength="0"/>
-              <constraint notnull_strength="0" field="comment" constraints="0" unique_strength="0" exp_strength="0"/>
-              <constraint notnull_strength="0" field="moveable" constraints="0" unique_strength="0" exp_strength="0"/>
-              <constraint notnull_strength="0" field="type" constraints="0" unique_strength="0" exp_strength="0"/>
-              <constraint notnull_strength="0" field="name" constraints="0" unique_strength="0" exp_strength="0"/>
-              <constraint notnull_strength="0" field="hidden" constraints="0" unique_strength="0" exp_strength="0"/>
-              <constraint notnull_strength="0" field="auxiliary_storage_labeling_positiony" constraints="0" unique_strength="0" exp_strength="0"/>
-              <constraint notnull_strength="0" field="auxiliary_storage_labeling_positionx" constraints="0" unique_strength="0" exp_strength="0"/>
-              <constraint notnull_strength="0" field="fence_len" constraints="0" unique_strength="0" exp_strength="0"/>
-              <constraint notnull_strength="0" field="cone_len" constraints="0" unique_strength="0" exp_strength="0"/>
+              <constraint exp_strength="0" constraints="0" field="id" notnull_strength="0" unique_strength="0"/>
+              <constraint exp_strength="0" constraints="0" field="group" notnull_strength="0" unique_strength="0"/>
+              <constraint exp_strength="0" constraints="0" field="comment" notnull_strength="0" unique_strength="0"/>
+              <constraint exp_strength="0" constraints="0" field="moveable" notnull_strength="0" unique_strength="0"/>
+              <constraint exp_strength="0" constraints="0" field="type" notnull_strength="0" unique_strength="0"/>
+              <constraint exp_strength="0" constraints="0" field="name" notnull_strength="0" unique_strength="0"/>
+              <constraint exp_strength="0" constraints="0" field="hidden" notnull_strength="0" unique_strength="0"/>
+              <constraint exp_strength="0" constraints="0" field="auxiliary_storage_labeling_positiony" notnull_strength="0" unique_strength="0"/>
+              <constraint exp_strength="0" constraints="0" field="auxiliary_storage_labeling_positionx" notnull_strength="0" unique_strength="0"/>
+              <constraint exp_strength="0" constraints="0" field="fence_len" notnull_strength="0" unique_strength="0"/>
+              <constraint exp_strength="0" constraints="0" field="cone_len" notnull_strength="0" unique_strength="0"/>
             </constraints>
             <constraintExpressions>
-              <constraint field="id" exp="" desc=""/>
-              <constraint field="group" exp="" desc=""/>
-              <constraint field="comment" exp="" desc=""/>
-              <constraint field="moveable" exp="" desc=""/>
-              <constraint field="type" exp="" desc=""/>
-              <constraint field="name" exp="" desc=""/>
-              <constraint field="hidden" exp="" desc=""/>
-              <constraint field="auxiliary_storage_labeling_positiony" exp="" desc=""/>
-              <constraint field="auxiliary_storage_labeling_positionx" exp="" desc=""/>
-              <constraint field="fence_len" exp="" desc=""/>
-              <constraint field="cone_len" exp="" desc=""/>
+              <constraint exp="" field="id" desc=""/>
+              <constraint exp="" field="group" desc=""/>
+              <constraint exp="" field="comment" desc=""/>
+              <constraint exp="" field="moveable" desc=""/>
+              <constraint exp="" field="type" desc=""/>
+              <constraint exp="" field="name" desc=""/>
+              <constraint exp="" field="hidden" desc=""/>
+              <constraint exp="" field="auxiliary_storage_labeling_positiony" desc=""/>
+              <constraint exp="" field="auxiliary_storage_labeling_positionx" desc=""/>
+              <constraint exp="" field="fence_len" desc=""/>
+              <constraint exp="" field="cone_len" desc=""/>
             </constraintExpressions>
             <expressionfields>
-              <field name="fence_len" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
-              <field name="fence_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
-              <field name="cone_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
+              <field precision="0" subType="0" typeName="double precision" name="fence_len" type="6" length="-1" comment="" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)"/>
+              <field precision="0" subType="0" typeName="double precision" name="fence_len" type="6" length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)"/>
+              <field precision="0" subType="0" typeName="double precision" name="cone_len" type="6" length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)"/>
             </expressionfields>
             <attributeactions>
-              <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+              <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
             </attributeactions>
-            <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;cone_len&quot;">
+            <attributetableconfig sortExpression="&quot;cone_len&quot;" sortOrder="0" actionWidgetStyle="dropDown">
               <columns>
-                <column width="-1" name="id" hidden="0" type="field"/>
-                <column width="-1" name="group" hidden="0" type="field"/>
-                <column width="-1" hidden="1" type="actions"/>
-                <column width="223" name="comment" hidden="0" type="field"/>
-                <column width="-1" name="moveable" hidden="0" type="field"/>
-                <column width="-1" name="type" hidden="0" type="field"/>
-                <column width="414" name="name" hidden="0" type="field"/>
-                <column width="-1" name="hidden" hidden="0" type="field"/>
-                <column width="-1" name="fence_len" hidden="0" type="field"/>
-                <column width="-1" name="cone_len" hidden="0" type="field"/>
-                <column width="-1" name="auxiliary_storage_labeling_positiony" hidden="1" type="field"/>
-                <column width="-1" name="auxiliary_storage_labeling_positionx" hidden="1" type="field"/>
+                <column hidden="0" name="id" type="field" width="-1"/>
+                <column hidden="0" name="group" type="field" width="-1"/>
+                <column hidden="1" type="actions" width="-1"/>
+                <column hidden="0" name="comment" type="field" width="223"/>
+                <column hidden="0" name="moveable" type="field" width="-1"/>
+                <column hidden="0" name="type" type="field" width="-1"/>
+                <column hidden="0" name="name" type="field" width="414"/>
+                <column hidden="0" name="hidden" type="field" width="-1"/>
+                <column hidden="0" name="fence_len" type="field" width="-1"/>
+                <column hidden="0" name="cone_len" type="field" width="-1"/>
+                <column hidden="1" name="auxiliary_storage_labeling_positiony" type="field" width="-1"/>
+                <column hidden="1" name="auxiliary_storage_labeling_positionx" type="field" width="-1"/>
               </columns>
             </attributetableconfig>
             <conditionalstyles>
@@ -4494,32 +4492,32 @@ def my_form_open(dialog, layer, feature):
             <featformsuppress>0</featformsuppress>
             <editorlayout>generatedlayout</editorlayout>
             <editable>
-              <field name="auxiliary_storage_labeling_positionx" editable="0"/>
-              <field name="auxiliary_storage_labeling_positiony" editable="0"/>
-              <field name="comment" editable="1"/>
-              <field name="cone_len" editable="0"/>
-              <field name="fence_len" editable="0"/>
-              <field name="group" editable="1"/>
-              <field name="hidden" editable="1"/>
-              <field name="id" editable="1"/>
-              <field name="length" editable="0"/>
-              <field name="moveable" editable="1"/>
-              <field name="name" editable="1"/>
-              <field name="type" editable="1"/>
+              <field editable="0" name="auxiliary_storage_labeling_positionx"/>
+              <field editable="0" name="auxiliary_storage_labeling_positiony"/>
+              <field editable="1" name="comment"/>
+              <field editable="0" name="cone_len"/>
+              <field editable="0" name="fence_len"/>
+              <field editable="1" name="group"/>
+              <field editable="1" name="hidden"/>
+              <field editable="1" name="id"/>
+              <field editable="0" name="length"/>
+              <field editable="1" name="moveable"/>
+              <field editable="1" name="name"/>
+              <field editable="1" name="type"/>
             </editable>
             <labelOnTop>
-              <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
-              <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
-              <field labelOnTop="0" name="comment"/>
-              <field labelOnTop="0" name="cone_len"/>
-              <field labelOnTop="0" name="fence_len"/>
-              <field labelOnTop="0" name="group"/>
-              <field labelOnTop="0" name="hidden"/>
-              <field labelOnTop="0" name="id"/>
-              <field labelOnTop="0" name="length"/>
-              <field labelOnTop="0" name="moveable"/>
-              <field labelOnTop="0" name="name"/>
-              <field labelOnTop="0" name="type"/>
+              <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
+              <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
+              <field name="comment" labelOnTop="0"/>
+              <field name="cone_len" labelOnTop="0"/>
+              <field name="fence_len" labelOnTop="0"/>
+              <field name="group" labelOnTop="0"/>
+              <field name="hidden" labelOnTop="0"/>
+              <field name="id" labelOnTop="0"/>
+              <field name="length" labelOnTop="0"/>
+              <field name="moveable" labelOnTop="0"/>
+              <field name="name" labelOnTop="0"/>
+              <field name="type" labelOnTop="0"/>
             </labelOnTop>
             <widgets/>
             <previewExpression>id</previewExpression>
@@ -4534,17 +4532,17 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="1" type="RuleRenderer" forceraster="0" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" enableorderby="0" forceraster="0" symbollevels="1">
         <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-          <rule symbol="0" key="{b3b38ee9-c245-4839-b078-3b966a2a5c4e}" label="Cones" filter="regexp_match(&quot;type&quot;, '^cone')"/>
-          <rule symbol="1" key="{9da1c54c-0ca9-4db9-a722-ce3f53ccd358}" label="Moveable fences" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1'"/>
-          <rule symbol="2" key="{bb4463e8-e33a-4475-878c-fd2d7b636418}" label="Fixed fences" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1'"/>
-          <rule symbol="3" key="{bb4463e8-e33a-4475-878c-fd2d7b636418}" label="Construction" filter="regexp_match(&quot;type&quot;, '^constr')"/>
-          <rule symbol="4" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" label="Visible" checkstate="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL"/>
+          <rule symbol="0" filter="regexp_match(&quot;type&quot;, '^cone')" label="Cones" key="{b3b38ee9-c245-4839-b078-3b966a2a5c4e}"/>
+          <rule symbol="1" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1'" label="Moveable fences" key="{9da1c54c-0ca9-4db9-a722-ce3f53ccd358}"/>
+          <rule symbol="2" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1'" label="Fixed fences" key="{bb4463e8-e33a-4475-878c-fd2d7b636418}"/>
+          <rule symbol="3" filter="regexp_match(&quot;type&quot;, '^constr')" label="Construction" key="{bb4463e8-e33a-4475-878c-fd2d7b636418}"/>
+          <rule symbol="4" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" checkstate="0" label="Visible" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}"/>
         </rules>
         <symbols>
-          <symbol name="0" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+          <symbol force_rhr="0" name="0" clip_to_extent="1" type="line" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleLine">
               <prop k="capstyle" v="round"/>
               <prop k="customdash" v="1;4"/>
               <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4576,8 +4574,8 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+          <symbol force_rhr="0" name="1" clip_to_extent="1" type="line" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleLine">
               <prop k="capstyle" v="round"/>
               <prop k="customdash" v="4;3"/>
               <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4609,8 +4607,8 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+          <symbol force_rhr="0" name="2" clip_to_extent="1" type="line" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleLine">
               <prop k="capstyle" v="square"/>
               <prop k="customdash" v="5;2"/>
               <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4642,8 +4640,8 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+          <symbol force_rhr="0" name="3" clip_to_extent="1" type="line" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleLine">
               <prop k="capstyle" v="square"/>
               <prop k="customdash" v="5;2"/>
               <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4675,8 +4673,8 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="4" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+          <symbol force_rhr="0" name="4" clip_to_extent="1" type="line" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleLine">
               <prop k="capstyle" v="square"/>
               <prop k="customdash" v="5;2"/>
               <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4706,17 +4704,17 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{c6c63c45-b105-4938-9293-1e0b6b509ffc}">
-          <rule key="{cb13c93f-b798-48fe-be18-377822a9654c}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
+          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{cb13c93f-b798-48fe-be18-377822a9654c}">
             <settings>
-              <text-style previewBkgrdColor="#ffffff" namedStyle="Regular" fontWeight="50" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.8" fontSizeUnit="Point" fieldName="comment" fontSize="11" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
-                <text-buffer bufferOpacity="1" bufferNoFill="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
-                <background shapeFillColor="255,255,255,255" shapeJoinStyle="128" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0.6" shapeOpacity="0.6" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="255,255,0,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="1" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="1" shapeRadiiX="1" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+              <text-style fontLetterSpacing="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Regular" textColor="0,0,0,255" multilineHeight="1" fontSize="11" fontWeight="50" fieldName="comment" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="0.8" useSubstitutions="0" fontUnderline="0">
+                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="255,255,0,255" shapeSizeUnit="MM" shapeRadiiY="1" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="128" shapeBorderWidthUnit="MM" shapeDraw="1" shapeOpacity="0.6" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="1" shapeRadiiX="1" shapeBorderWidth="0.6" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="4294967295" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
-              <placement centroidInside="0" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="2" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" geometryGenerator="" dist="5" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="5" placementFlags="2" offsetType="0" offsetUnits="MM"/>
-              <rendering labelPerPart="0" obstacleType="0" scaleMax="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="0" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="1" displayAll="1"/>
+              <text-format multilineAlign="4294967295" autoWrapLength="0" plussign="0" addDirectionSymbol="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+              <placement maxCurvedCharAngleOut="-25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="2" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" geometryGeneratorType="PointGeometry" quadOffset="4" distUnits="MM" offsetUnits="MM" repeatDistanceUnits="MM" dist="5" centroidInside="0" geometryGenerator="" placementFlags="2" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" maxCurvedCharAngleIn="25" priority="5"/>
+              <rendering displayAll="1" upsidedownLabels="0" mergeLines="1" fontLimitPixelSize="0" maxNumLabels="2000" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="1" scaleMax="0" minFeatureSize="0" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="0" fontMaxPixelSize="10000" scaleMin="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -4737,17 +4735,17 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </settings>
           </rule>
-          <rule key="{f68a5523-5992-4232-8c24-8259482e149e}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^(fenc|cone)')">
+          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{f68a5523-5992-4232-8c24-8259482e149e}">
             <settings>
-              <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="1" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="1" fontSizeUnit="Point" fieldName="round( $length, 1) || 'm'" fontSize="12" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
-                <text-buffer bufferOpacity="1" bufferNoFill="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1"/>
-                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="0" shapeRotationType="0" shapeSizeX="0" shapeRadiiX="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+              <text-style fontLetterSpacing="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Semibold" textColor="0,0,0,255" multilineHeight="1" fontSize="12" fontWeight="63" fieldName="round( $length, 1) || 'm'" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="1" useSubstitutions="0" fontUnderline="0">
+                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiY="0" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeDraw="0" shapeOpacity="1" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="0" shapeRadiiX="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="4294967295" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
-              <placement centroidInside="0" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="2" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" geometryGenerator="" dist="1" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="5" placementFlags="15" offsetType="0" offsetUnits="MM"/>
-              <rendering labelPerPart="0" obstacleType="0" scaleMax="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="0" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="0"/>
+              <text-format multilineAlign="4294967295" autoWrapLength="0" plussign="0" addDirectionSymbol="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+              <placement maxCurvedCharAngleOut="-25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="2" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" geometryGeneratorType="PointGeometry" quadOffset="4" distUnits="MM" offsetUnits="MM" repeatDistanceUnits="MM" dist="1" centroidInside="0" geometryGenerator="" placementFlags="15" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" maxCurvedCharAngleIn="25" priority="5"/>
+              <rendering displayAll="0" upsidedownLabels="0" mergeLines="0" fontLimitPixelSize="0" maxNumLabels="2000" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="1" scaleMax="0" minFeatureSize="0" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="0" fontMaxPixelSize="10000" scaleMin="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -4771,21 +4769,23 @@ def my_form_open(dialog, layer, feature):
         </rules>
       </labeling>
       <customproperties>
-        <property key="dualview/previewExpressions" value="id"/>
-        <property key="embeddedWidgets/count" value="0"/>
+        <property key="dualview/previewExpressions">
+          <value>id</value>
+        </property>
+        <property value="0" key="embeddedWidgets/count"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory enabled="0" minScaleDenominator="0" width="15" rotationOffset="270" penColor="#000000" penAlpha="255" height="15" penWidth="0" diagramOrientation="Up" backgroundColor="#ffffff" scaleDependency="Area" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" opacity="1" lineSizeType="MM" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeType="MM" scaleBasedVisibility="0" backgroundAlpha="255" barWidth="5">
           <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-          <attribute field="" color="#000000" label=""/>
+          <attribute color="#000000" label="" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" priority="0" dist="0" placement="2" obstacle="0" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" showAll="1" placement="2" linePlacementFlags="18" obstacle="0" dist="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -4794,7 +4794,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -4878,17 +4878,17 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="group" index="1" name=""/>
-        <alias field="comment" index="2" name=""/>
-        <alias field="moveable" index="3" name=""/>
-        <alias field="type" index="4" name=""/>
-        <alias field="name" index="5" name=""/>
-        <alias field="hidden" index="6" name=""/>
-        <alias field="auxiliary_storage_labeling_positiony" index="7" name=""/>
-        <alias field="auxiliary_storage_labeling_positionx" index="8" name=""/>
-        <alias field="fence_len" index="9" name=""/>
-        <alias field="cone_len" index="10" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="group" name=""/>
+        <alias index="2" field="comment" name=""/>
+        <alias index="3" field="moveable" name=""/>
+        <alias index="4" field="type" name=""/>
+        <alias index="5" field="name" name=""/>
+        <alias index="6" field="hidden" name=""/>
+        <alias index="7" field="auxiliary_storage_labeling_positiony" name=""/>
+        <alias index="8" field="auxiliary_storage_labeling_positionx" name=""/>
+        <alias index="9" field="fence_len" name=""/>
+        <alias index="10" field="cone_len" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -4906,53 +4906,53 @@ def my_form_open(dialog, layer, feature):
         <default field="cone_len" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="group" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="comment" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="moveable" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="type" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="name" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="hidden" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="auxiliary_storage_labeling_positiony" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="auxiliary_storage_labeling_positionx" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="fence_len" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="cone_len" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint exp_strength="0" field="id" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="group" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="comment" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="moveable" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="name" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="hidden" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="auxiliary_storage_labeling_positiony" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="auxiliary_storage_labeling_positionx" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="fence_len" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="cone_len" constraints="0" notnull_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="group" exp="" desc=""/>
-        <constraint field="comment" exp="" desc=""/>
-        <constraint field="moveable" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="hidden" exp="" desc=""/>
-        <constraint field="auxiliary_storage_labeling_positiony" exp="" desc=""/>
-        <constraint field="auxiliary_storage_labeling_positionx" exp="" desc=""/>
-        <constraint field="fence_len" exp="" desc=""/>
-        <constraint field="cone_len" exp="" desc=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="group" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="moveable" desc=""/>
+        <constraint exp="" field="type" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="hidden" desc=""/>
+        <constraint exp="" field="auxiliary_storage_labeling_positiony" desc=""/>
+        <constraint exp="" field="auxiliary_storage_labeling_positionx" desc=""/>
+        <constraint exp="" field="fence_len" desc=""/>
+        <constraint exp="" field="cone_len" desc=""/>
       </constraintExpressions>
       <expressionfields>
-        <field name="fence_len" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
-        <field name="fence_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
-        <field name="cone_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
+        <field precision="0" subType="0" typeName="double precision" name="fence_len" type="6" length="-1" comment="" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)"/>
+        <field precision="0" subType="0" typeName="double precision" name="fence_len" type="6" length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)"/>
+        <field precision="0" subType="0" typeName="double precision" name="cone_len" type="6" length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)"/>
       </expressionfields>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;group&quot;">
+      <attributetableconfig sortExpression="&quot;group&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="-1" name="group" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="1150" name="comment" hidden="0" type="field"/>
-          <column width="-1" name="moveable" hidden="0" type="field"/>
-          <column width="-1" name="type" hidden="0" type="field"/>
-          <column width="414" name="name" hidden="0" type="field"/>
-          <column width="-1" name="hidden" hidden="0" type="field"/>
-          <column width="-1" name="fence_len" hidden="0" type="field"/>
-          <column width="-1" name="cone_len" hidden="0" type="field"/>
-          <column width="-1" name="auxiliary_storage_labeling_positiony" hidden="1" type="field"/>
-          <column width="-1" name="auxiliary_storage_labeling_positionx" hidden="1" type="field"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="0" name="group" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="comment" type="field" width="1150"/>
+          <column hidden="0" name="moveable" type="field" width="-1"/>
+          <column hidden="0" name="type" type="field" width="-1"/>
+          <column hidden="0" name="name" type="field" width="414"/>
+          <column hidden="0" name="hidden" type="field" width="-1"/>
+          <column hidden="0" name="fence_len" type="field" width="-1"/>
+          <column hidden="0" name="cone_len" type="field" width="-1"/>
+          <column hidden="1" name="auxiliary_storage_labeling_positiony" type="field" width="-1"/>
+          <column hidden="1" name="auxiliary_storage_labeling_positionx" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -4983,38 +4983,38 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="auxiliary_storage_labeling_positionx" editable="0"/>
-        <field name="auxiliary_storage_labeling_positiony" editable="0"/>
-        <field name="comment" editable="1"/>
-        <field name="cone_len" editable="0"/>
-        <field name="fence_len" editable="0"/>
-        <field name="group" editable="1"/>
-        <field name="hidden" editable="1"/>
-        <field name="id" editable="1"/>
-        <field name="length" editable="0"/>
-        <field name="moveable" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="0" name="auxiliary_storage_labeling_positionx"/>
+        <field editable="0" name="auxiliary_storage_labeling_positiony"/>
+        <field editable="1" name="comment"/>
+        <field editable="0" name="cone_len"/>
+        <field editable="0" name="fence_len"/>
+        <field editable="1" name="group"/>
+        <field editable="1" name="hidden"/>
+        <field editable="1" name="id"/>
+        <field editable="0" name="length"/>
+        <field editable="1" name="moveable"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
-        <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
-        <field labelOnTop="0" name="comment"/>
-        <field labelOnTop="0" name="cone_len"/>
-        <field labelOnTop="0" name="fence_len"/>
-        <field labelOnTop="0" name="group"/>
-        <field labelOnTop="0" name="hidden"/>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="length"/>
-        <field labelOnTop="0" name="moveable"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
+        <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
+        <field name="comment" labelOnTop="0"/>
+        <field name="cone_len" labelOnTop="0"/>
+        <field name="fence_len" labelOnTop="0"/>
+        <field name="group" labelOnTop="0"/>
+        <field name="hidden" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="length" labelOnTop="0"/>
+        <field name="moveable" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <widgets/>
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="100000" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" simplifyLocal="1" readOnly="0" geometry="Polygon" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" wkbType="MultiPolygon" simplifyDrawingTol="1">
+    <maplayer styleCategories="AllStyleCategories" refreshOnNotifyMessage="" simplifyAlgorithm="0" maxScale="100000" geometry="Polygon" simplifyMaxScale="1" simplifyLocal="1" labelsEnabled="0" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" type="vector" minScale="1e+08" readOnly="0" autoRefreshTime="0" autoRefreshEnabled="0" simplifyDrawingTol="1" wkbType="MultiPolygon" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.94678832168284544</ymin>
@@ -5078,10 +5078,10 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" type="singleSymbol" forceraster="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" enableorderby="0" forceraster="0" symbollevels="0">
         <symbols>
-          <symbol name="0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+          <symbol force_rhr="0" name="0" clip_to_extent="1" type="fill" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleFill">
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="26,0,201,255"/>
               <prop k="joinstyle" v="bevel"/>
@@ -5107,21 +5107,21 @@ def my_form_open(dialog, layer, feature):
         <sizescale/>
       </renderer-v2>
       <customproperties>
-        <property key="dualview/previewExpressions" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
-        <property key="embeddedWidgets/count" value="0"/>
+        <property value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" key="dualview/previewExpressions"/>
+        <property value="0" key="embeddedWidgets/count"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory enabled="0" minScaleDenominator="100000" width="15" rotationOffset="270" penColor="#000000" penAlpha="255" height="15" penWidth="0" diagramOrientation="Up" backgroundColor="#ffffff" scaleDependency="Area" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" opacity="1" lineSizeType="MM" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeType="MM" scaleBasedVisibility="0" backgroundAlpha="255" barWidth="5">
           <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
-          <attribute field="" color="#000000" label=""/>
+          <attribute color="#000000" label="" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" priority="0" dist="0" placement="0" obstacle="0" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" showAll="1" placement="0" linePlacementFlags="2" obstacle="0" dist="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -5136,7 +5136,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -5173,9 +5173,9 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="page" index="2" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
+        <alias index="2" field="page" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -5185,25 +5185,25 @@ def my_form_open(dialog, layer, feature):
         <default field="page" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="type" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="page" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint exp_strength="0" field="id" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="page" constraints="0" notnull_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="page" exp="" desc=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="type" desc=""/>
+        <constraint exp="" field="page" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="-1" name="type" hidden="0" type="field"/>
-          <column width="-1" name="page" hidden="0" type="field"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="0" name="type" type="field" width="-1"/>
+          <column hidden="0" name="page" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5234,20 +5234,20 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="page" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="page"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="page"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="page" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="100000" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Point" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" wkbType="Point" simplifyDrawingTol="1">
+    <maplayer styleCategories="AllStyleCategories" refreshOnNotifyMessage="" simplifyAlgorithm="0" maxScale="100000" geometry="Point" simplifyMaxScale="1" simplifyLocal="1" labelsEnabled="1" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" type="vector" minScale="1e+08" readOnly="0" autoRefreshTime="0" autoRefreshEnabled="0" simplifyDrawingTol="1" wkbType="Point" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37523075794307204</xmin>
         <ymin>-33.94592961896692884</ymin>
@@ -5304,7 +5304,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
+          <spatial minz="0" minx="0" maxz="0" maxy="0" maxx="0" crs="" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -5328,14 +5328,14 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" type="RuleRenderer" forceraster="0" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" enableorderby="0" forceraster="0" symbollevels="0">
         <rules key="{436a5e05-3485-477a-80b7-cf4d12d6dcec}">
-          <rule symbol="0" key="{308d81eb-cefa-4627-8afb-3baa8363f863}" description="Show in marshal overview" label="Show in marshal overview" filter="'marshal plan' = attribute( @atlas_feature , 'type' )"/>
-          <rule symbol="1" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" description="Show in marshal overview" label="Show in marshal maps" filter="'marshal' = attribute( @atlas_feature , 'type' )"/>
+          <rule symbol="0" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" label="Show in marshal overview" key="{308d81eb-cefa-4627-8afb-3baa8363f863}" description="Show in marshal overview"/>
+          <rule symbol="1" filter="'marshal' = attribute( @atlas_feature , 'type' )" label="Show in marshal maps" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" description="Show in marshal overview"/>
         </rules>
         <symbols>
-          <symbol name="0" clip_to_extent="1" force_rhr="0" type="marker" alpha="0.792157">
-            <layer pass="1" class="SimpleMarker" locked="0" enabled="1">
+          <symbol force_rhr="0" name="0" clip_to_extent="1" type="marker" alpha="0.792157">
+            <layer pass="1" locked="0" enabled="1" class="SimpleMarker">
               <prop k="angle" v="0"/>
               <prop k="color" v="0,0,0,255"/>
               <prop k="horizontal_anchor_point" v="1"/>
@@ -5363,8 +5363,8 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" clip_to_extent="1" force_rhr="0" type="marker" alpha="0.01">
-            <layer pass="1" class="SimpleMarker" locked="0" enabled="1">
+          <symbol force_rhr="0" name="1" clip_to_extent="1" type="marker" alpha="0.01">
+            <layer pass="1" locked="0" enabled="1" class="SimpleMarker">
               <prop k="angle" v="0"/>
               <prop k="color" v="0,0,0,255"/>
               <prop k="horizontal_anchor_point" v="1"/>
@@ -5396,17 +5396,17 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{f4f14825-d873-4bbe-9728-d63dc57afbf9}">
-          <rule key="{3a329855-a43a-4f24-8600-9e8fb5b4d8a4}" description="Show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" filter="'marshal plan' = attribute( @atlas_feature , 'type' )">
+          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' )" key="{3a329855-a43a-4f24-8600-9e8fb5b4d8a4}" description="Show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)">
             <settings>
-              <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.9" fontSizeUnit="Point" fieldName="position" fontSize="6" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
-                <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
-                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0.1" shapeOpacity="0.5" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="0" shapeRadiiX="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+              <text-style fontLetterSpacing="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Semibold" textColor="0,0,0,255" multilineHeight="1" fontSize="6" fontWeight="63" fieldName="position" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="0.9" useSubstitutions="0" fontUnderline="0">
+                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeType="3" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiY="0" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeDraw="1" shapeOpacity="0.5" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="0" shapeRadiiX="0" shapeBorderWidth="0.1" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
-              <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="6" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="1" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="10" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
-              <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="1" upsidedownLabels="0" obstacle="0" fontMaxPixelSize="10000" zIndex="2" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
+              <text-format multilineAlign="0" autoWrapLength="0" plussign="0" addDirectionSymbol="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+              <placement maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="6" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" geometryGeneratorType="PointGeometry" quadOffset="4" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="1" centroidInside="0" geometryGenerator="" placementFlags="10" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" maxCurvedCharAngleIn="20" priority="10"/>
+              <rendering displayAll="1" upsidedownLabels="0" mergeLines="0" fontLimitPixelSize="0" maxNumLabels="2000" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="0" scaleMax="10000000" minFeatureSize="0" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="2" fontMaxPixelSize="10000" scaleMin="1" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -5432,17 +5432,17 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </settings>
           </rule>
-          <rule key="{2296c342-131c-47dd-a5f3-3d062b82ee51}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" active="0" filter="'marshal' = attribute( @atlas_feature , 'type' )">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' )" key="{2296c342-131c-47dd-a5f3-3d062b82ee51}" active="0" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index">
             <settings>
-              <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.5" fontSizeUnit="Point" fieldName="position" fontSize="6" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
-                <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
-                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0.4" shapeOpacity="0.5" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0.2" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="0.2" shapeRadiiX="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+              <text-style fontLetterSpacing="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Semibold" textColor="0,0,0,255" multilineHeight="1" fontSize="6" fontWeight="63" fieldName="position" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="0.5" useSubstitutions="0" fontUnderline="0">
+                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeType="3" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiY="0" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeDraw="1" shapeOpacity="0.5" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.2" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="0.2" shapeRadiiX="0" shapeBorderWidth="0.4" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="1" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
-              <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="6" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="0" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="8" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
-              <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="1.8" upsidedownLabels="0" obstacle="0" fontMaxPixelSize="10000" zIndex="5" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
+              <text-format multilineAlign="1" autoWrapLength="0" plussign="0" addDirectionSymbol="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+              <placement maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="6" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" geometryGeneratorType="PointGeometry" quadOffset="4" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="0" centroidInside="0" geometryGenerator="" placementFlags="10" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" maxCurvedCharAngleIn="20" priority="8"/>
+              <rendering displayAll="1" upsidedownLabels="0" mergeLines="0" fontLimitPixelSize="0" maxNumLabels="2000" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="0" scaleMax="10000000" minFeatureSize="0" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="5" fontMaxPixelSize="10000" scaleMin="1" obstacleFactor="1.8"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -5498,17 +5498,17 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </settings>
           </rule>
-          <rule key="{a58f40a9-df73-4719-aa04-2c30eaa03b8f}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id" key="{a58f40a9-df73-4719-aa04-2c30eaa03b8f}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label">
             <settings>
-              <text-style previewBkgrdColor="#ffffff" namedStyle="Regular" fontWeight="50" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.6" fontSizeUnit="Point" fieldName="position" fontSize="6" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
-                <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
-                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0.4" shapeOpacity="0.6" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0.2" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="0.2" shapeRadiiX="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+              <text-style fontLetterSpacing="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Regular" textColor="0,0,0,255" multilineHeight="1" fontSize="6" fontWeight="50" fieldName="position" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="0.6" useSubstitutions="0" fontUnderline="0">
+                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeType="3" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiY="0" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeDraw="1" shapeOpacity="0.6" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.2" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="0.2" shapeRadiiX="0" shapeBorderWidth="0.4" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="1" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
-              <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="6" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="0" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="8" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
-              <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="1.8" upsidedownLabels="0" obstacle="0" fontMaxPixelSize="10000" zIndex="5" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
+              <text-format multilineAlign="1" autoWrapLength="0" plussign="0" addDirectionSymbol="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+              <placement maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="6" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" geometryGeneratorType="PointGeometry" quadOffset="4" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="0" centroidInside="0" geometryGenerator="" placementFlags="10" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" maxCurvedCharAngleIn="20" priority="8"/>
+              <rendering displayAll="1" upsidedownLabels="0" mergeLines="0" fontLimitPixelSize="0" maxNumLabels="2000" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="0" scaleMax="10000000" minFeatureSize="0" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="5" fontMaxPixelSize="10000" scaleMin="1" obstacleFactor="1.8"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -5564,17 +5564,17 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </settings>
           </rule>
-          <rule key="{46ca2a32-142f-49b9-a885-1f565c6f0b0f}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" key="{46ca2a32-142f-49b9-a885-1f565c6f0b0f}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top">
             <settings>
-              <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.9" fontSizeUnit="Point" fieldName="position" fontSize="8" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
-                <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
-                <background shapeFillColor="255,255,0,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0.4" shapeOpacity="0.9" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0.2" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="0.2" shapeRadiiX="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+              <text-style fontLetterSpacing="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Semibold" textColor="0,0,0,255" multilineHeight="1" fontSize="8" fontWeight="63" fieldName="position" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="0.9" useSubstitutions="0" fontUnderline="0">
+                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeType="3" shapeFillColor="255,255,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiY="0" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeDraw="1" shapeOpacity="0.9" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.2" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="0.2" shapeRadiiX="0" shapeBorderWidth="0.4" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="1" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
-              <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="0" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="0" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="10" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
-              <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="1.8" upsidedownLabels="0" obstacle="0" fontMaxPixelSize="10000" zIndex="10" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
+              <text-format multilineAlign="1" autoWrapLength="0" plussign="0" addDirectionSymbol="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+              <placement maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="0" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" geometryGeneratorType="PointGeometry" quadOffset="4" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="0" centroidInside="0" geometryGenerator="" placementFlags="10" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" maxCurvedCharAngleIn="20" priority="10"/>
+              <rendering displayAll="1" upsidedownLabels="0" mergeLines="0" fontLimitPixelSize="0" maxNumLabels="2000" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="0" scaleMax="10000000" minFeatureSize="0" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="10" fontMaxPixelSize="10000" scaleMin="1" obstacleFactor="1.8"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -5633,156 +5633,156 @@ def my_form_open(dialog, layer, feature):
         </rules>
       </labeling>
       <customproperties>
-        <property key="dualview/previewExpressions" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
-        <property key="embeddedWidgets/count" value="0"/>
-        <property key="labeling/addDirectionSymbol" value="false"/>
-        <property key="labeling/angleOffset" value="0"/>
-        <property key="labeling/blendMode" value="0"/>
-        <property key="labeling/bufferBlendMode" value="0"/>
-        <property key="labeling/bufferColorA" value="255"/>
-        <property key="labeling/bufferColorB" value="255"/>
-        <property key="labeling/bufferColorG" value="255"/>
-        <property key="labeling/bufferColorR" value="255"/>
-        <property key="labeling/bufferDraw" value="false"/>
-        <property key="labeling/bufferJoinStyle" value="64"/>
-        <property key="labeling/bufferNoFill" value="false"/>
-        <property key="labeling/bufferSize" value="1"/>
-        <property key="labeling/bufferSizeInMapUnits" value="false"/>
-        <property key="labeling/bufferSizeMapUnitScale" value="0,0,0,0,0,0"/>
-        <property key="labeling/bufferTransp" value="0"/>
-        <property key="labeling/centroidInside" value="false"/>
-        <property key="labeling/centroidWhole" value="false"/>
-        <property key="labeling/decimals" value="3"/>
-        <property key="labeling/displayAll" value="false"/>
-        <property key="labeling/dist" value="0"/>
-        <property key="labeling/distInMapUnits" value="false"/>
-        <property key="labeling/distMapUnitScale" value="0,0,0,0,0,0"/>
-        <property key="labeling/drawLabels" value="false"/>
-        <property key="labeling/enabled" value="false"/>
-        <property key="labeling/fieldName" value="position"/>
-        <property key="labeling/fitInPolygonOnly" value="false"/>
-        <property key="labeling/fontCapitals" value="0"/>
-        <property key="labeling/fontFamily" value="Myriad Pro"/>
-        <property key="labeling/fontItalic" value="false"/>
-        <property key="labeling/fontLetterSpacing" value="0"/>
-        <property key="labeling/fontLimitPixelSize" value="false"/>
-        <property key="labeling/fontMaxPixelSize" value="10000"/>
-        <property key="labeling/fontMinPixelSize" value="3"/>
-        <property key="labeling/fontSize" value="10"/>
-        <property key="labeling/fontSizeInMapUnits" value="false"/>
-        <property key="labeling/fontSizeMapUnitScale" value="0,0,0,0,0,0"/>
-        <property key="labeling/fontStrikeout" value="false"/>
-        <property key="labeling/fontUnderline" value="false"/>
-        <property key="labeling/fontWeight" value="63"/>
-        <property key="labeling/fontWordSpacing" value="0"/>
-        <property key="labeling/formatNumbers" value="false"/>
-        <property key="labeling/isExpression" value="false"/>
-        <property key="labeling/labelOffsetInMapUnits" value="true"/>
-        <property key="labeling/labelOffsetMapUnitScale" value="0,0,0,0,0,0"/>
-        <property key="labeling/labelPerPart" value="false"/>
-        <property key="labeling/leftDirectionSymbol" value="&lt;"/>
-        <property key="labeling/limitNumLabels" value="false"/>
-        <property key="labeling/maxCurvedCharAngleIn" value="20"/>
-        <property key="labeling/maxCurvedCharAngleOut" value="-20"/>
-        <property key="labeling/maxNumLabels" value="2000"/>
-        <property key="labeling/mergeLines" value="false"/>
-        <property key="labeling/minFeatureSize" value="0"/>
-        <property key="labeling/multilineAlign" value="0"/>
-        <property key="labeling/multilineHeight" value="1"/>
-        <property key="labeling/namedStyle" value="Semibold"/>
-        <property key="labeling/obstacle" value="true"/>
-        <property key="labeling/obstacleFactor" value="1"/>
-        <property key="labeling/obstacleType" value="0"/>
-        <property key="labeling/offsetType" value="0"/>
-        <property key="labeling/placeDirectionSymbol" value="0"/>
-        <property key="labeling/placement" value="0"/>
-        <property key="labeling/placementFlags" value="10"/>
-        <property key="labeling/plussign" value="false"/>
-        <property key="labeling/predefinedPositionOrder" value="TR,TL,BR,BL,R,L,TSR,BSR"/>
-        <property key="labeling/preserveRotation" value="true"/>
-        <property key="labeling/previewBkgrdColor" value="#ffffff"/>
-        <property key="labeling/priority" value="5"/>
-        <property key="labeling/quadOffset" value="4"/>
-        <property key="labeling/repeatDistance" value="0"/>
-        <property key="labeling/repeatDistanceMapUnitScale" value="0,0,0,0,0,0"/>
-        <property key="labeling/repeatDistanceUnit" value="1"/>
-        <property key="labeling/reverseDirectionSymbol" value="false"/>
-        <property key="labeling/rightDirectionSymbol" value=">"/>
-        <property key="labeling/scaleMax" value="10000000"/>
-        <property key="labeling/scaleMin" value="1"/>
-        <property key="labeling/scaleVisibility" value="false"/>
-        <property key="labeling/shadowBlendMode" value="6"/>
-        <property key="labeling/shadowColorB" value="0"/>
-        <property key="labeling/shadowColorG" value="0"/>
-        <property key="labeling/shadowColorR" value="0"/>
-        <property key="labeling/shadowDraw" value="false"/>
-        <property key="labeling/shadowOffsetAngle" value="135"/>
-        <property key="labeling/shadowOffsetDist" value="1"/>
-        <property key="labeling/shadowOffsetGlobal" value="true"/>
-        <property key="labeling/shadowOffsetMapUnitScale" value="0,0,0,0,0,0"/>
-        <property key="labeling/shadowOffsetUnits" value="1"/>
-        <property key="labeling/shadowRadius" value="1.5"/>
-        <property key="labeling/shadowRadiusAlphaOnly" value="false"/>
-        <property key="labeling/shadowRadiusMapUnitScale" value="0,0,0,0,0,0"/>
-        <property key="labeling/shadowRadiusUnits" value="1"/>
-        <property key="labeling/shadowScale" value="100"/>
-        <property key="labeling/shadowTransparency" value="30"/>
-        <property key="labeling/shadowUnder" value="0"/>
-        <property key="labeling/shapeBlendMode" value="0"/>
-        <property key="labeling/shapeBorderColorA" value="255"/>
-        <property key="labeling/shapeBorderColorB" value="128"/>
-        <property key="labeling/shapeBorderColorG" value="128"/>
-        <property key="labeling/shapeBorderColorR" value="128"/>
-        <property key="labeling/shapeBorderWidth" value="0"/>
-        <property key="labeling/shapeBorderWidthMapUnitScale" value="0,0,0,0,0,0"/>
-        <property key="labeling/shapeBorderWidthUnits" value="1"/>
-        <property key="labeling/shapeDraw" value="true"/>
-        <property key="labeling/shapeFillColorA" value="255"/>
-        <property key="labeling/shapeFillColorB" value="138"/>
-        <property key="labeling/shapeFillColorG" value="0"/>
-        <property key="labeling/shapeFillColorR" value="101"/>
-        <property key="labeling/shapeJoinStyle" value="64"/>
-        <property key="labeling/shapeOffsetMapUnitScale" value="0,0,0,0,0,0"/>
-        <property key="labeling/shapeOffsetUnits" value="1"/>
-        <property key="labeling/shapeOffsetX" value="0"/>
-        <property key="labeling/shapeOffsetY" value="0"/>
-        <property key="labeling/shapeRadiiMapUnitScale" value="0,0,0,0,0,0"/>
-        <property key="labeling/shapeRadiiUnits" value="1"/>
-        <property key="labeling/shapeRadiiX" value="0"/>
-        <property key="labeling/shapeRadiiY" value="0"/>
-        <property key="labeling/shapeRotation" value="0"/>
-        <property key="labeling/shapeRotationType" value="0"/>
-        <property key="labeling/shapeSVGFile" value=""/>
-        <property key="labeling/shapeSizeMapUnitScale" value="0,0,0,0,0,0"/>
-        <property key="labeling/shapeSizeType" value="0"/>
-        <property key="labeling/shapeSizeUnits" value="1"/>
-        <property key="labeling/shapeSizeX" value="0"/>
-        <property key="labeling/shapeSizeY" value="0"/>
-        <property key="labeling/shapeTransparency" value="0"/>
-        <property key="labeling/shapeType" value="0"/>
-        <property key="labeling/textColorA" value="255"/>
-        <property key="labeling/textColorB" value="255"/>
-        <property key="labeling/textColorG" value="255"/>
-        <property key="labeling/textColorR" value="255"/>
-        <property key="labeling/textTransp" value="0"/>
-        <property key="labeling/upsidedownLabels" value="0"/>
-        <property key="labeling/wrapChar" value=""/>
-        <property key="labeling/xOffset" value="0"/>
-        <property key="labeling/yOffset" value="0"/>
-        <property key="labeling/zIndex" value="0"/>
+        <property value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" key="dualview/previewExpressions"/>
+        <property value="0" key="embeddedWidgets/count"/>
+        <property value="false" key="labeling/addDirectionSymbol"/>
+        <property value="0" key="labeling/angleOffset"/>
+        <property value="0" key="labeling/blendMode"/>
+        <property value="0" key="labeling/bufferBlendMode"/>
+        <property value="255" key="labeling/bufferColorA"/>
+        <property value="255" key="labeling/bufferColorB"/>
+        <property value="255" key="labeling/bufferColorG"/>
+        <property value="255" key="labeling/bufferColorR"/>
+        <property value="false" key="labeling/bufferDraw"/>
+        <property value="64" key="labeling/bufferJoinStyle"/>
+        <property value="false" key="labeling/bufferNoFill"/>
+        <property value="1" key="labeling/bufferSize"/>
+        <property value="false" key="labeling/bufferSizeInMapUnits"/>
+        <property value="0,0,0,0,0,0" key="labeling/bufferSizeMapUnitScale"/>
+        <property value="0" key="labeling/bufferTransp"/>
+        <property value="false" key="labeling/centroidInside"/>
+        <property value="false" key="labeling/centroidWhole"/>
+        <property value="3" key="labeling/decimals"/>
+        <property value="false" key="labeling/displayAll"/>
+        <property value="0" key="labeling/dist"/>
+        <property value="false" key="labeling/distInMapUnits"/>
+        <property value="0,0,0,0,0,0" key="labeling/distMapUnitScale"/>
+        <property value="false" key="labeling/drawLabels"/>
+        <property value="false" key="labeling/enabled"/>
+        <property value="position" key="labeling/fieldName"/>
+        <property value="false" key="labeling/fitInPolygonOnly"/>
+        <property value="0" key="labeling/fontCapitals"/>
+        <property value="Myriad Pro" key="labeling/fontFamily"/>
+        <property value="false" key="labeling/fontItalic"/>
+        <property value="0" key="labeling/fontLetterSpacing"/>
+        <property value="false" key="labeling/fontLimitPixelSize"/>
+        <property value="10000" key="labeling/fontMaxPixelSize"/>
+        <property value="3" key="labeling/fontMinPixelSize"/>
+        <property value="10" key="labeling/fontSize"/>
+        <property value="false" key="labeling/fontSizeInMapUnits"/>
+        <property value="0,0,0,0,0,0" key="labeling/fontSizeMapUnitScale"/>
+        <property value="false" key="labeling/fontStrikeout"/>
+        <property value="false" key="labeling/fontUnderline"/>
+        <property value="63" key="labeling/fontWeight"/>
+        <property value="0" key="labeling/fontWordSpacing"/>
+        <property value="false" key="labeling/formatNumbers"/>
+        <property value="false" key="labeling/isExpression"/>
+        <property value="true" key="labeling/labelOffsetInMapUnits"/>
+        <property value="0,0,0,0,0,0" key="labeling/labelOffsetMapUnitScale"/>
+        <property value="false" key="labeling/labelPerPart"/>
+        <property value="&lt;" key="labeling/leftDirectionSymbol"/>
+        <property value="false" key="labeling/limitNumLabels"/>
+        <property value="20" key="labeling/maxCurvedCharAngleIn"/>
+        <property value="-20" key="labeling/maxCurvedCharAngleOut"/>
+        <property value="2000" key="labeling/maxNumLabels"/>
+        <property value="false" key="labeling/mergeLines"/>
+        <property value="0" key="labeling/minFeatureSize"/>
+        <property value="0" key="labeling/multilineAlign"/>
+        <property value="1" key="labeling/multilineHeight"/>
+        <property value="Semibold" key="labeling/namedStyle"/>
+        <property value="true" key="labeling/obstacle"/>
+        <property value="1" key="labeling/obstacleFactor"/>
+        <property value="0" key="labeling/obstacleType"/>
+        <property value="0" key="labeling/offsetType"/>
+        <property value="0" key="labeling/placeDirectionSymbol"/>
+        <property value="0" key="labeling/placement"/>
+        <property value="10" key="labeling/placementFlags"/>
+        <property value="false" key="labeling/plussign"/>
+        <property value="TR,TL,BR,BL,R,L,TSR,BSR" key="labeling/predefinedPositionOrder"/>
+        <property value="true" key="labeling/preserveRotation"/>
+        <property value="#ffffff" key="labeling/previewBkgrdColor"/>
+        <property value="5" key="labeling/priority"/>
+        <property value="4" key="labeling/quadOffset"/>
+        <property value="0" key="labeling/repeatDistance"/>
+        <property value="0,0,0,0,0,0" key="labeling/repeatDistanceMapUnitScale"/>
+        <property value="1" key="labeling/repeatDistanceUnit"/>
+        <property value="false" key="labeling/reverseDirectionSymbol"/>
+        <property value=">" key="labeling/rightDirectionSymbol"/>
+        <property value="10000000" key="labeling/scaleMax"/>
+        <property value="1" key="labeling/scaleMin"/>
+        <property value="false" key="labeling/scaleVisibility"/>
+        <property value="6" key="labeling/shadowBlendMode"/>
+        <property value="0" key="labeling/shadowColorB"/>
+        <property value="0" key="labeling/shadowColorG"/>
+        <property value="0" key="labeling/shadowColorR"/>
+        <property value="false" key="labeling/shadowDraw"/>
+        <property value="135" key="labeling/shadowOffsetAngle"/>
+        <property value="1" key="labeling/shadowOffsetDist"/>
+        <property value="true" key="labeling/shadowOffsetGlobal"/>
+        <property value="0,0,0,0,0,0" key="labeling/shadowOffsetMapUnitScale"/>
+        <property value="1" key="labeling/shadowOffsetUnits"/>
+        <property value="1.5" key="labeling/shadowRadius"/>
+        <property value="false" key="labeling/shadowRadiusAlphaOnly"/>
+        <property value="0,0,0,0,0,0" key="labeling/shadowRadiusMapUnitScale"/>
+        <property value="1" key="labeling/shadowRadiusUnits"/>
+        <property value="100" key="labeling/shadowScale"/>
+        <property value="30" key="labeling/shadowTransparency"/>
+        <property value="0" key="labeling/shadowUnder"/>
+        <property value="0" key="labeling/shapeBlendMode"/>
+        <property value="255" key="labeling/shapeBorderColorA"/>
+        <property value="128" key="labeling/shapeBorderColorB"/>
+        <property value="128" key="labeling/shapeBorderColorG"/>
+        <property value="128" key="labeling/shapeBorderColorR"/>
+        <property value="0" key="labeling/shapeBorderWidth"/>
+        <property value="0,0,0,0,0,0" key="labeling/shapeBorderWidthMapUnitScale"/>
+        <property value="1" key="labeling/shapeBorderWidthUnits"/>
+        <property value="true" key="labeling/shapeDraw"/>
+        <property value="255" key="labeling/shapeFillColorA"/>
+        <property value="138" key="labeling/shapeFillColorB"/>
+        <property value="0" key="labeling/shapeFillColorG"/>
+        <property value="101" key="labeling/shapeFillColorR"/>
+        <property value="64" key="labeling/shapeJoinStyle"/>
+        <property value="0,0,0,0,0,0" key="labeling/shapeOffsetMapUnitScale"/>
+        <property value="1" key="labeling/shapeOffsetUnits"/>
+        <property value="0" key="labeling/shapeOffsetX"/>
+        <property value="0" key="labeling/shapeOffsetY"/>
+        <property value="0,0,0,0,0,0" key="labeling/shapeRadiiMapUnitScale"/>
+        <property value="1" key="labeling/shapeRadiiUnits"/>
+        <property value="0" key="labeling/shapeRadiiX"/>
+        <property value="0" key="labeling/shapeRadiiY"/>
+        <property value="0" key="labeling/shapeRotation"/>
+        <property value="0" key="labeling/shapeRotationType"/>
+        <property value="" key="labeling/shapeSVGFile"/>
+        <property value="0,0,0,0,0,0" key="labeling/shapeSizeMapUnitScale"/>
+        <property value="0" key="labeling/shapeSizeType"/>
+        <property value="1" key="labeling/shapeSizeUnits"/>
+        <property value="0" key="labeling/shapeSizeX"/>
+        <property value="0" key="labeling/shapeSizeY"/>
+        <property value="0" key="labeling/shapeTransparency"/>
+        <property value="0" key="labeling/shapeType"/>
+        <property value="255" key="labeling/textColorA"/>
+        <property value="255" key="labeling/textColorB"/>
+        <property value="255" key="labeling/textColorG"/>
+        <property value="255" key="labeling/textColorR"/>
+        <property value="0" key="labeling/textTransp"/>
+        <property value="0" key="labeling/upsidedownLabels"/>
+        <property value="" key="labeling/wrapChar"/>
+        <property value="0" key="labeling/xOffset"/>
+        <property value="0" key="labeling/yOffset"/>
+        <property value="0" key="labeling/zIndex"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory enabled="0" minScaleDenominator="100000" width="15" rotationOffset="270" penColor="#000000" penAlpha="255" height="15" penWidth="0" diagramOrientation="Up" backgroundColor="#ffffff" scaleDependency="Area" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" opacity="1" lineSizeType="MM" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeType="MM" scaleBasedVisibility="0" backgroundAlpha="255" barWidth="5">
           <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
-          <attribute field="" color="#000000" label=""/>
+          <attribute color="#000000" label="" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" priority="0" dist="0" placement="0" obstacle="0" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" showAll="1" placement="0" linePlacementFlags="2" obstacle="0" dist="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -5791,7 +5791,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -5920,20 +5920,20 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="position" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
-        <alias field="notes" index="3" name=""/>
-        <alias field="oldpositio" index="4" name=""/>
-        <alias field="xyposition" index="5" name=""/>
-        <alias field="csv_positi" index="6" name=""/>
-        <alias field="csv_name" index="7" name=""/>
-        <alias field="csv_club" index="8" name=""/>
-        <alias field="csv_captai" index="9" name=""/>
-        <alias field="csv_capt_1" index="10" name=""/>
-        <alias field="csv_first_" index="11" name=""/>
-        <alias field="csv_last_r" index="12" name=""/>
-        <alias field="csv_instru" index="13" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="position" name=""/>
+        <alias index="2" field="type" name=""/>
+        <alias index="3" field="notes" name=""/>
+        <alias index="4" field="oldpositio" name=""/>
+        <alias index="5" field="xyposition" name=""/>
+        <alias index="6" field="csv_positi" name=""/>
+        <alias index="7" field="csv_name" name=""/>
+        <alias index="8" field="csv_club" name=""/>
+        <alias index="9" field="csv_captai" name=""/>
+        <alias index="10" field="csv_capt_1" name=""/>
+        <alias index="11" field="csv_first_" name=""/>
+        <alias index="12" field="csv_last_r" name=""/>
+        <alias index="13" field="csv_instru" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -5954,58 +5954,58 @@ def my_form_open(dialog, layer, feature):
         <default field="csv_instru" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="position" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="type" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="notes" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="oldpositio" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="xyposition" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="csv_positi" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="csv_name" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="csv_club" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="csv_captai" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="csv_capt_1" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="csv_first_" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="csv_last_r" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="csv_instru" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint exp_strength="0" field="id" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="position" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="notes" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="oldpositio" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="xyposition" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="csv_positi" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="csv_name" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="csv_club" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="csv_captai" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="csv_capt_1" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="csv_first_" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="csv_last_r" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="csv_instru" constraints="0" notnull_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="position" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="notes" exp="" desc=""/>
-        <constraint field="oldpositio" exp="" desc=""/>
-        <constraint field="xyposition" exp="" desc=""/>
-        <constraint field="csv_positi" exp="" desc=""/>
-        <constraint field="csv_name" exp="" desc=""/>
-        <constraint field="csv_club" exp="" desc=""/>
-        <constraint field="csv_captai" exp="" desc=""/>
-        <constraint field="csv_capt_1" exp="" desc=""/>
-        <constraint field="csv_first_" exp="" desc=""/>
-        <constraint field="csv_last_r" exp="" desc=""/>
-        <constraint field="csv_instru" exp="" desc=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="position" desc=""/>
+        <constraint exp="" field="type" desc=""/>
+        <constraint exp="" field="notes" desc=""/>
+        <constraint exp="" field="oldpositio" desc=""/>
+        <constraint exp="" field="xyposition" desc=""/>
+        <constraint exp="" field="csv_positi" desc=""/>
+        <constraint exp="" field="csv_name" desc=""/>
+        <constraint exp="" field="csv_club" desc=""/>
+        <constraint exp="" field="csv_captai" desc=""/>
+        <constraint exp="" field="csv_capt_1" desc=""/>
+        <constraint exp="" field="csv_first_" desc=""/>
+        <constraint exp="" field="csv_last_r" desc=""/>
+        <constraint exp="" field="csv_instru" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="1" sortExpression="&quot;csv_club&quot;">
+      <attributetableconfig sortExpression="&quot;csv_club&quot;" sortOrder="1" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="position" hidden="0" type="field"/>
-          <column width="-1" name="type" hidden="0" type="field"/>
-          <column width="-1" name="notes" hidden="0" type="field"/>
-          <column width="-1" name="oldpositio" hidden="0" type="field"/>
-          <column width="-1" name="xyposition" hidden="0" type="field"/>
-          <column width="-1" name="csv_name" hidden="0" type="field"/>
-          <column width="-1" name="csv_club" hidden="0" type="field"/>
-          <column width="-1" name="csv_positi" hidden="0" type="field"/>
-          <column width="-1" name="csv_captai" hidden="0" type="field"/>
-          <column width="-1" name="csv_capt_1" hidden="0" type="field"/>
-          <column width="-1" name="csv_first_" hidden="0" type="field"/>
-          <column width="-1" name="csv_last_r" hidden="0" type="field"/>
-          <column width="-1" name="csv_instru" hidden="0" type="field"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="position" type="field" width="-1"/>
+          <column hidden="0" name="type" type="field" width="-1"/>
+          <column hidden="0" name="notes" type="field" width="-1"/>
+          <column hidden="0" name="oldpositio" type="field" width="-1"/>
+          <column hidden="0" name="xyposition" type="field" width="-1"/>
+          <column hidden="0" name="csv_name" type="field" width="-1"/>
+          <column hidden="0" name="csv_club" type="field" width="-1"/>
+          <column hidden="0" name="csv_positi" type="field" width="-1"/>
+          <column hidden="0" name="csv_captai" type="field" width="-1"/>
+          <column hidden="0" name="csv_capt_1" type="field" width="-1"/>
+          <column hidden="0" name="csv_first_" type="field" width="-1"/>
+          <column hidden="0" name="csv_last_r" type="field" width="-1"/>
+          <column hidden="0" name="csv_instru" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6036,66 +6036,66 @@ 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_Description" editable="0"/>
-        <field name="csv_capt_1" editable="1"/>
-        <field name="csv_captai" editable="1"/>
-        <field name="csv_captain" editable="0"/>
-        <field name="csv_captain_number" editable="0"/>
-        <field name="csv_captain_phone" editable="0"/>
-        <field name="csv_club" editable="0"/>
-        <field name="csv_email" editable="0"/>
-        <field name="csv_first runner" editable="0"/>
-        <field name="csv_first_" editable="1"/>
-        <field name="csv_first_runner" editable="0"/>
-        <field name="csv_instru" editable="1"/>
-        <field name="csv_instructions" editable="0"/>
-        <field name="csv_last runner" editable="0"/>
-        <field name="csv_last_r" editable="1"/>
-        <field name="csv_last_runner" editable="0"/>
-        <field name="csv_name" editable="0"/>
-        <field name="csv_phone" editable="0"/>
-        <field name="csv_positi" editable="1"/>
-        <field name="csv_position" editable="0"/>
-        <field name="csv_races" editable="0"/>
-        <field name="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_Description"/>
+        <field editable="1" name="csv_capt_1"/>
+        <field editable="1" name="csv_captai"/>
+        <field editable="0" name="csv_captain"/>
+        <field editable="0" name="csv_captain_number"/>
+        <field editable="0" name="csv_captain_phone"/>
+        <field editable="0" name="csv_club"/>
+        <field editable="0" name="csv_email"/>
+        <field editable="0" name="csv_first runner"/>
+        <field editable="1" name="csv_first_"/>
+        <field editable="0" name="csv_first_runner"/>
+        <field editable="1" name="csv_instru"/>
+        <field editable="0" name="csv_instructions"/>
+        <field editable="0" name="csv_last runner"/>
+        <field editable="1" name="csv_last_r"/>
+        <field editable="0" name="csv_last_runner"/>
+        <field editable="0" name="csv_name"/>
+        <field editable="0" name="csv_phone"/>
+        <field editable="1" name="csv_positi"/>
+        <field editable="0" name="csv_position"/>
+        <field editable="0" name="csv_races"/>
+        <field editable="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 labelOnTop="0" name="csv_10_distance"/>
-        <field labelOnTop="0" name="csv_21_distance"/>
-        <field labelOnTop="0" name="csv_Description"/>
-        <field labelOnTop="0" name="csv_capt_1"/>
-        <field labelOnTop="0" name="csv_captai"/>
-        <field labelOnTop="0" name="csv_captain"/>
-        <field labelOnTop="0" name="csv_captain_number"/>
-        <field labelOnTop="0" name="csv_captain_phone"/>
-        <field labelOnTop="0" name="csv_club"/>
-        <field labelOnTop="0" name="csv_email"/>
-        <field labelOnTop="0" name="csv_first runner"/>
-        <field labelOnTop="0" name="csv_first_"/>
-        <field labelOnTop="0" name="csv_first_runner"/>
-        <field labelOnTop="0" name="csv_instru"/>
-        <field labelOnTop="0" name="csv_instructions"/>
-        <field labelOnTop="0" name="csv_last runner"/>
-        <field labelOnTop="0" name="csv_last_r"/>
-        <field labelOnTop="0" name="csv_last_runner"/>
-        <field labelOnTop="0" name="csv_name"/>
-        <field labelOnTop="0" name="csv_phone"/>
-        <field labelOnTop="0" name="csv_positi"/>
-        <field labelOnTop="0" name="csv_position"/>
-        <field labelOnTop="0" name="csv_races"/>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="notes"/>
-        <field labelOnTop="0" name="oldpositio"/>
-        <field labelOnTop="0" name="position"/>
-        <field labelOnTop="0" name="type"/>
-        <field labelOnTop="0" name="xyposition"/>
+        <field name="csv_10_distance" labelOnTop="0"/>
+        <field name="csv_21_distance" labelOnTop="0"/>
+        <field name="csv_Description" labelOnTop="0"/>
+        <field name="csv_capt_1" labelOnTop="0"/>
+        <field name="csv_captai" labelOnTop="0"/>
+        <field name="csv_captain" labelOnTop="0"/>
+        <field name="csv_captain_number" labelOnTop="0"/>
+        <field name="csv_captain_phone" labelOnTop="0"/>
+        <field name="csv_club" labelOnTop="0"/>
+        <field name="csv_email" labelOnTop="0"/>
+        <field name="csv_first runner" labelOnTop="0"/>
+        <field name="csv_first_" labelOnTop="0"/>
+        <field name="csv_first_runner" labelOnTop="0"/>
+        <field name="csv_instru" labelOnTop="0"/>
+        <field name="csv_instructions" labelOnTop="0"/>
+        <field name="csv_last runner" labelOnTop="0"/>
+        <field name="csv_last_r" labelOnTop="0"/>
+        <field name="csv_last_runner" labelOnTop="0"/>
+        <field name="csv_name" labelOnTop="0"/>
+        <field name="csv_phone" labelOnTop="0"/>
+        <field name="csv_positi" labelOnTop="0"/>
+        <field name="csv_position" labelOnTop="0"/>
+        <field name="csv_races" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="notes" labelOnTop="0"/>
+        <field name="oldpositio" labelOnTop="0"/>
+        <field name="position" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
+        <field name="xyposition" labelOnTop="0"/>
       </labelOnTop>
       <widgets>
         <widget name="csv_captain_ph">
@@ -6144,7 +6144,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" readOnly="0" maxScale="100000" refreshOnNotifyEnabled="0" refreshOnNotifyMessage="" geometry="No geometry" wkbType="NoGeometry" styleCategories="AllStyleCategories" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" type="vector" minScale="1e+08">
+    <maplayer geometry="No geometry" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" maxScale="100000" refreshOnNotifyEnabled="0" minScale="1e+08" type="vector" readOnly="0" wkbType="NoGeometry" autoRefreshEnabled="0" autoRefreshTime="0">
       <id>marshals_by_position20161003112326575</id>
       <datasource>file:./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes</datasource>
       <keywordList>
@@ -6195,7 +6195,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
+          <spatial minz="0" minx="0" maxz="0" maxy="0" maxx="0" crs="" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -6208,8 +6208,8 @@ def my_form_open(dialog, layer, feature):
       <vectorjoins/>
       <layerDependencies/>
       <dataDependencies>
-        <layer id="marshal_positions20160930121322287"/>
         <layer id="all_routes20170907054841602"/>
+        <layer id="marshal_positions20160930121322287"/>
       </dataDependencies>
       <legend type="default-vector"/>
       <expressionfields/>
@@ -6223,12 +6223,12 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties>
-        <property key="dualview/previewExpressions" value="first_name"/>
-        <property key="embeddedWidgets/count" value="0"/>
+        <property value="first_name" key="dualview/previewExpressions"/>
+        <property value="0" key="embeddedWidgets/count"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -6347,19 +6347,19 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="position" index="0" name=""/>
-        <alias field="firstname" index="1" name=""/>
-        <alias field="surname" 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_phone" index="8" name=""/>
-        <alias field="races" index="9" name=""/>
-        <alias field="first_runner" index="10" name=""/>
-        <alias field="last_runner" index="11" name=""/>
-        <alias field="instructions" index="12" name=""/>
+        <alias index="0" field="position" name=""/>
+        <alias index="1" field="firstname" name=""/>
+        <alias index="2" field="surname" name=""/>
+        <alias index="3" field="name" name=""/>
+        <alias index="4" field="club" name=""/>
+        <alias index="5" field="phone" name=""/>
+        <alias index="6" field="email" name=""/>
+        <alias index="7" field="captain" name=""/>
+        <alias index="8" field="captain_phone" name=""/>
+        <alias index="9" field="races" name=""/>
+        <alias index="10" field="first_runner" name=""/>
+        <alias index="11" field="last_runner" name=""/>
+        <alias index="12" field="instructions" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -6379,55 +6379,55 @@ def my_form_open(dialog, layer, feature):
         <default field="instructions" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="position" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="firstname" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="surname" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="name" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="club" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="phone" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="email" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="captain" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="captain_phone" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="races" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="first_runner" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="last_runner" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="instructions" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint exp_strength="0" field="position" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="firstname" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="surname" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="name" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="club" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="phone" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="email" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="captain" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="captain_phone" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="races" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="first_runner" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="last_runner" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="instructions" constraints="0" notnull_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="position" exp="" desc=""/>
-        <constraint field="firstname" exp="" desc=""/>
-        <constraint field="surname" exp="" desc=""/>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="club" exp="" desc=""/>
-        <constraint field="phone" exp="" desc=""/>
-        <constraint field="email" exp="" desc=""/>
-        <constraint field="captain" exp="" desc=""/>
-        <constraint field="captain_phone" exp="" desc=""/>
-        <constraint field="races" exp="" desc=""/>
-        <constraint field="first_runner" exp="" desc=""/>
-        <constraint field="last_runner" exp="" desc=""/>
-        <constraint field="instructions" exp="" desc=""/>
+        <constraint exp="" field="position" desc=""/>
+        <constraint exp="" field="firstname" desc=""/>
+        <constraint exp="" field="surname" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="club" desc=""/>
+        <constraint exp="" field="phone" desc=""/>
+        <constraint exp="" field="email" desc=""/>
+        <constraint exp="" field="captain" desc=""/>
+        <constraint exp="" field="captain_phone" desc=""/>
+        <constraint exp="" field="races" desc=""/>
+        <constraint exp="" field="first_runner" desc=""/>
+        <constraint exp="" field="last_runner" desc=""/>
+        <constraint exp="" field="instructions" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" name="position" hidden="0" type="field"/>
-          <column width="-1" name="name" hidden="0" type="field"/>
-          <column width="-1" name="club" hidden="0" type="field"/>
-          <column width="-1" name="phone" hidden="0" type="field"/>
-          <column width="-1" name="email" hidden="0" type="field"/>
-          <column width="-1" name="captain" hidden="0" type="field"/>
-          <column width="-1" name="races" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="first_runner" hidden="0" type="field"/>
-          <column width="-1" name="last_runner" hidden="0" type="field"/>
-          <column width="-1" name="instructions" hidden="0" type="field"/>
-          <column width="-1" name="firstname" hidden="0" type="field"/>
-          <column width="-1" name="surname" hidden="0" type="field"/>
-          <column width="-1" name="captain_phone" hidden="0" type="field"/>
+          <column hidden="0" name="position" type="field" width="-1"/>
+          <column hidden="0" name="name" type="field" width="-1"/>
+          <column hidden="0" name="club" type="field" width="-1"/>
+          <column hidden="0" name="phone" type="field" width="-1"/>
+          <column hidden="0" name="email" type="field" width="-1"/>
+          <column hidden="0" name="captain" type="field" width="-1"/>
+          <column hidden="0" name="races" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="first_runner" type="field" width="-1"/>
+          <column hidden="0" name="last_runner" type="field" width="-1"/>
+          <column hidden="0" name="instructions" type="field" width="-1"/>
+          <column hidden="0" name="firstname" type="field" width="-1"/>
+          <column hidden="0" name="surname" type="field" width="-1"/>
+          <column hidden="0" name="captain_phone" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6458,48 +6458,48 @@ 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 labelOnTop="0" name="10_distance"/>
-        <field labelOnTop="0" name="21_distance"/>
-        <field labelOnTop="0" name="5_distance"/>
-        <field labelOnTop="0" name="captain"/>
-        <field labelOnTop="0" name="captain_number"/>
-        <field labelOnTop="0" name="club"/>
-        <field labelOnTop="0" name="email"/>
-        <field labelOnTop="0" name="first_name"/>
-        <field labelOnTop="0" name="first_runner"/>
-        <field labelOnTop="0" name="instructions"/>
-        <field labelOnTop="0" name="last_name"/>
-        <field labelOnTop="0" name="last_runner"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="phone"/>
-        <field labelOnTop="0" name="position"/>
-        <field labelOnTop="0" name="races"/>
-        <field labelOnTop="0" name="tshirt"/>
+        <field name="10_distance" labelOnTop="0"/>
+        <field name="21_distance" labelOnTop="0"/>
+        <field name="5_distance" labelOnTop="0"/>
+        <field name="captain" labelOnTop="0"/>
+        <field name="captain_number" labelOnTop="0"/>
+        <field name="club" labelOnTop="0"/>
+        <field name="email" labelOnTop="0"/>
+        <field name="first_name" labelOnTop="0"/>
+        <field name="first_runner" labelOnTop="0"/>
+        <field name="instructions" labelOnTop="0"/>
+        <field name="last_name" labelOnTop="0"/>
+        <field name="last_runner" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="phone" labelOnTop="0"/>
+        <field name="position" labelOnTop="0"/>
+        <field name="races" labelOnTop="0"/>
+        <field name="tshirt" labelOnTop="0"/>
       </labelOnTop>
       <widgets/>
       <previewExpression>first_name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="100000" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Point" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" wkbType="Point" simplifyDrawingTol="1">
+    <maplayer styleCategories="AllStyleCategories" refreshOnNotifyMessage="" simplifyAlgorithm="0" maxScale="100000" geometry="Point" simplifyMaxScale="1" simplifyLocal="1" labelsEnabled="1" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" type="vector" minScale="1e+08" readOnly="0" autoRefreshTime="0" autoRefreshEnabled="0" simplifyDrawingTol="1" wkbType="Point" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37896929129519208</xmin>
         <ymin>-33.93500027904928373</ymin>
@@ -6556,7 +6556,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
+          <spatial minz="0" minx="0" maxz="0" maxy="0" maxx="0" crs="" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -6583,15 +6583,15 @@ def my_form_open(dialog, layer, feature):
       <renderer-v2 type="nullSymbol"/>
       <labeling type="simple">
         <settings>
-          <text-style previewBkgrdColor="#ffffff" namedStyle="Regular" fontWeight="50" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.75" fontSizeUnit="Point" fieldName="name" fontSize="8.5" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <text-buffer bufferOpacity="0.6" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1.5"/>
-            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="0" shapeRotationType="0" shapeSizeX="0" shapeRadiiX="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+          <text-style fontLetterSpacing="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Regular" textColor="0,0,0,255" multilineHeight="1" fontSize="8.5" fontWeight="50" fieldName="name" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="0.75" useSubstitutions="0" fontUnderline="0">
+            <text-buffer bufferOpacity="0.6" bufferBlendMode="0" bufferSize="1.5" bufferNoFill="0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiY="0" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeDraw="0" shapeOpacity="1" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="0" shapeRadiiX="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
             <substitutions/>
           </text-style>
-          <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
-          <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="6" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="0" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="1" placementFlags="2" offsetType="0" offsetUnits="MapUnit"/>
-          <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="0.2" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="0"/>
+          <text-format multilineAlign="0" autoWrapLength="0" plussign="0" addDirectionSymbol="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+          <placement maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="6" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" geometryGeneratorType="PointGeometry" quadOffset="4" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="0" centroidInside="0" geometryGenerator="" placementFlags="2" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" maxCurvedCharAngleIn="20" priority="1"/>
+          <rendering displayAll="0" upsidedownLabels="0" mergeLines="0" fontLimitPixelSize="0" maxNumLabels="2000" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="1" scaleMax="10000000" minFeatureSize="0" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="0" fontMaxPixelSize="10000" scaleMin="1" obstacleFactor="0.2"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -6623,21 +6623,21 @@ def my_form_open(dialog, layer, feature):
         </settings>
       </labeling>
       <customproperties>
-        <property key="dualview/previewExpressions" value="&quot;name&quot;"/>
-        <property key="embeddedWidgets/count" value="0"/>
+        <property value="&quot;name&quot;" key="dualview/previewExpressions"/>
+        <property value="0" key="embeddedWidgets/count"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory enabled="0" minScaleDenominator="100000" width="15" rotationOffset="270" penColor="#000000" penAlpha="255" height="15" penWidth="0" diagramOrientation="Up" backgroundColor="#ffffff" scaleDependency="Area" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" opacity="1" lineSizeType="MM" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeType="MM" scaleBasedVisibility="0" backgroundAlpha="255" barWidth="5">
           <fontProperties style="" description="Arial,10,-1,5,50,0,0,0,0,0"/>
-          <attribute field="" color="#000000" label=""/>
+          <attribute color="#000000" label="" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" priority="0" dist="0" placement="0" obstacle="0" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" showAll="1" placement="0" linePlacementFlags="2" obstacle="0" dist="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -6646,7 +6646,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -6743,15 +6743,15 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="osm_id" index="1" name=""/>
-        <alias field="name" index="2" name=""/>
-        <alias field="type" index="3" name=""/>
-        <alias field="z_order" index="4" name=""/>
-        <alias field="population" index="5" name=""/>
-        <alias field="label_x" index="6" name=""/>
-        <alias field="label_y" index="7" name=""/>
-        <alias field="label_rota" index="8" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="osm_id" name=""/>
+        <alias index="2" field="name" name=""/>
+        <alias index="3" field="type" name=""/>
+        <alias index="4" field="z_order" name=""/>
+        <alias index="5" field="population" name=""/>
+        <alias index="6" field="label_x" name=""/>
+        <alias index="7" field="label_y" name=""/>
+        <alias index="8" field="label_rota" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -6767,43 +6767,43 @@ def my_form_open(dialog, layer, feature):
         <default field="label_rota" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="osm_id" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="name" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="type" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="z_order" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="population" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="label_x" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="label_y" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="label_rota" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint exp_strength="0" field="id" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="osm_id" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="name" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="z_order" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="population" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="label_x" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="label_y" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="label_rota" constraints="0" notnull_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="osm_id" exp="" desc=""/>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="z_order" exp="" desc=""/>
-        <constraint field="population" exp="" desc=""/>
-        <constraint field="label_x" exp="" desc=""/>
-        <constraint field="label_y" exp="" desc=""/>
-        <constraint field="label_rota" exp="" desc=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="osm_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="type" desc=""/>
+        <constraint exp="" field="z_order" desc=""/>
+        <constraint exp="" field="population" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rota" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="-1" name="osm_id" hidden="0" type="field"/>
-          <column width="-1" name="name" hidden="0" type="field"/>
-          <column width="-1" name="type" hidden="0" type="field"/>
-          <column width="-1" name="z_order" hidden="0" type="field"/>
-          <column width="-1" name="population" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="label_x" hidden="0" type="field"/>
-          <column width="-1" name="label_y" hidden="0" type="field"/>
-          <column width="-1" name="label_rota" hidden="0" type="field"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="0" name="osm_id" type="field" width="-1"/>
+          <column hidden="0" name="name" type="field" width="-1"/>
+          <column hidden="0" name="type" type="field" width="-1"/>
+          <column hidden="0" name="z_order" type="field" width="-1"/>
+          <column hidden="0" name="population" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="label_x" type="field" width="-1"/>
+          <column hidden="0" name="label_y" type="field" width="-1"/>
+          <column hidden="0" name="label_rota" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6834,32 +6834,32 @@ 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 labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="label_rota"/>
-        <field labelOnTop="0" name="label_x"/>
-        <field labelOnTop="0" name="label_y"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="osm_id"/>
-        <field labelOnTop="0" name="population"/>
-        <field labelOnTop="0" name="type"/>
-        <field labelOnTop="0" name="z_order"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="label_rota" labelOnTop="0"/>
+        <field name="label_x" labelOnTop="0"/>
+        <field name="label_y" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="osm_id" labelOnTop="0"/>
+        <field name="population" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
+        <field name="z_order" labelOnTop="0"/>
       </labelOnTop>
       <widgets/>
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="100000" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Line" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" simplifyDrawingTol="1">
+    <maplayer styleCategories="AllStyleCategories" refreshOnNotifyMessage="" simplifyAlgorithm="0" maxScale="100000" geometry="Line" simplifyMaxScale="1" simplifyLocal="1" labelsEnabled="1" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" type="vector" minScale="1e+08" readOnly="0" autoRefreshTime="0" autoRefreshEnabled="0" simplifyDrawingTol="1" wkbType="MultiLineString" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.3437671999999985</xmin>
         <ymin>-34.02801110000000051</ymin>
@@ -6916,7 +6916,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
+          <spatial minz="0" minx="0" maxz="0" maxy="0" maxx="0" crs="" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -6943,15 +6943,15 @@ def my_form_open(dialog, layer, feature):
       <renderer-v2 type="nullSymbol"/>
       <labeling type="simple">
         <settings>
-          <text-style previewBkgrdColor="#ffffff" namedStyle="Regular" fontWeight="50" useSubstitutions="0" fontItalic="0" isExpression="1" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.8" fontSizeUnit="Point" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" fontSize="7" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <text-buffer bufferOpacity="0.6" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1"/>
-            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="0" shapeRotationType="0" shapeSizeX="0" shapeRadiiX="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+          <text-style fontLetterSpacing="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Regular" textColor="0,0,0,255" multilineHeight="1" fontSize="7" fontWeight="50" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="0.8" useSubstitutions="0" fontUnderline="0">
+            <text-buffer bufferOpacity="0.6" bufferBlendMode="0" bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiY="0" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeDraw="0" shapeOpacity="1" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="0" shapeRadiiX="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
             <substitutions/>
           </text-style>
-          <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
-          <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="3" geometryGeneratorEnabled="0" repeatDistanceUnits="MapUnit" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="0" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="3" placementFlags="4" offsetType="0" offsetUnits="MapUnit"/>
-          <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="0.3" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="1" minFeatureSize="5" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="1" displayAll="0"/>
+          <text-format multilineAlign="0" autoWrapLength="0" plussign="0" addDirectionSymbol="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+          <placement maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="3" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" geometryGeneratorType="PointGeometry" quadOffset="4" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MapUnit" dist="0" centroidInside="0" geometryGenerator="" placementFlags="4" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" maxCurvedCharAngleIn="20" priority="3"/>
+          <rendering displayAll="0" upsidedownLabels="0" mergeLines="1" fontLimitPixelSize="0" maxNumLabels="2000" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="1" scaleMax="10000000" minFeatureSize="5" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="0" fontMaxPixelSize="10000" scaleMin="1" obstacleFactor="0.3"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -7015,20 +7015,20 @@ def my_form_open(dialog, layer, feature):
           <value>COALESCE( "name", '&lt;NULL>' )</value>
           <value>COALESCE( "name", '&lt;NULL>' )</value>
         </property>
-        <property key="embeddedWidgets/count" value="0"/>
+        <property value="0" key="embeddedWidgets/count"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory enabled="0" minScaleDenominator="100000" width="15" rotationOffset="270" penColor="#000000" penAlpha="255" height="15" penWidth="0" diagramOrientation="Up" backgroundColor="#ffffff" scaleDependency="Area" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" opacity="1" lineSizeType="MM" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeType="MM" scaleBasedVisibility="0" backgroundAlpha="255" barWidth="5">
           <fontProperties style="" description="Arial,10,-1,5,50,0,0,0,0,0"/>
-          <attribute field="" color="#000000" label=""/>
+          <attribute color="#000000" label="" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" priority="0" dist="0" placement="2" obstacle="0" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" showAll="1" placement="2" linePlacementFlags="2" obstacle="0" dist="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -7037,7 +7037,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -7165,22 +7165,22 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="osm_id" index="0" name=""/>
-        <alias field="name" index="1" name=""/>
-        <alias field="highway" index="2" name=""/>
-        <alias field="waterway" index="3" name=""/>
-        <alias field="aerialway" index="4" name=""/>
-        <alias field="barrier" index="5" name=""/>
-        <alias field="man_made" index="6" name=""/>
-        <alias field="z_order" index="7" name=""/>
-        <alias field="other_tags" index="8" name=""/>
-        <alias field="never_show" index="9" name=""/>
-        <alias field="label_x" index="10" name=""/>
-        <alias field="label_y" index="11" name=""/>
-        <alias field="label_rota" index="12" name=""/>
-        <alias field="always_sho" index="13" name=""/>
-        <alias field="resident_a" index="14" name=""/>
-        <alias field="auxiliary_storage_labeling_show" index="15" name=""/>
+        <alias index="0" field="osm_id" name=""/>
+        <alias index="1" field="name" name=""/>
+        <alias index="2" field="highway" name=""/>
+        <alias index="3" field="waterway" name=""/>
+        <alias index="4" field="aerialway" name=""/>
+        <alias index="5" field="barrier" name=""/>
+        <alias index="6" field="man_made" name=""/>
+        <alias index="7" field="z_order" name=""/>
+        <alias index="8" field="other_tags" name=""/>
+        <alias index="9" field="never_show" name=""/>
+        <alias index="10" field="label_x" name=""/>
+        <alias index="11" field="label_y" name=""/>
+        <alias index="12" field="label_rota" name=""/>
+        <alias index="13" field="always_sho" name=""/>
+        <alias index="14" field="resident_a" name=""/>
+        <alias index="15" field="auxiliary_storage_labeling_show" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -7203,64 +7203,64 @@ def my_form_open(dialog, layer, feature):
         <default field="auxiliary_storage_labeling_show" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="osm_id" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="name" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="highway" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="waterway" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="aerialway" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="barrier" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="man_made" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="z_order" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="other_tags" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="never_show" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="label_x" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="label_y" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="label_rota" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="always_sho" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="resident_a" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="auxiliary_storage_labeling_show" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint exp_strength="0" field="osm_id" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="name" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="highway" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="waterway" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="aerialway" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="barrier" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="man_made" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="z_order" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="other_tags" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="never_show" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="label_x" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="label_y" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="label_rota" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="always_sho" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="resident_a" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="auxiliary_storage_labeling_show" constraints="0" notnull_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="osm_id" exp="" desc=""/>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="highway" exp="" desc=""/>
-        <constraint field="waterway" exp="" desc=""/>
-        <constraint field="aerialway" exp="" desc=""/>
-        <constraint field="barrier" exp="" desc=""/>
-        <constraint field="man_made" exp="" desc=""/>
-        <constraint field="z_order" exp="" desc=""/>
-        <constraint field="other_tags" exp="" desc=""/>
-        <constraint field="never_show" exp="" desc=""/>
-        <constraint field="label_x" exp="" desc=""/>
-        <constraint field="label_y" exp="" desc=""/>
-        <constraint field="label_rota" exp="" desc=""/>
-        <constraint field="always_sho" exp="" desc=""/>
-        <constraint field="resident_a" exp="" desc=""/>
-        <constraint field="auxiliary_storage_labeling_show" exp="" desc=""/>
+        <constraint exp="" field="osm_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="highway" desc=""/>
+        <constraint exp="" field="waterway" desc=""/>
+        <constraint exp="" field="aerialway" desc=""/>
+        <constraint exp="" field="barrier" desc=""/>
+        <constraint exp="" field="man_made" desc=""/>
+        <constraint exp="" field="z_order" desc=""/>
+        <constraint exp="" field="other_tags" desc=""/>
+        <constraint exp="" field="never_show" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rota" desc=""/>
+        <constraint exp="" field="always_sho" desc=""/>
+        <constraint exp="" field="resident_a" desc=""/>
+        <constraint exp="" field="auxiliary_storage_labeling_show" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="1" sortExpression="&quot;resident_a&quot;">
+      <attributetableconfig sortExpression="&quot;resident_a&quot;" sortOrder="1" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" name="osm_id" hidden="0" type="field"/>
-          <column width="-1" name="name" hidden="0" type="field"/>
-          <column width="-1" name="z_order" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="highway" hidden="0" type="field"/>
-          <column width="-1" name="waterway" hidden="0" type="field"/>
-          <column width="-1" name="aerialway" hidden="0" type="field"/>
-          <column width="-1" name="barrier" hidden="0" type="field"/>
-          <column width="-1" name="man_made" hidden="0" type="field"/>
-          <column width="-1" name="other_tags" hidden="0" type="field"/>
-          <column width="-1" name="never_show" hidden="0" type="field"/>
-          <column width="-1" name="label_x" hidden="0" type="field"/>
-          <column width="-1" name="label_y" hidden="0" type="field"/>
-          <column width="-1" name="label_rota" hidden="0" type="field"/>
-          <column width="-1" name="always_sho" hidden="0" type="field"/>
-          <column width="-1" name="resident_a" hidden="0" type="field"/>
-          <column width="-1" name="auxiliary_storage_labeling_show" hidden="0" type="field"/>
+          <column hidden="0" name="osm_id" type="field" width="-1"/>
+          <column hidden="0" name="name" type="field" width="-1"/>
+          <column hidden="0" name="z_order" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="highway" type="field" width="-1"/>
+          <column hidden="0" name="waterway" type="field" width="-1"/>
+          <column hidden="0" name="aerialway" type="field" width="-1"/>
+          <column hidden="0" name="barrier" type="field" width="-1"/>
+          <column hidden="0" name="man_made" type="field" width="-1"/>
+          <column hidden="0" name="other_tags" type="field" width="-1"/>
+          <column hidden="0" name="never_show" type="field" width="-1"/>
+          <column hidden="0" name="label_x" type="field" width="-1"/>
+          <column hidden="0" name="label_y" type="field" width="-1"/>
+          <column hidden="0" name="label_rota" type="field" width="-1"/>
+          <column hidden="0" name="always_sho" type="field" width="-1"/>
+          <column hidden="0" name="resident_a" type="field" width="-1"/>
+          <column hidden="0" name="auxiliary_storage_labeling_show" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7291,76 +7291,76 @@ 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="auxiliary_storage_labeling_show" editable="0"/>
-        <field name="barrier" editable="1"/>
-        <field name="highway" editable="1"/>
-        <field name="label_rota" editable="1"/>
-        <field name="label_x" editable="1"/>
-        <field name="label_y" editable="1"/>
-        <field name="man_made" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="never_show" editable="1"/>
-        <field name="orig_access" editable="0"/>
-        <field name="orig_always_sho" editable="0"/>
-        <field name="orig_bridge" editable="0"/>
-        <field name="orig_c_z_order" editable="0"/>
-        <field name="orig_class" editable="0"/>
-        <field name="orig_id" editable="0"/>
-        <field name="orig_label_rota" editable="0"/>
-        <field name="orig_label_x" editable="0"/>
-        <field name="orig_label_y" editable="0"/>
-        <field name="orig_name" editable="0"/>
-        <field name="orig_oneway" editable="0"/>
-        <field name="orig_ref" editable="0"/>
-        <field name="orig_service" editable="0"/>
-        <field name="orig_show" editable="0"/>
-        <field name="orig_tunnel" editable="0"/>
-        <field name="orig_type" editable="0"/>
-        <field name="orig_z_order" editable="0"/>
-        <field name="osm_id" editable="1"/>
-        <field name="other_tags" editable="1"/>
-        <field name="resident_a" editable="1"/>
-        <field name="resident_access" editable="1"/>
-        <field name="waterway" editable="1"/>
-        <field name="z_order" editable="1"/>
+        <field editable="1" name="aerialway"/>
+        <field editable="1" name="always_sho"/>
+        <field editable="0" name="auxiliary_storage_labeling_show"/>
+        <field editable="1" name="barrier"/>
+        <field editable="1" name="highway"/>
+        <field editable="1" name="label_rota"/>
+        <field editable="1" name="label_x"/>
+        <field editable="1" name="label_y"/>
+        <field editable="1" name="man_made"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="never_show"/>
+        <field editable="0" name="orig_access"/>
+        <field editable="0" name="orig_always_sho"/>
+        <field editable="0" name="orig_bridge"/>
+        <field editable="0" name="orig_c_z_order"/>
+        <field editable="0" name="orig_class"/>
+        <field editable="0" name="orig_id"/>
+        <field editable="0" name="orig_label_rota"/>
+        <field editable="0" name="orig_label_x"/>
+        <field editable="0" name="orig_label_y"/>
+        <field editable="0" name="orig_name"/>
+        <field editable="0" name="orig_oneway"/>
+        <field editable="0" name="orig_ref"/>
+        <field editable="0" name="orig_service"/>
+        <field editable="0" name="orig_show"/>
+        <field editable="0" name="orig_tunnel"/>
+        <field editable="0" name="orig_type"/>
+        <field editable="0" name="orig_z_order"/>
+        <field editable="1" name="osm_id"/>
+        <field editable="1" name="other_tags"/>
+        <field editable="1" name="resident_a"/>
+        <field editable="1" name="resident_access"/>
+        <field editable="1" name="waterway"/>
+        <field editable="1" name="z_order"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="aerialway"/>
-        <field labelOnTop="0" name="always_sho"/>
-        <field labelOnTop="0" name="auxiliary_storage_labeling_show"/>
-        <field labelOnTop="0" name="barrier"/>
-        <field labelOnTop="0" name="highway"/>
-        <field labelOnTop="0" name="label_rota"/>
-        <field labelOnTop="0" name="label_x"/>
-        <field labelOnTop="0" name="label_y"/>
-        <field labelOnTop="0" name="man_made"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="never_show"/>
-        <field labelOnTop="0" name="orig_access"/>
-        <field labelOnTop="0" name="orig_always_sho"/>
-        <field labelOnTop="0" name="orig_bridge"/>
-        <field labelOnTop="0" name="orig_c_z_order"/>
-        <field labelOnTop="0" name="orig_class"/>
-        <field labelOnTop="0" name="orig_id"/>
-        <field labelOnTop="0" name="orig_label_rota"/>
-        <field labelOnTop="0" name="orig_label_x"/>
-        <field labelOnTop="0" name="orig_label_y"/>
-        <field labelOnTop="0" name="orig_name"/>
-        <field labelOnTop="0" name="orig_oneway"/>
-        <field labelOnTop="0" name="orig_ref"/>
-        <field labelOnTop="0" name="orig_service"/>
-        <field labelOnTop="0" name="orig_show"/>
-        <field labelOnTop="0" name="orig_tunnel"/>
-        <field labelOnTop="0" name="orig_type"/>
-        <field labelOnTop="0" name="orig_z_order"/>
-        <field labelOnTop="0" name="osm_id"/>
-        <field labelOnTop="0" name="other_tags"/>
-        <field labelOnTop="0" name="resident_a"/>
-        <field labelOnTop="0" name="resident_access"/>
-        <field labelOnTop="0" name="waterway"/>
-        <field labelOnTop="0" name="z_order"/>
+        <field name="aerialway" labelOnTop="0"/>
+        <field name="always_sho" labelOnTop="0"/>
+        <field name="auxiliary_storage_labeling_show" labelOnTop="0"/>
+        <field name="barrier" labelOnTop="0"/>
+        <field name="highway" labelOnTop="0"/>
+        <field name="label_rota" labelOnTop="0"/>
+        <field name="label_x" labelOnTop="0"/>
+        <field name="label_y" labelOnTop="0"/>
+        <field name="man_made" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="never_show" labelOnTop="0"/>
+        <field name="orig_access" labelOnTop="0"/>
+        <field name="orig_always_sho" labelOnTop="0"/>
+        <field name="orig_bridge" labelOnTop="0"/>
+        <field name="orig_c_z_order" labelOnTop="0"/>
+        <field name="orig_class" labelOnTop="0"/>
+        <field name="orig_id" labelOnTop="0"/>
+        <field name="orig_label_rota" labelOnTop="0"/>
+        <field name="orig_label_x" labelOnTop="0"/>
+        <field name="orig_label_y" labelOnTop="0"/>
+        <field name="orig_name" labelOnTop="0"/>
+        <field name="orig_oneway" labelOnTop="0"/>
+        <field name="orig_ref" labelOnTop="0"/>
+        <field name="orig_service" labelOnTop="0"/>
+        <field name="orig_show" labelOnTop="0"/>
+        <field name="orig_tunnel" labelOnTop="0"/>
+        <field name="orig_type" labelOnTop="0"/>
+        <field name="orig_z_order" labelOnTop="0"/>
+        <field name="osm_id" labelOnTop="0"/>
+        <field name="other_tags" labelOnTop="0"/>
+        <field name="resident_a" labelOnTop="0"/>
+        <field name="resident_access" labelOnTop="0"/>
+        <field name="waterway" labelOnTop="0"/>
+        <field name="z_order" labelOnTop="0"/>
       </labelOnTop>
       <widgets>
         <widget name="always_show">
@@ -7409,7 +7409,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Point" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" wkbType="Point" simplifyDrawingTol="1">
+    <maplayer styleCategories="AllStyleCategories" refreshOnNotifyMessage="" simplifyAlgorithm="0" maxScale="0" geometry="Point" simplifyMaxScale="1" simplifyLocal="1" labelsEnabled="1" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" type="vector" minScale="1e+08" readOnly="0" autoRefreshTime="0" autoRefreshEnabled="0" simplifyDrawingTol="1" wkbType="Point" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.3984390148267174</xmin>
         <ymin>-33.90832575607554134</ymin>
@@ -7466,7 +7466,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
+          <spatial minz="0" minx="0" maxz="0" maxy="0" maxx="0" crs="" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -7490,18 +7490,18 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" type="RuleRenderer" forceraster="0" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" enableorderby="0" forceraster="0" symbollevels="0">
         <rules key="{0927a9cd-bbb2-44ea-811b-fdbcb767a09a}">
-          <rule symbol="0" key="{efda7615-994b-459d-a657-ee8185286b0b}" filter="regexp_match( &quot;type&quot;, '(start|finish)')"/>
-          <rule symbol="1" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}" filter="&quot;type&quot; = 'toilets'"/>
-          <rule symbol="2" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}" filter="&quot;type&quot; = 'togbag'"/>
-          <rule symbol="3" key="{67af661e-65f1-44a7-9993-d5a668077b33}" filter=" &quot;type&quot; = 'closure'"/>
-          <rule symbol="4" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}" filter="&quot;type&quot; = 'myciti'"/>
-          <rule symbol="5" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}" filter="&quot;type&quot; = 'parking'"/>
+          <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" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+          <symbol force_rhr="0" name="0" clip_to_extent="1" type="marker" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
               <prop k="angle" v="0"/>
               <prop k="color" v="0,0,0,255"/>
               <prop k="horizontal_anchor_point" v="1"/>
@@ -7535,8 +7535,8 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-            <layer pass="0" class="SvgMarker" locked="0" enabled="1">
+          <symbol force_rhr="0" name="1" clip_to_extent="1" type="marker" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="SvgMarker">
               <prop k="angle" v="0"/>
               <prop k="color" v="0,32,80,255"/>
               <prop k="fixedAspectRatio" v="0"/>
@@ -7569,8 +7569,8 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-            <layer pass="0" class="SvgMarker" locked="0" enabled="1">
+          <symbol force_rhr="0" name="2" clip_to_extent="1" type="marker" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="SvgMarker">
               <prop k="angle" v="0"/>
               <prop k="color" v="0,0,0,255"/>
               <prop k="fixedAspectRatio" v="0"/>
@@ -7613,8 +7613,8 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-            <layer pass="0" class="SvgMarker" locked="0" enabled="1">
+          <symbol force_rhr="0" name="3" clip_to_extent="1" type="marker" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="SvgMarker">
               <prop k="angle" v="0"/>
               <prop k="color" v="125,139,143,255"/>
               <prop k="fixedAspectRatio" v="0"/>
@@ -7647,8 +7647,8 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="4" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-            <layer pass="0" class="SvgMarker" locked="0" enabled="1">
+          <symbol force_rhr="0" name="4" clip_to_extent="1" type="marker" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="SvgMarker">
               <prop k="angle" v="0"/>
               <prop k="color" v="0,12,254,255"/>
               <prop k="fixedAspectRatio" v="0"/>
@@ -7666,7 +7666,7 @@ def my_form_open(dialog, layer, feature):
               <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="size_unit" v="MM"/>
               <prop k="vertical_anchor_point" v="1"/>
-              <effect type="effectStack" enabled="0">
+              <effect enabled="0" type="effectStack">
                 <effect type="dropShadow">
                   <prop k="blend_mode" v="13"/>
                   <prop k="blur_level" v="2.645"/>
@@ -7753,8 +7753,8 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="5" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-            <layer pass="0" class="SvgMarker" locked="0" enabled="1">
+          <symbol force_rhr="0" name="5" clip_to_extent="1" type="marker" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="SvgMarker">
               <prop k="angle" v="0"/>
               <prop k="color" v="43,153,41,255"/>
               <prop k="fixedAspectRatio" v="0"/>
@@ -7791,15 +7791,15 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings>
-          <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.9" fontSizeUnit="Point" fieldName="name" fontSize="10" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <text-buffer bufferOpacity="0.8" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="2"/>
-            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0" shapeOpacity="0.7" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="2" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="0" shapeRotationType="0" shapeSizeX="1" shapeRadiiX="2" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+          <text-style fontLetterSpacing="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Semibold" textColor="0,0,0,255" multilineHeight="1" fontSize="10" fontWeight="63" fieldName="name" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="0.9" useSubstitutions="0" fontUnderline="0">
+            <text-buffer bufferOpacity="0.8" bufferBlendMode="0" bufferSize="2" bufferNoFill="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiY="2" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeDraw="0" shapeOpacity="0.7" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="1" shapeRadiiX="2" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
             <substitutions/>
           </text-style>
-          <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
-          <placement centroidInside="0" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="0" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" geometryGenerator="" dist="3" yOffset="3" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="2" priority="10" placementFlags="10" offsetType="0" offsetUnits="MM"/>
-          <rendering labelPerPart="0" obstacleType="0" scaleMax="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1.8" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="10" scaleVisibility="0" scaleMin="0" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
+          <text-format multilineAlign="3" autoWrapLength="0" plussign="0" addDirectionSymbol="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+          <placement maxCurvedCharAngleOut="-25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="0" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" yOffset="3" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" geometryGeneratorType="PointGeometry" quadOffset="2" distUnits="MM" offsetUnits="MM" repeatDistanceUnits="MM" dist="3" centroidInside="0" geometryGenerator="" placementFlags="10" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="2" maxCurvedCharAngleIn="25" priority="10"/>
+          <rendering displayAll="1" upsidedownLabels="0" mergeLines="0" fontLimitPixelSize="0" maxNumLabels="2000" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="1" scaleMax="0" minFeatureSize="0" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="10" fontMaxPixelSize="10000" scaleMin="0" obstacleFactor="1.8"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -7826,21 +7826,21 @@ def my_form_open(dialog, layer, feature):
         </settings>
       </labeling>
       <customproperties>
-        <property key="dualview/previewExpressions" value="id"/>
-        <property key="embeddedWidgets/count" value="0"/>
+        <property value="id" key="dualview/previewExpressions"/>
+        <property value="0" key="embeddedWidgets/count"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory enabled="0" minScaleDenominator="0" width="15" rotationOffset="270" penColor="#000000" penAlpha="255" height="15" penWidth="0" diagramOrientation="Up" backgroundColor="#ffffff" scaleDependency="Area" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" opacity="1" lineSizeType="MM" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeType="MM" scaleBasedVisibility="0" backgroundAlpha="255" barWidth="5">
           <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0"/>
-          <attribute field="" color="#000000" label=""/>
+          <attribute color="#000000" label="" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" priority="0" dist="0" placement="0" obstacle="0" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" showAll="1" placement="0" linePlacementFlags="18" obstacle="0" dist="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -7849,7 +7849,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -7884,10 +7884,10 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="name" index="2" name=""/>
-        <alias field="distance" index="3" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
+        <alias index="2" field="name" name=""/>
+        <alias index="3" field="distance" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -7898,28 +7898,28 @@ def my_form_open(dialog, layer, feature):
         <default field="distance" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="type" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="name" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="distance" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint exp_strength="0" field="id" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="name" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="distance" constraints="0" notnull_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="distance" exp="" desc=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="type" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="distance" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;type&quot;">
+      <attributetableconfig sortExpression="&quot;type&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="-1" name="type" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="name" hidden="0" type="field"/>
-          <column width="-1" name="distance" hidden="0" type="field"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="0" name="type" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="name" type="field" width="-1"/>
+          <column hidden="0" name="distance" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7950,22 +7950,22 @@ 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 labelOnTop="0" name="distance"/>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="distance" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <widgets/>
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" simplifyLocal="1" readOnly="0" geometry="Polygon" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" wkbType="MultiPolygon" simplifyDrawingTol="1">
+    <maplayer styleCategories="AllStyleCategories" refreshOnNotifyMessage="" simplifyAlgorithm="0" maxScale="0" geometry="Polygon" simplifyMaxScale="1" simplifyLocal="1" labelsEnabled="0" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" type="vector" minScale="1e+08" readOnly="0" autoRefreshTime="0" autoRefreshEnabled="0" simplifyDrawingTol="1" wkbType="MultiPolygon" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37312291788339991</xmin>
         <ymin>-33.931815589166888</ymin>
@@ -8029,10 +8029,10 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" type="singleSymbol" forceraster="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" enableorderby="0" forceraster="0" symbollevels="0">
         <symbols>
-          <symbol name="0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-            <layer pass="0" class="LinePatternFill" locked="0" enabled="1">
+          <symbol force_rhr="0" name="0" clip_to_extent="1" type="fill" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="LinePatternFill">
               <prop k="angle" v="135"/>
               <prop k="color" v="211,134,33,255"/>
               <prop k="distance" v="2"/>
@@ -8053,8 +8053,8 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@0@0" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-                <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <symbol force_rhr="0" name="@0@0" clip_to_extent="1" type="line" alpha="1">
+                <layer pass="0" locked="0" enabled="1" class="SimpleLine">
                   <prop k="capstyle" v="square"/>
                   <prop k="customdash" v="5;2"/>
                   <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -8081,7 +8081,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleFill">
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="211,134,33,255"/>
               <prop k="joinstyle" v="bevel"/>
@@ -8107,21 +8107,21 @@ def my_form_open(dialog, layer, feature):
         <sizescale/>
       </renderer-v2>
       <customproperties>
-        <property key="dualview/previewExpressions" value="id"/>
-        <property key="embeddedWidgets/count" value="0"/>
+        <property value="id" key="dualview/previewExpressions"/>
+        <property value="0" key="embeddedWidgets/count"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory enabled="0" minScaleDenominator="0" width="15" rotationOffset="270" penColor="#000000" penAlpha="255" height="15" penWidth="0" diagramOrientation="Up" backgroundColor="#ffffff" scaleDependency="Area" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" opacity="1" lineSizeType="MM" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeType="MM" scaleBasedVisibility="0" backgroundAlpha="255" barWidth="5">
           <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0"/>
-          <attribute field="" color="#000000" label=""/>
+          <attribute color="#000000" label="" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" priority="0" dist="0" placement="1" obstacle="0" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" showAll="1" placement="1" linePlacementFlags="18" obstacle="0" dist="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -8130,7 +8130,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -8144,7 +8144,7 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="FID" index="0" name=""/>
+        <alias index="0" field="FID" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -8152,20 +8152,20 @@ def my_form_open(dialog, layer, feature):
         <default field="FID" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="FID" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint exp_strength="0" field="FID" constraints="0" notnull_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="FID" exp="" desc=""/>
+        <constraint exp="" field="FID" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="431" name="type" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="0" name="type" type="field" width="431"/>
+          <column hidden="1" type="actions" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8196,18 +8196,18 @@ 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 labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <widgets/>
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Line" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" wkbType="MultiLineString" simplifyDrawingTol="1">
+    <maplayer styleCategories="AllStyleCategories" refreshOnNotifyMessage="" simplifyAlgorithm="0" maxScale="0" geometry="Line" simplifyMaxScale="1" simplifyLocal="1" labelsEnabled="1" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" type="vector" minScale="1e+08" readOnly="0" autoRefreshTime="0" autoRefreshEnabled="0" simplifyDrawingTol="1" wkbType="MultiLineString" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.3752895999999879</xmin>
         <ymin>-33.94589500000000726</ymin>
@@ -8264,7 +8264,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
+          <spatial minz="0" minx="0" maxz="0" maxy="0" maxx="0" crs="" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -8288,17 +8288,17 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" type="RuleRenderer" forceraster="0" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" enableorderby="0" forceraster="0" symbollevels="0">
         <rules key="{57366f52-c504-4c9a-800f-dcbf1d415bf6}">
-          <rule symbol="0" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" label="Road Open" filter="&quot;status&quot; = 'open'"/>
-          <rule symbol="1" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" label="No Parking" filter="&quot;status&quot; = 'no-parking'"/>
-          <rule symbol="2" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" label="Lane Closed" filter="&quot;status&quot; = 'lane-closed'"/>
-          <rule symbol="3" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" label="One-Way" filter="&quot;status&quot; = 'one-way'"/>
-          <rule symbol="4" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" label="Road Closures" filter="&quot;status&quot; = 'closure'"/>
+          <rule symbol="0" filter="&quot;status&quot; = 'open'" label="Road Open" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}"/>
+          <rule symbol="1" filter="&quot;status&quot; = 'no-parking'" label="No Parking" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}"/>
+          <rule symbol="2" filter="&quot;status&quot; = 'lane-closed'" label="Lane Closed" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}"/>
+          <rule symbol="3" filter="&quot;status&quot; = 'one-way'" label="One-Way" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}"/>
+          <rule symbol="4" filter="&quot;status&quot; = 'closure'" label="Road Closures" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}"/>
         </rules>
         <symbols>
-          <symbol name="0" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+          <symbol force_rhr="0" name="0" clip_to_extent="1" type="line" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleLine">
               <prop k="capstyle" v="square"/>
               <prop k="customdash" v="5;2"/>
               <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -8335,8 +8335,8 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+          <symbol force_rhr="0" name="1" clip_to_extent="1" type="line" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="MarkerLine">
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="average_angle_unit" v="MM"/>
@@ -8359,8 +8359,8 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@1@0" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <symbol force_rhr="0" name="@1@0" clip_to_extent="1" type="marker" alpha="1">
+                <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
                   <prop k="angle" v="0"/>
                   <prop k="color" v="255,255,255,255"/>
                   <prop k="horizontal_anchor_point" v="1"/>
@@ -8390,8 +8390,8 @@ def my_form_open(dialog, layer, feature):
               </symbol>
             </layer>
           </symbol>
-          <symbol name="2" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+          <symbol force_rhr="0" name="2" clip_to_extent="1" type="line" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleLine">
               <prop k="capstyle" v="square"/>
               <prop k="customdash" v="2;1;1;1"/>
               <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -8427,7 +8427,7 @@ def my_form_open(dialog, layer, feature):
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer pass="0" locked="0" enabled="1" class="MarkerLine">
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="average_angle_unit" v="MM"/>
@@ -8456,8 +8456,8 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@1" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <symbol force_rhr="0" name="@2@1" clip_to_extent="1" type="marker" alpha="1">
+                <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
                   <prop k="angle" v="0"/>
                   <prop k="color" v="0,255,0,255"/>
                   <prop k="horizontal_anchor_point" v="1"/>
@@ -8493,8 +8493,8 @@ def my_form_open(dialog, layer, feature):
               </symbol>
             </layer>
           </symbol>
-          <symbol name="3" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+          <symbol force_rhr="0" name="3" clip_to_extent="1" type="line" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleLine">
               <prop k="capstyle" v="square"/>
               <prop k="customdash" v="3;2"/>
               <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -8530,7 +8530,7 @@ def my_form_open(dialog, layer, feature):
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer pass="0" locked="0" enabled="1" class="MarkerLine">
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="average_angle_unit" v="MM"/>
@@ -8559,8 +8559,8 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@3@1" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <symbol force_rhr="0" name="@3@1" clip_to_extent="1" type="marker" alpha="1">
+                <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
                   <prop k="angle" v="0"/>
                   <prop k="color" v="0,255,0,255"/>
                   <prop k="horizontal_anchor_point" v="1"/>
@@ -8596,8 +8596,8 @@ def my_form_open(dialog, layer, feature):
               </symbol>
             </layer>
           </symbol>
-          <symbol name="4" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+          <symbol force_rhr="0" name="4" clip_to_extent="1" type="line" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleLine">
               <prop k="capstyle" v="square"/>
               <prop k="customdash" v="5;2"/>
               <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -8638,15 +8638,15 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings>
-          <text-style previewBkgrdColor="#ffffff" namedStyle="Regular" fontWeight="50" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="1" fontSizeUnit="Point" fieldName="times" fontSize="9" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <text-buffer bufferOpacity="1" bufferNoFill="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1"/>
-            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="0" shapeRotationType="0" shapeSizeX="0" shapeRadiiX="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+          <text-style fontLetterSpacing="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Regular" textColor="0,0,0,255" multilineHeight="1" fontSize="9" fontWeight="50" fieldName="times" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="1" useSubstitutions="0" fontUnderline="0">
+            <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiY="0" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeDraw="0" shapeOpacity="1" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="0" shapeRadiiX="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
             <substitutions/>
           </text-style>
-          <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="4294967295" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
-          <placement centroidInside="0" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="2" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" geometryGenerator="" dist="0" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="5" placementFlags="10" offsetType="0" offsetUnits="MM"/>
-          <rendering labelPerPart="0" obstacleType="0" scaleMax="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="0" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="0"/>
+          <text-format multilineAlign="4294967295" autoWrapLength="0" plussign="0" addDirectionSymbol="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+          <placement maxCurvedCharAngleOut="-25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="2" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" geometryGeneratorType="PointGeometry" quadOffset="4" distUnits="MM" offsetUnits="MM" repeatDistanceUnits="MM" dist="0" centroidInside="0" geometryGenerator="" placementFlags="10" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" maxCurvedCharAngleIn="25" priority="5"/>
+          <rendering displayAll="0" upsidedownLabels="0" mergeLines="0" fontLimitPixelSize="0" maxNumLabels="2000" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="1" scaleMax="0" minFeatureSize="0" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="0" fontMaxPixelSize="10000" scaleMin="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -8657,21 +8657,21 @@ def my_form_open(dialog, layer, feature):
         </settings>
       </labeling>
       <customproperties>
-        <property key="dualview/previewExpressions" value="id"/>
-        <property key="embeddedWidgets/count" value="0"/>
+        <property value="id" key="dualview/previewExpressions"/>
+        <property value="0" key="embeddedWidgets/count"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory enabled="0" minScaleDenominator="0" width="15" rotationOffset="270" penColor="#000000" penAlpha="255" height="15" penWidth="0" diagramOrientation="Up" backgroundColor="#ffffff" scaleDependency="Area" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" opacity="1" lineSizeType="MM" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeType="MM" scaleBasedVisibility="0" backgroundAlpha="255" barWidth="5">
           <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0"/>
-          <attribute field="" color="#000000" label=""/>
+          <attribute color="#000000" label="" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" priority="0" dist="0" placement="2" obstacle="0" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" showAll="1" placement="2" linePlacementFlags="18" obstacle="0" dist="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -8680,7 +8680,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -8715,10 +8715,10 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="status" index="2" name=""/>
-        <alias field="times" index="3" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
+        <alias index="2" field="status" name=""/>
+        <alias index="3" field="times" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -8729,28 +8729,28 @@ def my_form_open(dialog, layer, feature):
         <default field="times" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="type" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="status" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="times" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint exp_strength="0" field="id" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="status" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="times" constraints="0" notnull_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="status" exp="" desc=""/>
-        <constraint field="times" exp="" desc=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="type" desc=""/>
+        <constraint exp="" field="status" desc=""/>
+        <constraint exp="" field="times" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;id&quot;">
+      <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="202" name="type" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="status" hidden="0" type="field"/>
-          <column width="-1" name="times" hidden="0" type="field"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="0" name="type" type="field" width="202"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="status" type="field" width="-1"/>
+          <column hidden="0" name="times" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8781,22 +8781,22 @@ 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 labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="status"/>
-        <field labelOnTop="0" name="times"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="status" labelOnTop="0"/>
+        <field name="times" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <widgets/>
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="100000" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Point" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" wkbType="Point" simplifyDrawingTol="1">
+    <maplayer styleCategories="AllStyleCategories" refreshOnNotifyMessage="" simplifyAlgorithm="0" maxScale="100000" geometry="Point" simplifyMaxScale="1" simplifyLocal="1" labelsEnabled="1" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" type="vector" minScale="1e+08" readOnly="0" autoRefreshTime="0" autoRefreshEnabled="0" simplifyDrawingTol="1" wkbType="Point" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37564632736778236</xmin>
         <ymin>-33.94557692503335744</ymin>
@@ -8828,6 +8828,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -8843,7 +8852,15 @@ def my_form_open(dialog, layer, feature):
             <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial minz="0" minx="0" maxz="0" maxy="0" maxx="0" crs="" dimensions="2" miny="0"/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="UTF-8">memory</provider>
       <vectorjoins/>
@@ -8853,6 +8870,433 @@ def my_form_open(dialog, layer, feature):
       <expressionfields/>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
+        <map-layer-style name="timelapse">
+          <qgis hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" simplifyDrawingTol="1" simplifyDrawingHints="0" simplifyLocal="1" styleCategories="AllStyleCategories" maxScale="100000" minScale="1e+08" readOnly="0" version="3.8.3-Zanzibar" labelsEnabled="1" simplifyMaxScale="1">
+            <flags>
+              <Identifiable>1</Identifiable>
+              <Removable>1</Removable>
+              <Searchable>1</Searchable>
+            </flags>
+            <renderer-v2 type="nullSymbol"/>
+            <labeling type="rule-based">
+              <rules key="{2cf820d0-73b9-4746-94f0-ade0b2da8c4e}">
+                <rule filter="&quot;Source&quot; = '21KM'" key="{84988b39-de25-471d-aa1f-8d688cc3c1cd}" description="21KM">
+                  <settings>
+                    <text-style fontLetterSpacing="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Semibold" textColor="255,255,255,255" multilineHeight="1" fontSize="7" fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="1" useSubstitutions="0" fontUnderline="0">
+                      <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                      <background shapeFillColor="210,32,39,255" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="210,32,39,255" shapeSizeUnit="MM" shapeRadiiY="0.1" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="128" shapeBorderWidthUnit="MM" shapeDraw="1" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeSizeX="0.5" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="0" shapeRadiiX="1" shapeBorderWidth="1" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                      <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+                      <substitutions/>
+                    </text-style>
+                    <text-format multilineAlign="3" autoWrapLength="0" plussign="0" addDirectionSymbol="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+                    <placement maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="6" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorType="PointGeometry" repeatDistance="0" quadOffset="3" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="2" centroidInside="0" geometryGenerator="" placementFlags="10" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" maxCurvedCharAngleIn="20" priority="10"/>
+                    <rendering displayAll="1" upsidedownLabels="0" mergeLines="0" fontLimitPixelSize="0" maxNumLabels="2000" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="1" scaleMax="10000000" minFeatureSize="0" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="0" fontMaxPixelSize="10000" scaleMin="1" obstacleFactor="2"/>
+                    <dd_properties>
+                      <Option type="Map">
+                        <Option value="" name="name" type="QString"/>
+                        <Option name="properties" type="Map">
+                          <Option name="PositionX" type="Map">
+                            <Option value="false" name="active" type="bool"/>
+                            <Option value="1" name="type" type="int"/>
+                            <Option value="" name="val" type="QString"/>
+                          </Option>
+                          <Option name="PositionY" type="Map">
+                            <Option value="false" name="active" type="bool"/>
+                            <Option value="1" name="type" type="int"/>
+                            <Option value="" name="val" type="QString"/>
+                          </Option>
+                          <Option name="PredefinedPositionOrder" type="Map">
+                            <Option value="false" name="active" type="bool"/>
+                            <Option value="1" name="type" type="int"/>
+                            <Option value="" name="val" type="QString"/>
+                          </Option>
+                          <Option name="Rotation" type="Map">
+                            <Option value="false" name="active" type="bool"/>
+                            <Option value="rotation" name="field" type="QString"/>
+                            <Option value="2" name="type" type="int"/>
+                          </Option>
+                        </Option>
+                        <Option value="collection" name="type" type="QString"/>
+                      </Option>
+                    </dd_properties>
+                  </settings>
+                </rule>
+                <rule filter="&quot;Source&quot; = '10KM'" key="{2699b0bb-7177-40de-af85-7bce9fd38af9}" description="10KM">
+                  <settings>
+                    <text-style fontLetterSpacing="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Semibold" textColor="255,255,255,255" multilineHeight="1" fontSize="7" fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="1" useSubstitutions="0" fontUnderline="0">
+                      <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                      <background shapeFillColor="103,34,144,255" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="103,34,144,255" shapeSizeUnit="MM" shapeRadiiY="0.1" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="128" shapeBorderWidthUnit="MM" shapeDraw="1" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeSizeX="0.5" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="0" shapeRadiiX="1" shapeBorderWidth="1" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                      <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+                      <substitutions/>
+                    </text-style>
+                    <text-format multilineAlign="3" autoWrapLength="0" plussign="0" addDirectionSymbol="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+                    <placement maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="6" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorType="PointGeometry" repeatDistance="0" quadOffset="4" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="2" centroidInside="0" geometryGenerator="" placementFlags="10" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" maxCurvedCharAngleIn="20" priority="10"/>
+                    <rendering displayAll="1" upsidedownLabels="0" mergeLines="0" fontLimitPixelSize="0" maxNumLabels="2000" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="1" scaleMax="10000000" minFeatureSize="0" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="0" fontMaxPixelSize="10000" scaleMin="1" obstacleFactor="2"/>
+                    <dd_properties>
+                      <Option type="Map">
+                        <Option value="" name="name" type="QString"/>
+                        <Option name="properties" type="Map">
+                          <Option name="PositionX" type="Map">
+                            <Option value="false" name="active" type="bool"/>
+                            <Option value="1" name="type" type="int"/>
+                            <Option value="" name="val" type="QString"/>
+                          </Option>
+                          <Option name="PositionY" type="Map">
+                            <Option value="false" name="active" type="bool"/>
+                            <Option value="1" name="type" type="int"/>
+                            <Option value="" name="val" type="QString"/>
+                          </Option>
+                          <Option name="PredefinedPositionOrder" type="Map">
+                            <Option value="true" name="active" type="bool"/>
+                            <Option value="quadrant" name="field" type="QString"/>
+                            <Option value="2" name="type" type="int"/>
+                          </Option>
+                          <Option name="Rotation" type="Map">
+                            <Option value="false" name="active" type="bool"/>
+                            <Option value="rotation" name="field" type="QString"/>
+                            <Option value="2" name="type" type="int"/>
+                          </Option>
+                        </Option>
+                        <Option value="collection" name="type" type="QString"/>
+                      </Option>
+                    </dd_properties>
+                  </settings>
+                </rule>
+                <rule filter="&quot;Source&quot; = '5KM'" key="{63d03041-a1e4-4dad-ab41-9339e48044c5}" description="5KM">
+                  <settings>
+                    <text-style fontLetterSpacing="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Semibold" textColor="255,255,255,255" multilineHeight="1" fontSize="7" fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="1" useSubstitutions="0" fontUnderline="0">
+                      <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                      <background shapeFillColor="145,211,55,255" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeSizeUnit="MM" shapeRadiiY="0.1" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="128" shapeBorderWidthUnit="MM" shapeDraw="1" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeSizeX="0.5" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="0" shapeRadiiX="1" shapeBorderWidth="1" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                      <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+                      <substitutions/>
+                    </text-style>
+                    <text-format multilineAlign="3" autoWrapLength="0" plussign="0" addDirectionSymbol="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+                    <placement maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="6" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorType="PointGeometry" repeatDistance="0" quadOffset="4" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="2" centroidInside="0" geometryGenerator="" placementFlags="10" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" maxCurvedCharAngleIn="20" priority="10"/>
+                    <rendering displayAll="1" upsidedownLabels="0" mergeLines="0" fontLimitPixelSize="0" maxNumLabels="2000" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="1" scaleMax="10000000" minFeatureSize="0" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="0" fontMaxPixelSize="10000" scaleMin="1" obstacleFactor="2"/>
+                    <dd_properties>
+                      <Option type="Map">
+                        <Option value="" name="name" type="QString"/>
+                        <Option name="properties" type="Map">
+                          <Option name="PositionX" type="Map">
+                            <Option value="false" name="active" type="bool"/>
+                            <Option value="1" name="type" type="int"/>
+                            <Option value="" name="val" type="QString"/>
+                          </Option>
+                          <Option name="PositionY" type="Map">
+                            <Option value="false" name="active" type="bool"/>
+                            <Option value="1" name="type" type="int"/>
+                            <Option value="" name="val" type="QString"/>
+                          </Option>
+                          <Option name="PredefinedPositionOrder" type="Map">
+                            <Option value="true" name="active" type="bool"/>
+                            <Option value="quadrant" name="field" type="QString"/>
+                            <Option value="2" name="type" type="int"/>
+                          </Option>
+                          <Option name="Rotation" type="Map">
+                            <Option value="false" name="active" type="bool"/>
+                            <Option value="rotation" name="field" type="QString"/>
+                            <Option value="2" name="type" type="int"/>
+                          </Option>
+                        </Option>
+                        <Option value="collection" name="type" type="QString"/>
+                      </Option>
+                    </dd_properties>
+                  </settings>
+                </rule>
+              </rules>
+            </labeling>
+            <customproperties>
+              <property value="COALESCE(&quot;Text&quot;, '&lt;NULL>')" key="dualview/previewExpressions"/>
+              <property value="0" key="embeddedWidgets/count"/>
+              <property key="variableNames"/>
+              <property key="variableValues"/>
+            </customproperties>
+            <blendMode>0</blendMode>
+            <featureBlendMode>0</featureBlendMode>
+            <layerOpacity>1</layerOpacity>
+            <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+              <DiagramCategory enabled="0" minScaleDenominator="100000" width="15" rotationOffset="270" penColor="#000000" penAlpha="255" height="15" penWidth="0" diagramOrientation="Up" backgroundColor="#ffffff" scaleDependency="Area" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" opacity="1" lineSizeType="MM" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeType="MM" scaleBasedVisibility="0" backgroundAlpha="255" barWidth="5">
+                <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+                <attribute color="#000000" label="" field=""/>
+              </DiagramCategory>
+            </SingleCategoryDiagramRenderer>
+            <DiagramLayerSettings priority="0" zIndex="0" showAll="1" placement="0" linePlacementFlags="2" obstacle="0" dist="0">
+              <properties>
+                <Option type="Map">
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties"/>
+                  <Option value="collection" name="type" type="QString"/>
+                </Option>
+              </properties>
+            </DiagramLayerSettings>
+            <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+              <activeChecks/>
+              <checkConfiguration/>
+            </geometryOptions>
+            <fieldConfiguration>
+              <field name="Name">
+                <editWidget type="TextEdit">
+                  <config>
+                    <Option type="Map">
+                      <Option value="0" name="IsMultiline" type="QString"/>
+                      <Option value="0" name="UseHtml" type="QString"/>
+                    </Option>
+                  </config>
+                </editWidget>
+              </field>
+              <field name="descriptio">
+                <editWidget type="TextEdit">
+                  <config>
+                    <Option type="Map">
+                      <Option value="0" name="IsMultiline" type="QString"/>
+                      <Option value="0" name="UseHtml" type="QString"/>
+                    </Option>
+                  </config>
+                </editWidget>
+              </field>
+              <field name="timestamp">
+                <editWidget type="TextEdit">
+                  <config>
+                    <Option type="Map">
+                      <Option value="0" name="IsMultiline" type="QString"/>
+                      <Option value="0" name="UseHtml" type="QString"/>
+                    </Option>
+                  </config>
+                </editWidget>
+              </field>
+              <field name="begin">
+                <editWidget type="TextEdit">
+                  <config>
+                    <Option type="Map">
+                      <Option value="0" name="IsMultiline" type="QString"/>
+                      <Option value="0" name="UseHtml" type="QString"/>
+                    </Option>
+                  </config>
+                </editWidget>
+              </field>
+              <field name="end">
+                <editWidget type="TextEdit">
+                  <config>
+                    <Option type="Map">
+                      <Option value="0" name="IsMultiline" type="QString"/>
+                      <Option value="0" name="UseHtml" type="QString"/>
+                    </Option>
+                  </config>
+                </editWidget>
+              </field>
+              <field name="Distance">
+                <editWidget type="TextEdit">
+                  <config>
+                    <Option type="Map">
+                      <Option value="0" name="IsMultiline" type="QString"/>
+                      <Option value="0" name="UseHtml" type="QString"/>
+                    </Option>
+                  </config>
+                </editWidget>
+              </field>
+              <field name="RouteLen">
+                <editWidget type="TextEdit">
+                  <config>
+                    <Option type="Map">
+                      <Option value="0" name="IsMultiline" type="QString"/>
+                      <Option value="0" name="UseHtml" type="QString"/>
+                    </Option>
+                  </config>
+                </editWidget>
+              </field>
+              <field name="Source">
+                <editWidget type="TextEdit">
+                  <config>
+                    <Option type="Map">
+                      <Option value="0" name="IsMultiline" type="QString"/>
+                      <Option value="0" name="UseHtml" type="QString"/>
+                    </Option>
+                  </config>
+                </editWidget>
+              </field>
+              <field name="length_m">
+                <editWidget type="TextEdit">
+                  <config>
+                    <Option type="Map">
+                      <Option value="0" name="IsMultiline" type="QString"/>
+                      <Option value="0" name="UseHtml" type="QString"/>
+                    </Option>
+                  </config>
+                </editWidget>
+              </field>
+              <field name="length_km">
+                <editWidget type="TextEdit">
+                  <config>
+                    <Option type="Map">
+                      <Option value="0" name="IsMultiline" type="QString"/>
+                      <Option value="0" name="UseHtml" type="QString"/>
+                    </Option>
+                  </config>
+                </editWidget>
+              </field>
+              <field name="org_fid">
+                <editWidget type="TextEdit">
+                  <config>
+                    <Option type="Map">
+                      <Option value="0" name="IsMultiline" type="QString"/>
+                      <Option value="0" name="UseHtml" type="QString"/>
+                    </Option>
+                  </config>
+                </editWidget>
+              </field>
+              <field name="distance">
+                <editWidget type="TextEdit">
+                  <config>
+                    <Option type="Map">
+                      <Option value="0" name="IsMultiline" type="QString"/>
+                      <Option value="0" name="UseHtml" type="QString"/>
+                    </Option>
+                  </config>
+                </editWidget>
+              </field>
+            </fieldConfiguration>
+            <aliases>
+              <alias index="0" field="Name" name=""/>
+              <alias index="1" field="descriptio" name=""/>
+              <alias index="2" field="timestamp" name=""/>
+              <alias index="3" field="begin" name=""/>
+              <alias index="4" field="end" name=""/>
+              <alias index="5" field="Distance" name=""/>
+              <alias index="6" field="RouteLen" name=""/>
+              <alias index="7" field="Source" name=""/>
+              <alias index="8" field="length_m" name=""/>
+              <alias index="9" field="length_km" name=""/>
+              <alias index="10" field="org_fid" name=""/>
+              <alias index="11" field="distance" name=""/>
+            </aliases>
+            <excludeAttributesWMS/>
+            <excludeAttributesWFS/>
+            <defaults>
+              <default field="Name" applyOnUpdate="0" expression=""/>
+              <default field="descriptio" applyOnUpdate="0" expression=""/>
+              <default field="timestamp" applyOnUpdate="0" expression=""/>
+              <default field="begin" applyOnUpdate="0" expression=""/>
+              <default field="end" applyOnUpdate="0" expression=""/>
+              <default field="Distance" applyOnUpdate="0" expression=""/>
+              <default field="RouteLen" applyOnUpdate="0" expression=""/>
+              <default field="Source" applyOnUpdate="0" expression=""/>
+              <default field="length_m" applyOnUpdate="0" expression=""/>
+              <default field="length_km" applyOnUpdate="0" expression=""/>
+              <default field="org_fid" applyOnUpdate="0" expression=""/>
+              <default field="distance" applyOnUpdate="0" expression=""/>
+            </defaults>
+            <constraints>
+              <constraint exp_strength="0" field="Name" constraints="0" notnull_strength="0" unique_strength="0"/>
+              <constraint exp_strength="0" field="descriptio" constraints="0" notnull_strength="0" unique_strength="0"/>
+              <constraint exp_strength="0" field="timestamp" constraints="0" notnull_strength="0" unique_strength="0"/>
+              <constraint exp_strength="0" field="begin" constraints="0" notnull_strength="0" unique_strength="0"/>
+              <constraint exp_strength="0" field="end" constraints="0" notnull_strength="0" unique_strength="0"/>
+              <constraint exp_strength="0" field="Distance" constraints="0" notnull_strength="0" unique_strength="0"/>
+              <constraint exp_strength="0" field="RouteLen" constraints="0" notnull_strength="0" unique_strength="0"/>
+              <constraint exp_strength="0" field="Source" constraints="0" notnull_strength="0" unique_strength="0"/>
+              <constraint exp_strength="0" field="length_m" constraints="0" notnull_strength="0" unique_strength="0"/>
+              <constraint exp_strength="0" field="length_km" constraints="0" notnull_strength="0" unique_strength="0"/>
+              <constraint exp_strength="0" field="org_fid" constraints="0" notnull_strength="0" unique_strength="0"/>
+              <constraint exp_strength="0" field="distance" constraints="0" notnull_strength="0" unique_strength="0"/>
+            </constraints>
+            <constraintExpressions>
+              <constraint exp="" field="Name" desc=""/>
+              <constraint exp="" field="descriptio" desc=""/>
+              <constraint exp="" field="timestamp" desc=""/>
+              <constraint exp="" field="begin" desc=""/>
+              <constraint exp="" field="end" desc=""/>
+              <constraint exp="" field="Distance" desc=""/>
+              <constraint exp="" field="RouteLen" desc=""/>
+              <constraint exp="" field="Source" desc=""/>
+              <constraint exp="" field="length_m" desc=""/>
+              <constraint exp="" field="length_km" desc=""/>
+              <constraint exp="" field="org_fid" desc=""/>
+              <constraint exp="" field="distance" desc=""/>
+            </constraintExpressions>
+            <expressionfields/>
+            <attributeactions>
+              <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+            </attributeactions>
+            <attributetableconfig sortExpression="&quot;distance&quot;" sortOrder="1" actionWidgetStyle="dropDown">
+              <columns>
+                <column hidden="1" type="actions" width="-1"/>
+                <column hidden="0" name="org_fid" type="field" width="-1"/>
+                <column hidden="0" name="distance" type="field" width="-1"/>
+                <column hidden="0" name="Name" type="field" width="-1"/>
+                <column hidden="0" name="Source" type="field" width="-1"/>
+                <column hidden="0" name="RouteLen" type="field" width="-1"/>
+                <column hidden="0" name="descriptio" type="field" width="-1"/>
+                <column hidden="0" name="timestamp" type="field" width="-1"/>
+                <column hidden="0" name="begin" type="field" width="-1"/>
+                <column hidden="0" name="end" type="field" width="-1"/>
+                <column hidden="0" name="Distance" type="field" width="-1"/>
+                <column hidden="0" name="length_km" type="field" width="-1"/>
+                <column hidden="0" name="length_m" type="field" width="-1"/>
+              </columns>
+            </attributetableconfig>
+            <conditionalstyles>
+              <rowstyles/>
+              <fieldstyles/>
+            </conditionalstyles>
+            <editform tolerant="1"/>
+            <editforminit/>
+            <editforminitcodesource>0</editforminitcodesource>
+            <editforminitfilepath>/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map</editforminitfilepath>
+            <editforminitcode><![CDATA[# -*- coding: utf-8 -*-
+"""
+QGIS forms can have a Python function that is called when the form is
+opened.
+
+Use this function to add extra logic to your forms.
+
+Enter the name of the function in the "Python Init function"
+field.
+An example follows:
+"""
+from qgis.PyQt.QtWidgets import QWidget
+
+def my_form_open(dialog, layer, feature):
+	geom = feature.geometry()
+	control = dialog.findChild(QWidget, "MyLineEdit")
+]]></editforminitcode>
+            <featformsuppress>0</featformsuppress>
+            <editorlayout>generatedlayout</editorlayout>
+            <editable>
+              <field editable="1" name="Distance"/>
+              <field editable="1" name="Name"/>
+              <field editable="1" name="RouteLen"/>
+              <field editable="1" name="Source"/>
+              <field editable="1" name="begin"/>
+              <field editable="1" name="descriptio"/>
+              <field editable="1" name="distance"/>
+              <field editable="1" name="end"/>
+              <field editable="1" name="length_km"/>
+              <field editable="1" name="length_m"/>
+              <field editable="1" name="org_fid"/>
+              <field editable="1" name="quadrant"/>
+              <field editable="1" name="timestamp"/>
+            </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="quadrant" labelOnTop="0"/>
+              <field name="timestamp" labelOnTop="0"/>
+            </labelOnTop>
+            <widgets/>
+            <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
+            <mapTip>Text</mapTip>
+            <layerGeometryType>0</layerGeometryType>
+          </qgis>
+        </map-layer-style>
       </map-layer-style-manager>
       <auxiliaryLayer/>
       <flags>
@@ -8862,18 +9306,18 @@ def my_form_open(dialog, layer, feature):
       </flags>
       <renderer-v2 type="nullSymbol"/>
       <labeling type="rule-based">
-        <rules key="{ef0a4f1c-3683-401e-af50-096e9c122ec2}">
-          <rule key="{89ce512c-f4b6-4593-abdd-e1496b39d38d}" description="Active routes" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
+        <rules key="{3608a1f2-7607-4dc9-9391-a582d9904577}">
+          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{6c8d4bc9-8e1a-4cc3-a813-97e2b0ad71f6}" description="Active routes">
             <settings>
-              <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="1" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="1" fontSizeUnit="Point" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSize="10" blendMode="0" textColor="255,255,255,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
-                <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
-                <background shapeFillColor="0,0,0,255" shapeJoinStyle="128" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="1" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="1" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="1" shapeRadiiX="1" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+              <text-style fontLetterSpacing="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Semibold" textColor="255,255,255,255" multilineHeight="1" fontSize="10" fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="1" useSubstitutions="0" fontUnderline="0">
+                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeType="0" shapeFillColor="0,0,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiY="1" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="128" shapeBorderWidthUnit="MM" shapeDraw="1" shapeOpacity="1" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="0" shapeRadiiX="1" shapeBorderWidth="1" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" placeDirectionSymbol="0" wrapChar="" decimals="0"/>
-              <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="6" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="3" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="2" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="10" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
-              <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="2" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
+              <text-format multilineAlign="3" autoWrapLength="0" plussign="0" addDirectionSymbol="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+              <placement maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="6" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" geometryGeneratorType="PointGeometry" quadOffset="3" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="2" centroidInside="0" geometryGenerator="" placementFlags="10" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" maxCurvedCharAngleIn="20" priority="10"/>
+              <rendering displayAll="1" upsidedownLabels="0" mergeLines="0" fontLimitPixelSize="0" maxNumLabels="2000" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="1" scaleMax="10000000" minFeatureSize="0" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="0" fontMaxPixelSize="10000" scaleMin="1" obstacleFactor="2"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -8914,18 +9358,18 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </settings>
           </rule>
-          <rule key="{c8fa4d70-045a-495e-8ee0-9e8348c14c1f}" description="List for legends" active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
-            <rule key="{5cc2708e-64e0-43b4-ba64-8c4ce9774fe9}" description="21KM" active="0" filter="&quot;Source&quot; = '21KM'">
+          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{762f5e6f-d30c-4752-b4fa-0f22ed862707}" active="0" description="List for legends">
+            <rule filter="&quot;Source&quot; = '21KM'" key="{cf2c18af-091f-4ce5-8f44-46bd4999f2ba}" active="0" description="21KM">
               <settings>
-                <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="1" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="1" fontSizeUnit="Point" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSize="10" blendMode="0" textColor="255,255,255,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
-                  <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
-                  <background shapeFillColor="210,32,39,255" shapeJoinStyle="128" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="1" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="210,32,39,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="1" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="1" shapeRadiiX="1" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+                <text-style fontLetterSpacing="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Semibold" textColor="255,255,255,255" multilineHeight="1" fontSize="10" fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="1" useSubstitutions="0" fontUnderline="0">
+                  <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <background shapeType="0" shapeFillColor="210,32,39,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="210,32,39,255" shapeSizeUnit="MM" shapeRadiiY="1" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="128" shapeBorderWidthUnit="MM" shapeDraw="1" shapeOpacity="1" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="0" shapeRadiiX="1" shapeBorderWidth="1" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
                   <substitutions/>
                 </text-style>
-                <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" placeDirectionSymbol="0" wrapChar="" decimals="0"/>
-                <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="6" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="3" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="2" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="10" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
-                <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="2" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
+                <text-format multilineAlign="3" autoWrapLength="0" plussign="0" addDirectionSymbol="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+                <placement maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="6" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" geometryGeneratorType="PointGeometry" quadOffset="3" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="2" centroidInside="0" geometryGenerator="" placementFlags="10" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" maxCurvedCharAngleIn="20" priority="10"/>
+                <rendering displayAll="1" upsidedownLabels="0" mergeLines="0" fontLimitPixelSize="0" maxNumLabels="2000" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="1" scaleMax="10000000" minFeatureSize="0" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="0" fontMaxPixelSize="10000" scaleMin="1" obstacleFactor="2"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -8956,17 +9400,17 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
               </settings>
             </rule>
-            <rule key="{159ba16a-95ba-44ad-b846-c28bc7694004}" description="10KM" active="0" filter="&quot;Source&quot; = '10KM'">
+            <rule filter="&quot;Source&quot; = '10KM'" key="{85ac541e-ff73-4c62-9c9c-f90872839ec6}" active="0" description="10KM">
               <settings>
-                <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="1" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="1" fontSizeUnit="Point" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSize="10" blendMode="0" textColor="255,255,255,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
-                  <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
-                  <background shapeFillColor="103,34,144,255" shapeJoinStyle="128" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="1" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="103,34,144,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="1" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="1" shapeRadiiX="1" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+                <text-style fontLetterSpacing="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Semibold" textColor="255,255,255,255" multilineHeight="1" fontSize="10" fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="1" useSubstitutions="0" fontUnderline="0">
+                  <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <background shapeType="0" shapeFillColor="103,34,144,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="103,34,144,255" shapeSizeUnit="MM" shapeRadiiY="1" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="128" shapeBorderWidthUnit="MM" shapeDraw="1" shapeOpacity="1" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="0" shapeRadiiX="1" shapeBorderWidth="1" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
                   <substitutions/>
                 </text-style>
-                <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" placeDirectionSymbol="0" wrapChar="" decimals="0"/>
-                <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="6" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="2" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="10" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
-                <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="2" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
+                <text-format multilineAlign="3" autoWrapLength="0" plussign="0" addDirectionSymbol="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+                <placement maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="6" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" geometryGeneratorType="PointGeometry" quadOffset="4" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="2" centroidInside="0" geometryGenerator="" placementFlags="10" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" maxCurvedCharAngleIn="20" priority="10"/>
+                <rendering displayAll="1" upsidedownLabels="0" mergeLines="0" fontLimitPixelSize="0" maxNumLabels="2000" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="1" scaleMax="10000000" minFeatureSize="0" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="0" fontMaxPixelSize="10000" scaleMin="1" obstacleFactor="2"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -8997,17 +9441,17 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
               </settings>
             </rule>
-            <rule key="{4b0221e3-9f99-4b44-b4ff-a02ed7189f03}" description="5KM" active="0" filter="&quot;Source&quot; = '5KM'">
+            <rule filter="&quot;Source&quot; = '5KM'" key="{648c7f2c-5087-45fa-b34c-09d50a7ddedb}" active="0" description="5KM">
               <settings>
-                <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="1" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="1" fontSizeUnit="Point" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontSize="10" blendMode="0" textColor="255,255,255,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
-                  <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
-                  <background shapeFillColor="145,211,55,255" shapeJoinStyle="128" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="1" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="145,211,55,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="1" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="1" shapeRadiiX="1" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+                <text-style fontLetterSpacing="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Semibold" textColor="255,255,255,255" multilineHeight="1" fontSize="10" fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="1" useSubstitutions="0" fontUnderline="0">
+                  <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <background shapeType="0" shapeFillColor="145,211,55,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeSizeUnit="MM" shapeRadiiY="1" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="128" shapeBorderWidthUnit="MM" shapeDraw="1" shapeOpacity="1" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="0" shapeRadiiX="1" shapeBorderWidth="1" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
                   <substitutions/>
                 </text-style>
-                <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" placeDirectionSymbol="0" wrapChar="" decimals="0"/>
-                <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="6" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="2" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="10" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
-                <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="2" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
+                <text-format multilineAlign="3" autoWrapLength="0" plussign="0" addDirectionSymbol="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+                <placement maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="6" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" geometryGeneratorType="PointGeometry" quadOffset="4" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="2" centroidInside="0" geometryGenerator="" placementFlags="10" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" maxCurvedCharAngleIn="20" priority="10"/>
+                <rendering displayAll="1" upsidedownLabels="0" mergeLines="0" fontLimitPixelSize="0" maxNumLabels="2000" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="1" scaleMax="10000000" minFeatureSize="0" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="0" fontMaxPixelSize="10000" scaleMin="1" obstacleFactor="2"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -9039,75 +9483,24 @@ def my_form_open(dialog, layer, feature):
               </settings>
             </rule>
           </rule>
-          <rule key="{8cbbbde3-7d35-4f80-89e2-32d6f85fe1dc}" description="Always Show" active="0">
-            <settings>
-              <text-style previewBkgrdColor="#ffffff" namedStyle="Regular" fontWeight="50" useSubstitutions="0" fontItalic="0" isExpression="1" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="1" fontSizeUnit="Point" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSize="7" blendMode="0" textColor="255,255,255,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
-                <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
-                <background shapeFillColor="0,0,0,255" shapeJoinStyle="128" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="1" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="1" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="0.5" shapeRadiiX="0.1" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
-                <substitutions/>
-              </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" placeDirectionSymbol="0" wrapChar="" decimals="0"/>
-              <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="6" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="3" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="3" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="4" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
-              <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="0.8" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
-              <dd_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
-                    </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
-                    </Option>
-                    <Option name="PredefinedPositionOrder" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
-                    </Option>
-                    <Option name="Rotation" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="rotation" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
-                    </Option>
-                    <Option name="ShapeBorderColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
-                    </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
-                    </Option>
-                  </Option>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </dd_properties>
-            </settings>
-          </rule>
         </rules>
       </labeling>
       <customproperties>
-        <property key="dualview/previewExpressions" value="COALESCE(&quot;Text&quot;, '&lt;NULL>')"/>
-        <property key="embeddedWidgets/count" value="0"/>
+        <property value="COALESCE(&quot;Text&quot;, '&lt;NULL>')" key="dualview/previewExpressions"/>
+        <property value="0" key="embeddedWidgets/count"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory enabled="0" minScaleDenominator="100000" width="15" rotationOffset="270" penColor="#000000" penAlpha="255" height="15" penWidth="0" diagramOrientation="Up" backgroundColor="#ffffff" scaleDependency="Area" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" opacity="1" lineSizeType="MM" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeType="MM" scaleBasedVisibility="0" backgroundAlpha="255" barWidth="5">
           <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
-          <attribute field="" color="#000000" label=""/>
+          <attribute color="#000000" label="" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" priority="0" dist="0" placement="0" obstacle="0" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" showAll="1" placement="0" linePlacementFlags="2" obstacle="0" dist="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -9116,7 +9509,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -9243,18 +9636,18 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" index="0" name=""/>
-        <alias field="descriptio" index="1" name=""/>
-        <alias field="timestamp" index="2" name=""/>
-        <alias field="begin" index="3" name=""/>
-        <alias field="end" index="4" name=""/>
-        <alias field="Distance" index="5" name=""/>
-        <alias field="RouteLen" index="6" name=""/>
-        <alias field="Source" index="7" name=""/>
-        <alias field="length_m" index="8" name=""/>
-        <alias field="length_km" index="9" name=""/>
-        <alias field="org_fid" index="10" name=""/>
-        <alias field="distance" index="11" name=""/>
+        <alias index="0" field="Name" name=""/>
+        <alias index="1" field="descriptio" name=""/>
+        <alias index="2" field="timestamp" name=""/>
+        <alias index="3" field="begin" name=""/>
+        <alias index="4" field="end" name=""/>
+        <alias index="5" field="Distance" name=""/>
+        <alias index="6" field="RouteLen" name=""/>
+        <alias index="7" field="Source" name=""/>
+        <alias index="8" field="length_m" name=""/>
+        <alias index="9" field="length_km" name=""/>
+        <alias index="10" field="org_fid" name=""/>
+        <alias index="11" field="distance" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -9273,51 +9666,52 @@ def my_form_open(dialog, layer, feature):
         <default field="distance" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="Name" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="descriptio" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="timestamp" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="begin" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="end" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="Distance" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="RouteLen" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="Source" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="length_m" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="length_km" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="org_fid" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="distance" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint exp_strength="0" field="Name" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="descriptio" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="timestamp" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="begin" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="end" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="Distance" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="RouteLen" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="Source" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="length_m" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="length_km" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="org_fid" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="distance" constraints="0" notnull_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="Name" exp="" desc=""/>
-        <constraint field="descriptio" exp="" desc=""/>
-        <constraint field="timestamp" exp="" desc=""/>
-        <constraint field="begin" exp="" desc=""/>
-        <constraint field="end" exp="" desc=""/>
-        <constraint field="Distance" exp="" desc=""/>
-        <constraint field="RouteLen" exp="" desc=""/>
-        <constraint field="Source" exp="" desc=""/>
-        <constraint field="length_m" exp="" desc=""/>
-        <constraint field="length_km" exp="" desc=""/>
-        <constraint field="org_fid" exp="" desc=""/>
-        <constraint field="distance" exp="" desc=""/>
+        <constraint exp="" field="Name" desc=""/>
+        <constraint exp="" field="descriptio" desc=""/>
+        <constraint exp="" field="timestamp" desc=""/>
+        <constraint exp="" field="begin" desc=""/>
+        <constraint exp="" field="end" desc=""/>
+        <constraint exp="" field="Distance" desc=""/>
+        <constraint exp="" field="RouteLen" desc=""/>
+        <constraint exp="" field="Source" desc=""/>
+        <constraint exp="" field="length_m" desc=""/>
+        <constraint exp="" field="length_km" desc=""/>
+        <constraint exp="" field="org_fid" desc=""/>
+        <constraint exp="" field="distance" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="1" sortExpression="&quot;distance&quot;">
+      <attributetableconfig sortExpression="&quot;distance&quot;" sortOrder="1" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="org_fid" hidden="0" type="field"/>
-          <column width="-1" name="distance" hidden="0" type="field"/>
-          <column width="-1" name="Name" hidden="0" type="field"/>
-          <column width="-1" name="Source" hidden="0" type="field"/>
-          <column width="-1" name="RouteLen" hidden="0" type="field"/>
-          <column width="-1" name="descriptio" hidden="0" type="field"/>
-          <column width="-1" name="timestamp" hidden="0" type="field"/>
-          <column width="-1" name="begin" hidden="0" type="field"/>
-          <column width="-1" name="end" hidden="0" type="field"/>
-          <column width="-1" name="Distance" hidden="0" type="field"/>
-          <column width="-1" name="length_km" hidden="0" type="field"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="org_fid" type="field" width="-1"/>
+          <column hidden="0" name="distance" type="field" width="-1"/>
+          <column hidden="0" name="Name" type="field" width="-1"/>
+          <column hidden="0" name="Source" type="field" width="-1"/>
+          <column hidden="0" name="RouteLen" type="field" width="-1"/>
+          <column hidden="0" name="descriptio" type="field" width="-1"/>
+          <column hidden="0" name="timestamp" type="field" width="-1"/>
+          <column hidden="0" name="begin" type="field" width="-1"/>
+          <column hidden="0" name="end" type="field" width="-1"/>
+          <column hidden="0" name="Distance" type="field" width="-1"/>
+          <column hidden="0" name="length_km" type="field" width="-1"/>
+          <column hidden="0" name="length_m" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9348,40 +9742,40 @@ 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="quadrant" 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="quadrant"/>
+        <field editable="1" name="timestamp"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="Distance"/>
-        <field labelOnTop="0" name="Name"/>
-        <field labelOnTop="0" name="RouteLen"/>
-        <field labelOnTop="0" name="Source"/>
-        <field labelOnTop="0" name="begin"/>
-        <field labelOnTop="0" name="descriptio"/>
-        <field labelOnTop="0" name="distance"/>
-        <field labelOnTop="0" name="end"/>
-        <field labelOnTop="0" name="length_km"/>
-        <field labelOnTop="0" name="length_m"/>
-        <field labelOnTop="0" name="org_fid"/>
-        <field labelOnTop="0" name="quadrant"/>
-        <field labelOnTop="0" name="timestamp"/>
+        <field name="Distance" labelOnTop="0"/>
+        <field name="Name" labelOnTop="0"/>
+        <field name="RouteLen" labelOnTop="0"/>
+        <field name="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="quadrant" labelOnTop="0"/>
+        <field name="timestamp" labelOnTop="0"/>
       </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
       <mapTip>Text</mapTip>
     </maplayer>
-    <maplayer maxScale="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" simplifyLocal="1" readOnly="0" geometry="Polygon" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" wkbType="MultiPolygon" simplifyDrawingTol="1">
+    <maplayer styleCategories="AllStyleCategories" refreshOnNotifyMessage="" simplifyAlgorithm="0" maxScale="0" geometry="Polygon" simplifyMaxScale="1" simplifyLocal="1" labelsEnabled="0" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" type="vector" minScale="1e+08" readOnly="0" autoRefreshTime="0" autoRefreshEnabled="0" simplifyDrawingTol="1" wkbType="MultiPolygon" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.40435736428151614</xmin>
         <ymin>-33.90613600950420903</ymin>
@@ -9445,10 +9839,10 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" type="singleSymbol" forceraster="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" enableorderby="0" forceraster="0" symbollevels="0">
         <symbols>
-          <symbol name="0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+          <symbol force_rhr="0" name="0" clip_to_extent="1" type="fill" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleFill">
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="114,155,111,255"/>
               <prop k="joinstyle" v="bevel"/>
@@ -9474,12 +9868,12 @@ def my_form_open(dialog, layer, feature):
         <sizescale/>
       </renderer-v2>
       <customproperties>
-        <property key="dualview/previewExpressions" value="&quot;id&quot;"/>
+        <property value="&quot;id&quot;" key="dualview/previewExpressions"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option value="" type="QString"/>
         </activeChecks>
@@ -9509,9 +9903,9 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="area" index="1" name=""/>
-        <alias field="rotation" index="2" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="area" name=""/>
+        <alias index="2" field="rotation" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -9521,25 +9915,25 @@ def my_form_open(dialog, layer, feature):
         <default field="rotation" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="area" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="rotation" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint exp_strength="0" field="id" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="area" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="rotation" constraints="0" notnull_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="area" exp="" desc=""/>
-        <constraint field="rotation" exp="" desc=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="area" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;rotation&quot;">
+      <attributetableconfig sortExpression="&quot;rotation&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="-1" name="area" hidden="0" type="field"/>
-          <column width="-1" name="rotation" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="0" name="area" type="field" width="-1"/>
+          <column hidden="0" name="rotation" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9559,14 +9953,14 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Point" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" wkbType="Point" simplifyDrawingTol="1">
+    <maplayer styleCategories="AllStyleCategories" refreshOnNotifyMessage="" simplifyAlgorithm="0" maxScale="0" geometry="Point" simplifyMaxScale="1" simplifyLocal="1" labelsEnabled="0" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" type="vector" minScale="1e+08" readOnly="0" autoRefreshTime="0" autoRefreshEnabled="0" simplifyDrawingTol="1" wkbType="Point" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37527697005977245</xmin>
         <ymin>-33.94584879231483399</ymin>
         <xmax>18.42008414500160995</xmax>
         <ymax>-33.89948351196304799</ymax>
       </extent>
-      <id>timelapse_1e9371ed_fd46_407b_8e2a_21ea46053bfe</id>
+      <id>timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f</id>
       <datasource>./timelapse.shp|layername=timelapse</datasource>
       <keywordList>
         <value></value>
@@ -9612,11 +10006,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
+          <spatial minz="0" minx="0" maxz="0" maxy="0" maxx="0" crs="" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -9640,13 +10034,13 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" type="RuleRenderer" forceraster="0" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" enableorderby="0" forceraster="0" symbollevels="0">
         <rules key="{01115dc1-cc6e-4980-a968-7ef94a3b9df6}">
-          <rule symbol="0" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}" label="All distances"/>
+          <rule symbol="0" label="All distances" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}"/>
         </rules>
         <symbols>
-          <symbol name="0" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-            <layer pass="0" class="SimpleMarker" locked="1" enabled="1">
+          <symbol force_rhr="0" name="0" clip_to_extent="1" type="marker" alpha="1">
+            <layer pass="0" locked="1" enabled="1" class="SimpleMarker">
               <prop k="angle" v="0"/>
               <prop k="color" v="0,0,0,255"/>
               <prop k="horizontal_anchor_point" v="1"/>
@@ -9661,7 +10055,7 @@ def my_form_open(dialog, layer, feature):
               <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="outline_width_unit" v="MM"/>
               <prop k="scale_method" v="diameter"/>
-              <prop k="size" v="0.35"/>
+              <prop k="size" v="0.5"/>
               <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="size_unit" v="MM"/>
               <prop k="vertical_anchor_point" v="1"/>
@@ -9688,71 +10082,28 @@ def my_form_open(dialog, layer, feature):
         </symbols>
       </renderer-v2>
       <labeling type="rule-based">
-        <rules key="{8209fadf-9c49-4b02-955b-00e6176ca6e7}">
-          <rule key="{19b7fab2-9e40-4733-8ee6-00027ba6a037}">
-            <settings>
-              <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="1" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.8" fontSizeUnit="Point" fieldName="IF(&quot;Distance&quot; IS attribute( @atlas_feature, 'Distance' ), display, '')" fontSize="9" blendMode="0" textColor="0,0,255,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
-                <text-buffer bufferOpacity="1" bufferNoFill="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
-                <background shapeFillColor="255,255,255,255" shapeJoinStyle="128" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0.2" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,255,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0.5" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="1" shapeRadiiX="0.5" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
-                <substitutions/>
-              </text-style>
-              <text-format formatNumbers="0" autoWrapLength="17" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="2" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
-              <placement centroidInside="0" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="0" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" geometryGenerator="" dist="0" yOffset="0" geometryGeneratorType="LineGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="10" placementFlags="10" offsetType="0" offsetUnits="MM"/>
-              <rendering labelPerPart="0" obstacleType="0" scaleMax="0" limitNumLabels="0" drawLabels="1" obstacleFactor="2" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="0" minFeatureSize="0" maxNumLabels="2" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
-              <dd_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="AlwaysShow" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
-                    </Option>
-                    <Option name="Hali" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="'Center'" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
-                    </Option>
-                    <Option name="PositionX" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
-                    </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
-                    </Option>
-                    <Option name="Vali" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="'Half'" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
-                    </Option>
-                  </Option>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </dd_properties>
-            </settings>
-          </rule>
-        </rules>
+        <rules key="{5513b950-b185-4274-87ed-f967f2c0f61b}"/>
       </labeling>
       <customproperties>
-        <property key="dualview/previewExpressions" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-        <property key="embeddedWidgets/count" value="0"/>
+        <property key="dualview/previewExpressions">
+          <value>COALESCE( "Name", '&lt;NULL>' )</value>
+          <value>COALESCE( "Name", '&lt;NULL>' )</value>
+          <value>COALESCE( "Name", '&lt;NULL>' )</value>
+        </property>
+        <property value="0" key="embeddedWidgets/count"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory enabled="0" minScaleDenominator="0" width="15" rotationOffset="270" penColor="#000000" penAlpha="255" height="15" penWidth="0" diagramOrientation="Up" backgroundColor="#ffffff" scaleDependency="Area" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" opacity="1" lineSizeType="MM" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeType="MM" scaleBasedVisibility="0" backgroundAlpha="255" barWidth="5">
           <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-          <attribute field="" color="#000000" label=""/>
+          <attribute color="#000000" label="" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" priority="0" dist="0" placement="0" obstacle="0" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" showAll="1" placement="0" linePlacementFlags="18" obstacle="0" dist="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -9761,11 +10112,32 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
       <fieldConfiguration>
+        <field name="Name">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="descriptio">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="timestamp">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="begin">
           <editWidget type="TextEdit">
             <config>
@@ -9776,6 +10148,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="end">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="RouteLen">
           <editWidget type="TextEdit">
             <config>
@@ -9796,21 +10175,42 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field name="distance_1">
+        <field name="length_m">
+          <editWidget type="Range">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="length_km">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="first_run">
+        <field name="org_fid">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="last_run">
+        <field name="distance">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="first_runn">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="last_runne">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -9819,66 +10219,95 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="begin" index="0" name=""/>
-        <alias field="RouteLen" index="1" name=""/>
-        <alias field="Source" index="2" name=""/>
-        <alias field="distance_1" index="3" name=""/>
-        <alias field="first_run" index="4" name=""/>
-        <alias field="last_run" index="5" name=""/>
+        <alias index="0" field="Name" name=""/>
+        <alias index="1" field="descriptio" name=""/>
+        <alias index="2" field="timestamp" name=""/>
+        <alias index="3" field="begin" name=""/>
+        <alias index="4" field="end" name=""/>
+        <alias index="5" field="RouteLen" name=""/>
+        <alias index="6" field="Source" name=""/>
+        <alias index="7" field="length_m" name=""/>
+        <alias index="8" field="length_km" name=""/>
+        <alias index="9" field="org_fid" name=""/>
+        <alias index="10" field="distance" name=""/>
+        <alias index="11" field="first_runn" name=""/>
+        <alias index="12" field="last_runne" name=""/>
       </aliases>
       <excludeAttributesWMS>
-        <attribute>Source</attribute>
-        <attribute>distance_1</attribute>
-        <attribute>first_run</attribute>
-        <attribute>last_run</attribute>
         <attribute>begin</attribute>
+        <attribute>Source</attribute>
         <attribute>RouteLen</attribute>
       </excludeAttributesWMS>
       <excludeAttributesWFS>
-        <attribute>Source</attribute>
-        <attribute>distance_1</attribute>
-        <attribute>first_run</attribute>
-        <attribute>last_run</attribute>
         <attribute>begin</attribute>
+        <attribute>Source</attribute>
         <attribute>RouteLen</attribute>
       </excludeAttributesWFS>
       <defaults>
+        <default field="Name" applyOnUpdate="0" expression=""/>
+        <default field="descriptio" applyOnUpdate="0" expression=""/>
+        <default field="timestamp" applyOnUpdate="0" expression=""/>
         <default field="begin" applyOnUpdate="0" expression=""/>
+        <default field="end" applyOnUpdate="0" expression=""/>
         <default field="RouteLen" applyOnUpdate="0" expression=""/>
         <default field="Source" applyOnUpdate="0" expression=""/>
-        <default field="distance_1" applyOnUpdate="0" expression=""/>
-        <default field="first_run" applyOnUpdate="0" expression=""/>
-        <default field="last_run" applyOnUpdate="0" expression=""/>
+        <default field="length_m" applyOnUpdate="0" expression=""/>
+        <default field="length_km" applyOnUpdate="0" expression=""/>
+        <default field="org_fid" applyOnUpdate="0" expression=""/>
+        <default field="distance" applyOnUpdate="0" expression=""/>
+        <default field="first_runn" applyOnUpdate="0" expression=""/>
+        <default field="last_runne" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="begin" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="RouteLen" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="Source" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="distance_1" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="first_run" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="last_run" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint exp_strength="0" field="Name" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="descriptio" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="timestamp" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="begin" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="end" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="RouteLen" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="Source" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="length_m" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="length_km" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="org_fid" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="distance" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="first_runn" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="last_runne" constraints="0" notnull_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="begin" exp="" desc=""/>
-        <constraint field="RouteLen" exp="" desc=""/>
-        <constraint field="Source" exp="" desc=""/>
-        <constraint field="distance_1" exp="" desc=""/>
-        <constraint field="first_run" exp="" desc=""/>
-        <constraint field="last_run" exp="" desc=""/>
+        <constraint exp="" field="Name" desc=""/>
+        <constraint exp="" field="descriptio" desc=""/>
+        <constraint exp="" field="timestamp" desc=""/>
+        <constraint exp="" field="begin" desc=""/>
+        <constraint exp="" field="end" desc=""/>
+        <constraint exp="" field="RouteLen" desc=""/>
+        <constraint exp="" field="Source" desc=""/>
+        <constraint exp="" field="length_m" desc=""/>
+        <constraint exp="" field="length_km" desc=""/>
+        <constraint exp="" field="org_fid" desc=""/>
+        <constraint exp="" field="distance" desc=""/>
+        <constraint exp="" field="first_runn" desc=""/>
+        <constraint exp="" field="last_runne" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;last_run&quot;">
+      <attributetableconfig sortExpression="&quot;first_runn&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="179" name="begin" hidden="0" type="field"/>
-          <column width="-1" name="RouteLen" hidden="0" type="field"/>
-          <column width="-1" name="Source" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="distance_1" hidden="0" type="field"/>
-          <column width="191" name="first_run" hidden="0" type="field"/>
-          <column width="174" name="last_run" hidden="0" type="field"/>
+          <column hidden="0" name="begin" type="field" width="179"/>
+          <column hidden="0" name="RouteLen" type="field" width="-1"/>
+          <column hidden="0" name="Source" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="Name" type="field" width="-1"/>
+          <column hidden="0" name="length_m" type="field" width="-1"/>
+          <column hidden="0" name="length_km" type="field" width="-1"/>
+          <column hidden="0" name="org_fid" type="field" width="-1"/>
+          <column hidden="0" name="first_runn" type="field" width="-1"/>
+          <column hidden="0" name="last_runne" type="field" width="-1"/>
+          <column hidden="0" name="descriptio" type="field" width="-1"/>
+          <column hidden="0" name="timestamp" type="field" width="-1"/>
+          <column hidden="0" name="end" type="field" width="-1"/>
+          <column hidden="0" name="distance" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9909,62 +10338,64 @@ 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="auxiliary_storage_labeling_positionx" editable="0"/>
-        <field name="auxiliary_storage_labeling_positiony" editable="0"/>
-        <field name="begin" editable="1"/>
-        <field name="descriptio" editable="1"/>
-        <field name="display" editable="1"/>
-        <field name="distance" editable="1"/>
-        <field name="distance_1" editable="1"/>
-        <field name="end" editable="1"/>
-        <field name="first_run" editable="1"/>
-        <field name="first_runn" editable="1"/>
-        <field name="first_runner" editable="1"/>
-        <field name="first_runner_s" editable="1"/>
-        <field name="last_run" editable="0"/>
-        <field name="last_runn" editable="1"/>
-        <field name="last_runner" editable="1"/>
-        <field name="last_runner_s" editable="1"/>
-        <field name="length_km" editable="1"/>
-        <field name="length_m" editable="1"/>
-        <field name="org_fid" editable="1"/>
-        <field name="timestamp" editable="1"/>
+        <field editable="1" name="Distance"/>
+        <field editable="1" name="Name"/>
+        <field editable="1" name="RouteLen"/>
+        <field editable="1" name="Source"/>
+        <field editable="0" name="auxiliary_storage_labeling_positionx"/>
+        <field editable="0" name="auxiliary_storage_labeling_positiony"/>
+        <field editable="1" name="begin"/>
+        <field editable="1" name="descriptio"/>
+        <field editable="1" name="display"/>
+        <field editable="1" name="distance"/>
+        <field editable="1" name="distance_1"/>
+        <field editable="1" name="end"/>
+        <field editable="1" name="first_run"/>
+        <field editable="1" name="first_runn"/>
+        <field editable="1" name="first_runner"/>
+        <field editable="1" name="first_runner_s"/>
+        <field editable="0" name="last_run"/>
+        <field editable="1" name="last_runn"/>
+        <field editable="1" name="last_runne"/>
+        <field editable="1" name="last_runner"/>
+        <field editable="1" name="last_runner_s"/>
+        <field editable="1" name="length_km"/>
+        <field editable="1" name="length_m"/>
+        <field editable="1" name="org_fid"/>
+        <field editable="1" name="timestamp"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="Distance"/>
-        <field labelOnTop="0" name="Name"/>
-        <field labelOnTop="0" name="RouteLen"/>
-        <field labelOnTop="0" name="Source"/>
-        <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
-        <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
-        <field labelOnTop="0" name="begin"/>
-        <field labelOnTop="0" name="descriptio"/>
-        <field labelOnTop="0" name="display"/>
-        <field labelOnTop="0" name="distance"/>
-        <field labelOnTop="0" name="distance_1"/>
-        <field labelOnTop="0" name="end"/>
-        <field labelOnTop="0" name="first_run"/>
-        <field labelOnTop="0" name="first_runn"/>
-        <field labelOnTop="0" name="first_runner"/>
-        <field labelOnTop="0" name="first_runner_s"/>
-        <field labelOnTop="0" name="last_run"/>
-        <field labelOnTop="0" name="last_runn"/>
-        <field labelOnTop="0" name="last_runner"/>
-        <field labelOnTop="0" name="last_runner_s"/>
-        <field labelOnTop="0" name="length_km"/>
-        <field labelOnTop="0" name="length_m"/>
-        <field labelOnTop="0" name="org_fid"/>
-        <field labelOnTop="0" name="timestamp"/>
+        <field name="Distance" labelOnTop="0"/>
+        <field name="Name" labelOnTop="0"/>
+        <field name="RouteLen" labelOnTop="0"/>
+        <field name="Source" labelOnTop="0"/>
+        <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
+        <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
+        <field name="begin" labelOnTop="0"/>
+        <field name="descriptio" labelOnTop="0"/>
+        <field name="display" labelOnTop="0"/>
+        <field name="distance" labelOnTop="0"/>
+        <field name="distance_1" labelOnTop="0"/>
+        <field name="end" labelOnTop="0"/>
+        <field name="first_run" labelOnTop="0"/>
+        <field name="first_runn" labelOnTop="0"/>
+        <field name="first_runner" labelOnTop="0"/>
+        <field name="first_runner_s" labelOnTop="0"/>
+        <field name="last_run" labelOnTop="0"/>
+        <field name="last_runn" labelOnTop="0"/>
+        <field name="last_runne" labelOnTop="0"/>
+        <field name="last_runner" labelOnTop="0"/>
+        <field name="last_runner_s" labelOnTop="0"/>
+        <field name="length_km" labelOnTop="0"/>
+        <field name="length_m" labelOnTop="0"/>
+        <field name="org_fid" labelOnTop="0"/>
+        <field name="timestamp" labelOnTop="0"/>
       </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Polygon" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" wkbType="MultiPolygon" simplifyDrawingTol="1">
+    <maplayer styleCategories="AllStyleCategories" refreshOnNotifyMessage="" simplifyAlgorithm="0" maxScale="0" geometry="Polygon" simplifyMaxScale="1" simplifyLocal="1" labelsEnabled="1" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" type="vector" minScale="1e+08" readOnly="0" autoRefreshTime="0" autoRefreshEnabled="0" simplifyDrawingTol="1" wkbType="MultiPolygon" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37549461152003971</xmin>
         <ymin>-33.94162201868364548</ymin>
@@ -10021,7 +10452,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
+          <spatial minz="0" minx="0" maxz="0" maxy="0" maxx="0" crs="" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -10048,17 +10479,17 @@ def my_form_open(dialog, layer, feature):
       <renderer-v2 type="nullSymbol"/>
       <labeling type="rule-based">
         <rules key="{5dc8b36b-2058-4678-ad09-9a66ad011982}">
-          <rule key="{6ef417ce-9c3a-42d0-a533-3a83b1a257ea}" description="Show water tables" filter="CASE&#xa;WHEN attribute( @atlas_feature , 'RouteLen' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'RouteLen' ) ) THEN 1&#xa;ELSE 0&#xa;END">
+          <rule filter="CASE&#xa;WHEN attribute( @atlas_feature , 'RouteLen' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'RouteLen' ) ) THEN 1&#xa;ELSE 0&#xa;END" key="{6ef417ce-9c3a-42d0-a533-3a83b1a257ea}" description="Show water tables">
             <settings>
-              <text-style previewBkgrdColor="#ffffff" namedStyle="Bold" fontWeight="75" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.9" fontSizeUnit="Point" fieldName="label" fontSize="8" blendMode="0" textColor="31,120,180,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
-                <text-buffer bufferOpacity="0.4" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="0.75"/>
-                <background shapeFillColor="255,255,255,204" shapeJoinStyle="128" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0.75" shapeOpacity="0.6" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="-0.15" shapeSizeY="0.3" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="31,120,206,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0.5" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="0.75" shapeRadiiX="0.5" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+              <text-style fontLetterSpacing="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Bold" textColor="31,120,180,255" multilineHeight="1" fontSize="8" fontWeight="75" fieldName="label" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="0.9" useSubstitutions="0" fontUnderline="0">
+                <text-buffer bufferOpacity="0.4" bufferBlendMode="0" bufferSize="0.75" bufferNoFill="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeType="0" shapeFillColor="255,255,255,204" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="31,120,206,255" shapeSizeUnit="MM" shapeRadiiY="0.5" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="128" shapeBorderWidthUnit="MM" shapeDraw="1" shapeOpacity="0.6" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.75" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="-0.15" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="0.3" shapeRadiiX="0.5" shapeBorderWidth="0.75" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="1" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
-              <placement centroidInside="0" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="0" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="1" maxCurvedCharAngleIn="25" geometryGenerator="" dist="0" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="1" priority="5" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
-              <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="0.76" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="5" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="6" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="0"/>
+              <text-format multilineAlign="1" autoWrapLength="0" plussign="0" addDirectionSymbol="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+              <placement maxCurvedCharAngleOut="-25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="0" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="1" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" geometryGeneratorType="PointGeometry" quadOffset="1" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="0" centroidInside="0" geometryGenerator="" placementFlags="10" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="1" maxCurvedCharAngleIn="25" priority="5"/>
+              <rendering displayAll="0" upsidedownLabels="0" mergeLines="0" fontLimitPixelSize="0" maxNumLabels="6" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="1" scaleMax="10000000" minFeatureSize="0" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="5" fontMaxPixelSize="10000" scaleMin="1" obstacleFactor="0.76"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -10071,21 +10502,21 @@ def my_form_open(dialog, layer, feature):
         </rules>
       </labeling>
       <customproperties>
-        <property key="dualview/previewExpressions" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
-        <property key="embeddedWidgets/count" value="0"/>
+        <property value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" key="dualview/previewExpressions"/>
+        <property value="0" key="embeddedWidgets/count"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory enabled="0" minScaleDenominator="0" width="15" rotationOffset="270" penColor="#000000" penAlpha="255" height="15" penWidth="0" diagramOrientation="Up" backgroundColor="#ffffff" scaleDependency="Area" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" opacity="1" lineSizeType="MM" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeType="MM" scaleBasedVisibility="0" backgroundAlpha="255" barWidth="5">
           <fontProperties style="" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0"/>
-          <attribute field="" color="#000000" label=""/>
+          <attribute color="#000000" label="" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" priority="0" dist="0" placement="0" obstacle="0" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" showAll="1" placement="0" linePlacementFlags="2" obstacle="0" dist="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -10094,7 +10525,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -10138,10 +10569,10 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="table_set" index="1" name=""/>
-        <alias field="label" index="2" name=""/>
-        <alias field="races" index="3" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="table_set" name=""/>
+        <alias index="2" field="label" name=""/>
+        <alias index="3" field="races" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -10152,28 +10583,28 @@ def my_form_open(dialog, layer, feature):
         <default field="races" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="table_set" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="label" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="races" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint exp_strength="0" field="id" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="table_set" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="label" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="races" constraints="0" notnull_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="table_set" exp="" desc=""/>
-        <constraint field="label" exp="" desc=""/>
-        <constraint field="races" exp="" desc=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="table_set" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="races" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;table_set&quot;">
+      <attributetableconfig sortExpression="&quot;table_set&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="table_set" hidden="0" type="field"/>
-          <column width="-1" name="label" hidden="0" type="field"/>
-          <column width="130" name="races" hidden="0" type="field"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="table_set" type="field" width="-1"/>
+          <column hidden="0" name="label" type="field" width="-1"/>
+          <column hidden="0" name="races" type="field" width="130"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10204,16 +10635,16 @@ 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="races" editable="1"/>
-        <field name="table_set" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="label"/>
+        <field editable="1" name="races"/>
+        <field editable="1" name="table_set"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="label"/>
-        <field labelOnTop="0" name="races"/>
-        <field labelOnTop="0" name="table_set"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="label" labelOnTop="0"/>
+        <field name="races" labelOnTop="0"/>
+        <field name="table_set" labelOnTop="0"/>
       </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
@@ -10240,8 +10671,8 @@ def my_form_open(dialog, layer, feature):
     <layer id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8"/>
     <layer id="fence_groups_2daa8372_dd22_4979_afdf_08d74ee6b4b1"/>
     <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-    <layer id="timelapse_1e9371ed_fd46_407b_8e2a_21ea46053bfe"/>
     <layer id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83"/>
+    <layer id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f"/>
   </layerorder>
   <properties>
     <DefaultStyles>
@@ -10478,7 +10909,7 @@ def my_form_open(dialog, layer, feature):
     <TimeManager>
       <active type="int">1</active>
       <animationFrameLength type="int">10</animationFrameLength>
-      <currentMapTimePosition type="QString">1900-01-01 07:04:19</currentMapTimePosition>
+      <currentMapTimePosition type="QString">1900-01-01 06:59:35</currentMapTimePosition>
       <digits type="int">4</digits>
       <labelBgColor type="QString">#ffffff</labelBgColor>
       <labelColor type="QString">#000000</labelColor>
@@ -10492,9 +10923,9 @@ def my_form_open(dialog, layer, feature):
       <timeFrameSize type="int">10</timeFrameSize>
       <timeFrameType type="QString">seconds</timeFrameType>
       <timeLayerList type="QStringList">
-        <value>timelapse_d047db96_b4ab_4656_8ec5_eef60d76db13;;first_run;last_run;True;%H:%M:%S.%f;0;;False;No interpolation (faster);True;False;False</value>
+        <value>timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f;;first_runn;last_runne;True;%H:%M:%S.%f;0;;False;No interpolation (faster);False;False;False</value>
       </timeLayerList>
-      <timeLayerManager type="QString">1900-01-01 06:30:00;1900-01-01 08:35:00;1900-01-01 07:04:19</timeLayerManager>
+      <timeLayerManager type="QString">1900-01-01 06:30:00;1900-01-01 10:05:43;1900-01-01 06:59:35</timeLayerManager>
     </TimeManager>
     <Variables>
       <variableNames type="QStringList"/>
@@ -10558,247 +10989,247 @@ def my_form_open(dialog, layer, feature):
   </properties>
   <visibility-presets>
     <visibility-preset has-expanded-info="1" name="Access Routes">
-      <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="0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="0"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer style="default" expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
+      <layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" style="default" expanded="1"/>
       <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Elevation"/>
-        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="All Routes">
-      <layer style="default" expanded="1" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <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="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="1"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer id="water_tables20170921142016467" style="default" expanded="1"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" expanded="1"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{bf1a10e0-59dd-4cae-9422-60e7158499cb}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Ask Me">
-      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <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="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
-      <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
-      <layer style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="1"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer style="default" expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
+      <layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" style="default" expanded="1"/>
+      <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" style="default" expanded="1"/>
       <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Ask Me"/>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Ask Me"/>
         <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Fencing">
-      <layer style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer id="water_tables20170921142016467" style="default" expanded="1"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" expanded="1"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" expanded="1"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <checked-legend-node id="{b3b38ee9-c245-4839-b078-3b966a2a5c4e}"/>
         <checked-legend-node id="{bb4463e8-e33a-4475-878c-fd2d7b636418}"/>
         <checked-legend-node id="{9da1c54c-0ca9-4db9-a722-ce3f53ccd358}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer style="default" expanded="1" id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" style="default" expanded="1"/>
       <expanded-legend-nodes id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83"/>
-      <layer style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" expanded="1"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer style="default" expanded="1" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer style="default" expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
       <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Fencing and Cones"/>
         <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-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Marshal map - inset">
-      <layer style="default" expanded="1" id="water_tables20170921142016467"/>
+      <layer id="water_tables20170921142016467" style="default" expanded="1"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <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="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" expanded="1"/>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer 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="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" expanded="1"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer id="extra_security20170921130834191" style="default" expanded="1"/>
+      <expanded-legend-nodes id="extra_security20170921130834191"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Elevation"/>
-        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Marshal map - main">
-      <layer style="default" expanded="1" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <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="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer style="default" expanded="0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="0"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer style="default" expanded="1" id="extra_security20170921130834191"/>
+      <layer id="water_tables20170921142016467" style="default" expanded="1"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" expanded="1"/>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer id="extra_security20170921130834191" style="default" expanded="1"/>
       <expanded-legend-nodes id="extra_security20170921130834191"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Elevation"/>
-        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Marshal overview">
-      <layer style="default" expanded="1" id="water_tables20170921142016467"/>
+      <layer id="water_tables20170921142016467" style="default" expanded="1"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <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="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" expanded="1"/>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer style="default" expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" expanded="1"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" expanded="1"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Proposed Routes">
-      <layer style="default" expanded="1" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <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="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="1"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer id="water_tables20170921142016467" style="default" expanded="1"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" expanded="1"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Routes">
-      <layer style="default" expanded="1" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <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="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="1"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer id="water_tables20170921142016467" style="default" expanded="1"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" expanded="1"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Start/Finish">
-      <layer style="default" expanded="1" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <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="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer style="default" expanded="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
+      <layer id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" style="default" expanded="1"/>
       <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
-      <layer style="default" expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer id="water_tables20170921142016467" style="default" expanded="1"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" expanded="1"/>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" expanded="1"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" expanded="1"/>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Marshal pages"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Marshal pages"/>
         <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
@@ -10826,12 +11257,12 @@ def my_form_open(dialog, layer, feature):
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout units="mm" printResolution="144" name="Routes" worldFileMap="">
-      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
-      <Grid offsetX="0" resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm"/>
+    <Layout printResolution="144" worldFileMap="" name="Routes" units="mm">
+      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
+      <Grid offsetUnits="mm" resolution="10" offsetX="0" offsetY="0" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+        <symbol force_rhr="0" name="" clip_to_extent="1" type="fill" alpha="1">
+          <layer pass="0" locked="0" enabled="1" class="SimpleFill">
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
             <prop k="joinstyle" v="miter"/>
@@ -10852,9 +11283,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem frame="false" size="297,210,mm" uuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" position="0,0,mm" type="65638" templateUuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" frameJoinStyle="miter" positionLock="false" background="true" outlineWidthM="0.3,mm" zValue="0" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" excludeFromExports="0" positionOnPage="0,0,mm" itemRotation="0" groupUuid="">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem size="297,210,mm" frame="false" frameJoinStyle="miter" positionLock="false" id="" background="true" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" type="65638" position="0,0,mm" positionOnPage="0,0,mm" blendMode="0" opacity="1" uuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" outlineWidthM="0.3,mm" zValue="0" templateUuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}">
+          <FrameColor green="0" blue="0" alpha="255" red="0"/>
+          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -10867,12 +11298,12 @@ def my_form_open(dialog, layer, feature):
           </LayoutObject>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide units="mm" orientation="2" page="0" position="0"/>
+          <Guide page="0" orientation="2" position="0" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem frame="false" size="14.1764,7.471,mm" uuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" marginX="1" position="9.44946,191.611,mm" type="65641" valign="64" templateUuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="9" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="[%&quot;Distance&quot;%]" excludeFromExports="0" positionOnPage="9.44946,191.611,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="14.1764,7.471,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="true" id="" labelText="[%&quot;Distance&quot;%]" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="1" valign="64" type="65641" position="9.44946,191.611,mm" marginY="1" positionOnPage="9.44946,191.611,mm" htmlState="0" blendMode="0" opacity="1" uuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" outlineWidthM="0.3,mm" zValue="9" templateUuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -10884,11 +11315,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Semibold" description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="29.2025,7.272,mm" uuid="{d9f4225c-620f-4a62-a293-599f109f5206}" marginX="0" position="24.2445,191.81,mm" type="65641" valign="64" templateUuid="{d9f4225c-620f-4a62-a293-599f109f5206}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="8" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="RACE ROUTE" excludeFromExports="0" positionOnPage="24.2445,191.81,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="29.2025,7.272,mm" frame="false" frameJoinStyle="miter" marginX="0" positionLock="true" id="" labelText="RACE ROUTE" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="1" valign="64" type="65641" position="24.2445,191.81,mm" marginY="1" positionOnPage="24.2445,191.81,mm" htmlState="0" blendMode="0" opacity="1" uuid="{d9f4225c-620f-4a62-a293-599f109f5206}" outlineWidthM="0.3,mm" zValue="8" templateUuid="{d9f4225c-620f-4a62-a293-599f109f5206}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -10900,11 +11331,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="57.4836,6.8714,mm" uuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" marginX="1" position="204.225,191.81,mm" type="65641" valign="64" templateUuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="6" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="REVISION 3.0" excludeFromExports="0" positionOnPage="204.225,191.81,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="57.4836,6.8714,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="true" id="" labelText="REVISION 3.0" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="2" valign="64" type="65641" position="204.225,191.81,mm" marginY="1" positionOnPage="204.225,191.81,mm" htmlState="0" blendMode="0" opacity="1" uuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" outlineWidthM="0.3,mm" zValue="6" templateUuid="{1915042c-b33e-434c-ba57-48f7179a5efa}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -10916,11 +11347,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="51.6706,6.60801,mm" uuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" marginX="1" position="210.038,199.082,mm" type="65641" valign="64" templateUuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="5" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="Sunday, 20 October 2019" excludeFromExports="0" positionOnPage="210.038,199.082,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="51.6706,6.60801,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="true" id="" labelText="Sunday, 20 October 2019" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="2" valign="64" type="65641" position="210.038,199.082,mm" marginY="1" positionOnPage="210.038,199.082,mm" htmlState="0" blendMode="0" opacity="1" uuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" outlineWidthM="0.3,mm" zValue="5" templateUuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -10932,11 +11363,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="29.7523,17.4718,mm" uuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" position="262.196,188.218,mm" type="65640" pictureWidth="29.7523" templateUuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" pictureRotation="0" frameJoinStyle="miter" positionLock="true" anchorPoint="4" svgFillColor="255,255,255,255" background="false" resizeMode="0" outlineWidthM="0.3,mm" zValue="4" visibility="1" northMode="0" referencePoint="0" svgBorderWidth="0.2" opacity="1" id="" blendMode="0" northOffset="0" mapUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" excludeFromExports="0" pictureHeight="17.4074" positionOnPage="262.196,188.218,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="29.7523,17.4718,mm" northMode="0" frame="false" svgBorderColor="0,0,0,255" frameJoinStyle="miter" svgBorderWidth="0.2" pictureRotation="0" positionLock="true" id="" anchorPoint="4" mapUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" background="false" groupUuid="" referencePoint="0" visibility="1" pictureHeight="17.4074" svgFillColor="255,255,255,255" excludeFromExports="0" itemRotation="0" type="65640" file="../Gun_Run_Logo.png" position="262.196,188.218,mm" northOffset="0" positionOnPage="262.196,188.218,mm" blendMode="0" opacity="1" uuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" outlineWidthM="0.3,mm" resizeMode="0" pictureWidth="29.7523" zValue="4" templateUuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -10954,9 +11385,9 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem frame="false" size="251.959,0.1,mm" uuid="{5e005555-54ea-40fd-a5a7-20254950b890}" position="9.59946,198.832,mm" type="65643" templateUuid="{5e005555-54ea-40fd-a5a7-20254950b890}" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="3" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" cornerRadiusMeasure="0,mm" excludeFromExports="0" shapeType="1" positionOnPage="9.59946,198.832,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="251.959,0.1,mm" frame="false" frameJoinStyle="miter" shapeType="1" positionLock="true" id="" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" type="65643" position="9.59946,198.832,mm" positionOnPage="9.59946,198.832,mm" blendMode="0" opacity="1" uuid="{5e005555-54ea-40fd-a5a7-20254950b890}" outlineWidthM="0.3,mm" cornerRadiusMeasure="0,mm" zValue="3" templateUuid="{5e005555-54ea-40fd-a5a7-20254950b890}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -10967,8 +11398,8 @@ def my_form_open(dialog, layer, feature):
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+        <symbol force_rhr="0" name="" clip_to_extent="1" type="fill" alpha="1">
+          <layer pass="0" locked="0" enabled="1" class="SimpleFill">
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
             <prop k="joinstyle" v="miter"/>
@@ -10990,9 +11421,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem frame="true" size="67.7828,166.874,mm" uuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" keepLayerSet="false" position="5.86559,4.09761,mm" type="65639" drawCanvasItems="false" followPresetName="Routes" templateUuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" frameJoinStyle="miter" positionLock="true" background="true" outlineWidthM="0.3,mm" zValue="2" labelMargin="0,mm" followPreset="true" visibility="1" referencePoint="0" opacity="1" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="5.86559,4.09761,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="67.7828,166.874,mm" labelMargin="0,mm" frame="true" mapFlags="0" frameJoinStyle="miter" positionLock="true" id="" background="true" groupUuid="" referencePoint="0" visibility="1" keepLayerSet="false" excludeFromExports="0" itemRotation="0" type="65639" position="5.86559,4.09761,mm" positionOnPage="5.86559,4.09761,mm" mapRotation="0" blendMode="0" drawCanvasItems="false" opacity="1" uuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" outlineWidthM="0.3,mm" followPresetName="Routes" followPreset="true" zValue="2" templateUuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -11034,7 +11465,7 @@ def my_form_open(dialog, layer, feature):
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmax="18.38563681624126289" ymin="-33.94652930000000168" ymax="-33.91513741583252539" xmin="18.37288570000000121"/>
+        <Extent ymax="-33.91513741583252539" xmax="18.38563681624126289" xmin="18.37288570000000121" ymin="-33.94652930000000168"/>
         <crs>
           <spatialrefsys>
             <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
@@ -11048,10 +11479,10 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid offsetY="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" gridFrameWidth="2" frameFillColor1="255,255,255,255" gridStyle="0" bottomFrameDivisions="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" gridFrameMargin="0" leftFrameDivisions="0" rightAnnotationPosition="1" rightAnnotationDirection="0" intervalY="0" frameFillColor2="0,0,0,255" leftAnnotationPosition="1" gridFrameSideFlags="15" topAnnotationDisplay="0" frameAnnotationDistance="1" annotationPrecision="3" offsetX="0" topAnnotationPosition="1" bottomAnnotationDirection="0" show="0" unit="0" rightAnnotationDisplay="0" intervalX="0" annotationFormat="0" gridFrameStyle="0" bottomAnnotationDisplay="0" blendMode="0" position="3" rightFrameDivisions="0" showAnnotation="0" topAnnotationDirection="0" crossLength="3" annotationFontColor="0,0,0,255" leftAnnotationDisplay="0" name="Grid 1" bottomAnnotationPosition="1" annotationExpression="" gridFramePenColor="0,0,0,255" topFrameDivisions="0">
+        <ComposerMapGrid topAnnotationDirection="0" gridFrameMargin="0" bottomAnnotationDirection="0" gridFrameSideFlags="15" annotationFontColor="0,0,0,255" crossLength="3" gridFramePenThickness="0.5" name="Grid 1" leftAnnotationDisplay="0" topFrameDivisions="0" showAnnotation="0" bottomFrameDivisions="0" topAnnotationDisplay="0" frameFillColor2="0,0,0,255" blendMode="0" gridFrameWidth="2" leftAnnotationDirection="0" annotationFormat="0" bottomAnnotationPosition="1" gridFramePenColor="0,0,0,255" annotationPrecision="3" offsetY="0" gridFrameStyle="0" topAnnotationPosition="1" frameFillColor1="255,255,255,255" rightAnnotationDirection="0" rightFrameDivisions="0" show="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" rightAnnotationDisplay="0" annotationExpression="" leftAnnotationPosition="1" unit="0" gridStyle="0" intervalY="0" offsetX="0" rightAnnotationPosition="1" intervalX="0" leftFrameDivisions="0" position="3" bottomAnnotationDisplay="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol name="" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <symbol force_rhr="0" name="" clip_to_extent="1" type="line" alpha="1">
+              <layer pass="0" locked="0" enabled="1" class="SimpleLine">
                 <prop k="capstyle" v="square"/>
                 <prop k="customdash" v="5;2"/>
                 <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -11079,8 +11510,8 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <symbol force_rhr="0" name="" clip_to_extent="1" type="marker" alpha="1">
+              <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
                 <prop k="angle" v="0"/>
                 <prop k="color" v="0,0,0,255"/>
                 <prop k="horizontal_anchor_point" v="1"/>
@@ -11111,12 +11542,12 @@ def my_form_open(dialog, layer, feature):
           </markerStyle>
           <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.05"/>
+        <AtlasMap margin="0.05" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutItem frame="true" size="282.012,175.592,mm" uuid="{b35d820c-6054-4426-a840-5216bed2ca94}" keepLayerSet="false" position="9.44946,9.08557,mm" type="65639" drawCanvasItems="false" followPresetName="Routes" templateUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" frameJoinStyle="round" positionLock="true" background="true" outlineWidthM="0.15,mm" zValue="1" labelMargin="0,mm" followPreset="true" visibility="1" referencePoint="0" opacity="1" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="9.44946,9.08557,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="282.012,175.592,mm" labelMargin="0,mm" frame="true" mapFlags="0" frameJoinStyle="round" positionLock="true" id="" background="true" groupUuid="" referencePoint="0" visibility="1" keepLayerSet="false" excludeFromExports="0" itemRotation="0" type="65639" position="9.44946,9.08557,mm" positionOnPage="9.44946,9.08557,mm" mapRotation="0" blendMode="0" drawCanvasItems="false" opacity="1" uuid="{b35d820c-6054-4426-a840-5216bed2ca94}" outlineWidthM="0.15,mm" followPresetName="Routes" followPreset="true" zValue="1" templateUuid="{b35d820c-6054-4426-a840-5216bed2ca94}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -11143,7 +11574,7 @@ def my_form_open(dialog, layer, feature):
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmax="18.42303507276714569" ymin="-33.92999999999999972" ymax="-33.89697816223931426" xmin="18.37000000000000099"/>
+        <Extent ymax="-33.89697816223931426" xmax="18.42303507276714569" xmin="18.37000000000000099" ymin="-33.92999999999999972"/>
         <crs>
           <spatialrefsys>
             <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
@@ -11157,10 +11588,10 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid offsetY="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFrameWidth="2" frameFillColor1="255,255,255,255" gridStyle="0" bottomFrameDivisions="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" gridFrameMargin="0" leftFrameDivisions="0" rightAnnotationPosition="1" rightAnnotationDirection="0" intervalY="0" frameFillColor2="0,0,0,255" leftAnnotationPosition="1" gridFrameSideFlags="15" topAnnotationDisplay="0" frameAnnotationDistance="1" annotationPrecision="3" offsetX="0" topAnnotationPosition="1" bottomAnnotationDirection="0" show="0" unit="0" rightAnnotationDisplay="0" intervalX="0" annotationFormat="0" gridFrameStyle="0" bottomAnnotationDisplay="0" blendMode="0" position="3" rightFrameDivisions="0" showAnnotation="0" topAnnotationDirection="0" crossLength="3" annotationFontColor="0,0,0,255" leftAnnotationDisplay="0" name="Grid 1" bottomAnnotationPosition="1" annotationExpression="" gridFramePenColor="0,0,0,255" topFrameDivisions="0">
+        <ComposerMapGrid topAnnotationDirection="0" gridFrameMargin="0" bottomAnnotationDirection="0" gridFrameSideFlags="15" annotationFontColor="0,0,0,255" crossLength="3" gridFramePenThickness="0.5" name="Grid 1" leftAnnotationDisplay="0" topFrameDivisions="0" showAnnotation="0" bottomFrameDivisions="0" topAnnotationDisplay="0" frameFillColor2="0,0,0,255" blendMode="0" gridFrameWidth="2" leftAnnotationDirection="0" annotationFormat="0" bottomAnnotationPosition="1" gridFramePenColor="0,0,0,255" annotationPrecision="3" offsetY="0" gridFrameStyle="0" topAnnotationPosition="1" frameFillColor1="255,255,255,255" rightAnnotationDirection="0" rightFrameDivisions="0" show="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rightAnnotationDisplay="0" annotationExpression="" leftAnnotationPosition="1" unit="0" gridStyle="0" intervalY="0" offsetX="0" rightAnnotationPosition="1" intervalX="0" leftFrameDivisions="0" position="3" bottomAnnotationDisplay="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol name="" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <symbol force_rhr="0" name="" clip_to_extent="1" type="line" alpha="1">
+              <layer pass="0" locked="0" enabled="1" class="SimpleLine">
                 <prop k="capstyle" v="square"/>
                 <prop k="customdash" v="5;2"/>
                 <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -11188,8 +11619,8 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <symbol force_rhr="0" name="" clip_to_extent="1" type="marker" alpha="1">
+              <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
                 <prop k="angle" v="0"/>
                 <prop k="color" v="0,0,0,255"/>
                 <prop k="horizontal_anchor_point" v="1"/>
@@ -11220,31 +11651,31 @@ def my_form_open(dialog, layer, feature):
           </markerStyle>
           <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
       </LayoutItem>
       <customproperties>
-        <property key="atlasRasterFormat" value="png"/>
-        <property key="forceVector" value="0"/>
-        <property key="imageAntialias" value="true"/>
-        <property key="imageCropMarginBottom" value="0"/>
-        <property key="imageCropMarginLeft" value="0"/>
-        <property key="imageCropMarginRight" value="0"/>
-        <property key="imageCropMarginTop" value="0"/>
-        <property key="imageCropToContents" value="false"/>
-        <property key="pdfDisableRasterTiles" value="0"/>
-        <property key="pdfIncludeMetadata" value="1"/>
-        <property key="pdfTextFormat" value="0"/>
-        <property key="singleFile" value="true"/>
+        <property value="png" key="atlasRasterFormat"/>
+        <property value="0" key="forceVector"/>
+        <property value="true" key="imageAntialias"/>
+        <property value="0" key="imageCropMarginBottom"/>
+        <property value="0" key="imageCropMarginLeft"/>
+        <property value="0" key="imageCropMarginRight"/>
+        <property value="0" key="imageCropMarginTop"/>
+        <property value="false" key="imageCropToContents"/>
+        <property value="0" key="pdfDisableRasterTiles"/>
+        <property value="1" key="pdfIncludeMetadata"/>
+        <property value="0" key="pdfTextFormat"/>
+        <property value="true" key="singleFile"/>
       </customproperties>
-      <Atlas pageNameExpression="&quot;Distance&quot;" sortAscending="0" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21)' )" coverageLayerProvider="ogr" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" coverageLayerSource="/home/tim/Documents/GunRunMaps/GIS Base Map/all_routes.shp|layername=all_routes" coverageLayerName="all_routes" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortKey="length_m" filterFeatures="1" enabled="1" sortFeatures="1" hideCoverage="0"/>
+      <Atlas pageNameExpression="&quot;Distance&quot;" coverageLayerProvider="ogr" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortFeatures="1" sortAscending="0" enabled="1" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21)' )" sortKey="length_m" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" coverageLayerName="all_routes" filterFeatures="1" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" hideCoverage="0"/>
     </Layout>
-    <Layout units="mm" printResolution="120" name="Marshals" worldFileMap="">
-      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
-      <Grid offsetX="0" resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm"/>
+    <Layout printResolution="120" worldFileMap="" name="Marshals" units="mm">
+      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
+      <Grid offsetUnits="mm" resolution="10" offsetX="0" offsetY="0" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+        <symbol force_rhr="0" name="" clip_to_extent="1" type="fill" alpha="1">
+          <layer pass="0" locked="0" enabled="1" class="SimpleFill">
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
             <prop k="joinstyle" v="miter"/>
@@ -11265,9 +11696,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem frame="false" size="297,210,mm" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" position="0,0,mm" type="65638" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" frameJoinStyle="miter" positionLock="false" background="true" outlineWidthM="0.3,mm" zValue="0" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" excludeFromExports="0" positionOnPage="0,0,mm" itemRotation="0" groupUuid="">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem size="297,210,mm" frame="false" frameJoinStyle="miter" positionLock="false" id="" background="true" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" type="65638" position="0,0,mm" positionOnPage="0,0,mm" blendMode="0" opacity="1" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" outlineWidthM="0.3,mm" zValue="0" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}">
+          <FrameColor green="0" blue="0" alpha="255" red="0"/>
+          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -11281,9 +11712,9 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem boxSpace="2" visibility="1" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" symbolAlignment="1" frameJoinStyle="bevel" title="" wmsLegendHeight="25" itemRotation="0" splitLayer="0" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" equalColumnWidth="1" size="19.9422,26,mm" id="" type="65642" lineSpacing="1" background="true" wrapChar="" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" positionLock="true" excludeFromExports="0" groupUuid="" zValue="5" rasterBorder="1" fontColor="#000000" position="128.239,3.58,mm" blendMode="0" rasterBorderColor="0,0,0,255" positionOnPage="128.239,3.58,mm" referencePoint="0" legendFilterByAtlas="0" opacity="1" frame="true" columnCount="1" titleAlignment="1" columnSpace="2" rasterBorderWidth="0" outlineWidthM="0.1,mm" wmsLegendWidth="50" symbolWidth="7" resizeToContents="1" symbolHeight="4">
-        <FrameColor blue="128" green="128" red="128" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem rasterBorderColor="0,0,0,255" background="true" lineSpacing="1" columnSpace="2" legendFilterByAtlas="0" symbolAlignment="1" blendMode="0" equalColumnWidth="1" symbolWidth="7" titleAlignment="1" id="" columnCount="1" type="65642" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" frameJoinStyle="bevel" visibility="1" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" rasterBorderWidth="0" excludeFromExports="0" splitLayer="0" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" title="" wrapChar="" fontColor="#000000" referencePoint="0" rasterBorder="1" itemRotation="0" wmsLegendHeight="25" size="19.9422,26,mm" wmsLegendWidth="50" resizeToContents="1" zValue="5" positionOnPage="128.239,3.58,mm" symbolHeight="4" opacity="1" positionLock="true" position="128.239,3.58,mm" groupUuid="" outlineWidthM="0.1,mm" frame="true" boxSpace="2">
+        <FrameColor green="128" blue="128" alpha="255" red="128"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -11307,7 +11738,7 @@ def my_form_open(dialog, layer, feature):
           <style marginTop="2" alignment="1" name="symbol">
             <styleFont style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style marginTop="2" alignment="1" name="symbolLabel" marginLeft="2">
+          <style marginTop="2" marginLeft="2" alignment="1" name="symbolLabel">
             <styleFont style="Semibold" description="Myriad Pro,8,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
         </styles>
@@ -11315,21 +11746,21 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
           <layer-tree-group checked="Qt::Checked" name="Routes" expanded="1">
             <customproperties/>
-            <layer-tree-layer checked="Qt::Checked" name="all_routes" expanded="1" id="all_routes20170907054841602">
+            <layer-tree-layer id="all_routes20170907054841602" checked="Qt::Checked" name="all_routes" expanded="1">
               <customproperties>
-                <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"/>
+                <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"/>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem frame="true" size="50.4055,50.7436,mm" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" keepLayerSet="false" position="102.986,142.175,mm" type="65639" drawCanvasItems="false" followPresetName="Marshal map - inset" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" frameJoinStyle="miter" positionLock="true" background="true" outlineWidthM="0.2,mm" zValue="4" labelMargin="0,mm" followPreset="true" visibility="1" referencePoint="0" opacity="1" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="102.986,142.175,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="50.4055,50.7436,mm" labelMargin="0,mm" frame="true" mapFlags="0" frameJoinStyle="miter" positionLock="true" id="" background="true" groupUuid="" referencePoint="0" visibility="1" keepLayerSet="false" excludeFromExports="0" itemRotation="0" type="65639" position="102.986,142.175,mm" positionOnPage="102.986,142.175,mm" mapRotation="0" blendMode="0" drawCanvasItems="false" opacity="1" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" outlineWidthM="0.2,mm" followPresetName="Marshal map - inset" followPreset="true" zValue="4" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -11340,12 +11771,12 @@ def my_form_open(dialog, layer, feature):
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmax="18.40867058941471512" ymin="-33.90511059368537161" ymax="-33.9047436175620831" xmin="18.40830605842002043"/>
+        <Extent ymax="-33.9047436175620831" xmax="18.40867058941471512" xmin="18.40830605842002043" ymin="-33.90511059368537161"/>
         <LayerSet/>
-        <ComposerMapGrid offsetY="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" gridFrameWidth="2" frameFillColor1="255,255,255,255" gridStyle="0" bottomFrameDivisions="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" gridFrameMargin="0" leftFrameDivisions="0" rightAnnotationPosition="1" rightAnnotationDirection="0" intervalY="0" frameFillColor2="0,0,0,255" leftAnnotationPosition="1" gridFrameSideFlags="15" topAnnotationDisplay="0" frameAnnotationDistance="1" annotationPrecision="3" offsetX="0" topAnnotationPosition="1" bottomAnnotationDirection="0" show="0" unit="0" rightAnnotationDisplay="0" intervalX="0" annotationFormat="0" gridFrameStyle="0" bottomAnnotationDisplay="0" blendMode="0" position="3" rightFrameDivisions="0" showAnnotation="0" topAnnotationDirection="0" crossLength="3" annotationFontColor="0,0,0,255" leftAnnotationDisplay="0" name="Grid 1" bottomAnnotationPosition="1" annotationExpression="" gridFramePenColor="0,0,0,255" topFrameDivisions="0">
+        <ComposerMapGrid topAnnotationDirection="0" gridFrameMargin="0" bottomAnnotationDirection="0" gridFrameSideFlags="15" annotationFontColor="0,0,0,255" crossLength="3" gridFramePenThickness="0.5" name="Grid 1" leftAnnotationDisplay="0" topFrameDivisions="0" showAnnotation="0" bottomFrameDivisions="0" topAnnotationDisplay="0" frameFillColor2="0,0,0,255" blendMode="0" gridFrameWidth="2" leftAnnotationDirection="0" annotationFormat="0" bottomAnnotationPosition="1" gridFramePenColor="0,0,0,255" annotationPrecision="3" offsetY="0" gridFrameStyle="0" topAnnotationPosition="1" frameFillColor1="255,255,255,255" rightAnnotationDirection="0" rightFrameDivisions="0" show="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" rightAnnotationDisplay="0" annotationExpression="" leftAnnotationPosition="1" unit="0" gridStyle="0" intervalY="0" offsetX="0" rightAnnotationPosition="1" intervalX="0" leftFrameDivisions="0" position="3" bottomAnnotationDisplay="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol name="" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <symbol force_rhr="0" name="" clip_to_extent="1" type="line" alpha="1">
+              <layer pass="0" locked="0" enabled="1" class="SimpleLine">
                 <prop k="capstyle" v="square"/>
                 <prop k="customdash" v="5;2"/>
                 <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -11373,8 +11804,8 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <symbol force_rhr="0" name="" clip_to_extent="1" type="marker" alpha="1">
+              <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
                 <prop k="angle" v="0"/>
                 <prop k="color" v="0,0,0,255"/>
                 <prop k="horizontal_anchor_point" v="1"/>
@@ -11405,9 +11836,9 @@ def my_form_open(dialog, layer, feature):
           </markerStyle>
           <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <ComposerMapOverview show="1" centered="1" inverted="0" name="Overview 1" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" blendMode="0" position="3">
-          <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+        <ComposerMapOverview centered="1" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" position="3" blendMode="0" name="Overview 1" inverted="0" show="1">
+          <symbol force_rhr="0" name="" clip_to_extent="1" type="fill" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleFill">
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="0,65,170,102"/>
               <prop k="joinstyle" v="bevel"/>
@@ -11429,12 +11860,12 @@ def my_form_open(dialog, layer, feature):
             </layer>
           </symbol>
         </ComposerMapOverview>
-        <AtlasMap scalingMode="0" atlasDriven="1" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="1" scalingMode="0"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutItem frame="false" size="142,181,mm" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" keepLayerSet="false" position="3.53,6.0007,mm" type="65639" drawCanvasItems="true" followPresetName="Marshal map - main" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="3" labelMargin="0,mm" followPreset="true" visibility="1" referencePoint="0" opacity="1" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="3.53,6.0007,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="142,181,mm" labelMargin="0,mm" frame="false" mapFlags="0" frameJoinStyle="miter" positionLock="true" id="" background="false" groupUuid="" referencePoint="0" visibility="1" keepLayerSet="false" excludeFromExports="0" itemRotation="0" type="65639" position="3.53,6.0007,mm" positionOnPage="3.53,6.0007,mm" mapRotation="0" blendMode="0" drawCanvasItems="true" opacity="1" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" outlineWidthM="0.3,mm" followPresetName="Marshal map - main" followPreset="true" zValue="3" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -11445,12 +11876,12 @@ def my_form_open(dialog, layer, feature):
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmax="18.41054220300782873" ymin="-33.90754507826720499" ymax="-33.90230913298024973" xmin="18.40643444482690683"/>
+        <Extent ymax="-33.90230913298024973" xmax="18.41054220300782873" xmin="18.40643444482690683" ymin="-33.90754507826720499"/>
         <LayerSet/>
-        <ComposerMapGrid offsetY="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" gridFrameWidth="2" frameFillColor1="255,255,255,255" gridStyle="0" bottomFrameDivisions="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" gridFrameMargin="0" leftFrameDivisions="0" rightAnnotationPosition="1" rightAnnotationDirection="0" intervalY="0" frameFillColor2="0,0,0,255" leftAnnotationPosition="1" gridFrameSideFlags="15" topAnnotationDisplay="0" frameAnnotationDistance="1" annotationPrecision="3" offsetX="0" topAnnotationPosition="1" bottomAnnotationDirection="0" show="0" unit="0" rightAnnotationDisplay="0" intervalX="0" annotationFormat="0" gridFrameStyle="0" bottomAnnotationDisplay="0" blendMode="0" position="3" rightFrameDivisions="0" showAnnotation="0" topAnnotationDirection="0" crossLength="3" annotationFontColor="0,0,0,255" leftAnnotationDisplay="0" name="Grid 1" bottomAnnotationPosition="1" annotationExpression="" gridFramePenColor="0,0,0,255" topFrameDivisions="0">
+        <ComposerMapGrid topAnnotationDirection="0" gridFrameMargin="0" bottomAnnotationDirection="0" gridFrameSideFlags="15" annotationFontColor="0,0,0,255" crossLength="3" gridFramePenThickness="0.5" name="Grid 1" leftAnnotationDisplay="0" topFrameDivisions="0" showAnnotation="0" bottomFrameDivisions="0" topAnnotationDisplay="0" frameFillColor2="0,0,0,255" blendMode="0" gridFrameWidth="2" leftAnnotationDirection="0" annotationFormat="0" bottomAnnotationPosition="1" gridFramePenColor="0,0,0,255" annotationPrecision="3" offsetY="0" gridFrameStyle="0" topAnnotationPosition="1" frameFillColor1="255,255,255,255" rightAnnotationDirection="0" rightFrameDivisions="0" show="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" rightAnnotationDisplay="0" annotationExpression="" leftAnnotationPosition="1" unit="0" gridStyle="0" intervalY="0" offsetX="0" rightAnnotationPosition="1" intervalX="0" leftFrameDivisions="0" position="3" bottomAnnotationDisplay="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol name="" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <symbol force_rhr="0" name="" clip_to_extent="1" type="line" alpha="1">
+              <layer pass="0" locked="0" enabled="1" class="SimpleLine">
                 <prop k="capstyle" v="square"/>
                 <prop k="customdash" v="5;2"/>
                 <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -11478,8 +11909,8 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <symbol force_rhr="0" name="" clip_to_extent="1" type="marker" alpha="1">
+              <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
                 <prop k="angle" v="0"/>
                 <prop k="color" v="0,0,0,255"/>
                 <prop k="horizontal_anchor_point" v="1"/>
@@ -11510,12 +11941,12 @@ def my_form_open(dialog, layer, feature):
           </markerStyle>
           <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="0" atlasDriven="1" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="1" scalingMode="0"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutItem frame="false" size="127.436,159.418,mm" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" sectionHeight="159.418" sectionWidth="127.436" position="277.3,6.0007,mm" hideBackgroundIfEmpty="0" type="65647" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" frameJoinStyle="round" positionLock="true" background="false" sectionX="0" outlineWidthM="0.3,mm" zValue="2" visibility="1" sectionY="0" referencePoint="2" opacity="1" id="" blendMode="0" excludeFromExports="0" positionOnPage="277.3,6.0007,mm" hidePageIfEmpty="0" itemRotation="0" groupUuid="">
-        <FrameColor blue="119" green="119" red="119" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="127.436,159.418,mm" sectionX="0" frame="false" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" frameJoinStyle="round" sectionHeight="159.418" positionLock="true" id="" sectionWidth="127.436" sectionY="0" background="false" groupUuid="" referencePoint="2" visibility="1" hideBackgroundIfEmpty="0" excludeFromExports="0" itemRotation="0" type="65647" position="277.3,6.0007,mm" positionOnPage="277.3,6.0007,mm" blendMode="0" hidePageIfEmpty="0" opacity="1" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" outlineWidthM="0.3,mm" zValue="2" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}">
+        <FrameColor green="119" blue="119" alpha="255" red="119"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -11527,9 +11958,9 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem frame="false" size="47.1065,27.6,mm" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" position="230.194,167.419,mm" type="65640" pictureWidth="27.4317" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" pictureRotation="0" frameJoinStyle="miter" positionLock="true" anchorPoint="0" svgFillColor="255,255,255,255" background="false" resizeMode="0" outlineWidthM="0.3,mm" zValue="1" visibility="1" northMode="0" referencePoint="0" svgBorderWidth="0.2" opacity="1" id="" blendMode="0" northOffset="0" mapUuid="" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo_2018.png" excludeFromExports="0" pictureHeight="27.6" positionOnPage="230.194,167.419,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="47.1065,27.6,mm" northMode="0" frame="false" svgBorderColor="0,0,0,255" frameJoinStyle="miter" svgBorderWidth="0.2" pictureRotation="0" positionLock="true" id="" anchorPoint="0" mapUuid="" background="false" groupUuid="" referencePoint="0" visibility="1" pictureHeight="27.6" svgFillColor="255,255,255,255" excludeFromExports="0" itemRotation="0" type="65640" file="../Gun_Run_Logo_2018.png" position="230.194,167.419,mm" northOffset="0" positionOnPage="230.194,167.419,mm" blendMode="0" opacity="1" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" outlineWidthM="0.3,mm" resizeMode="0" pictureWidth="27.4317" zValue="1" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -11547,7 +11978,7 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutMultiFrame useSmartBreaks="true" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" maxBreakDistance="12" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;tr>&lt;td>Name&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', &quot;csv_name&quot;, '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;/td>&lt;/tr>', '')%]&#xa;&lt;tr>&lt;td>Club&lt;/td>&lt;td>[%csv_club%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%csv_captain%]&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>&lt;b>VOC&lt;/b>&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;tr>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&amp;nbsp;&lt;/td>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain_phone&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;/td>&lt;tr>')%]&#xa;&#xa;&lt;tr>&lt;td>Roger Steward&lt;/td>&lt;td>081 037 3033&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Timothy Allen&lt;/td>&lt;td>072 703 9574&lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please return your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephen Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>" contentMode="1" url="" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" evaluateExpressions="true" type="65648" resizeMode="0" stylesheetEnabled="true">
+      <LayoutMultiFrame evaluateExpressions="true" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;tr>&lt;td>Name&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', &quot;csv_name&quot;, '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;/td>&lt;/tr>', '')%]&#xa;&lt;tr>&lt;td>Club&lt;/td>&lt;td>[%csv_club%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%csv_captain%]&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>&lt;b>VOC&lt;/b>&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;tr>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&amp;nbsp;&lt;/td>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain_phone&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;/td>&lt;tr>')%]&#xa;&#xa;&lt;tr>&lt;td>Roger Steward&lt;/td>&lt;td>081 037 3033&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Timothy Allen&lt;/td>&lt;td>072 703 9574&lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please return your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephen Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>" maxBreakDistance="12" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" useSmartBreaks="true" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" stylesheetEnabled="true" resizeMode="0" type="65648" contentMode="1" url="" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}">
         <childFrame templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}"/>
         <LayoutObject>
           <dataDefinedProperties>
@@ -11561,30 +11992,30 @@ def my_form_open(dialog, layer, feature):
         </LayoutObject>
       </LayoutMultiFrame>
       <customproperties>
-        <property key="atlasRasterFormat" value="jpg"/>
-        <property key="forceVector" value="false"/>
-        <property key="imageAntialias" value="true"/>
-        <property key="imageCropMarginBottom" value="0"/>
-        <property key="imageCropMarginLeft" value="0"/>
-        <property key="imageCropMarginRight" value="0"/>
-        <property key="imageCropMarginTop" value="0"/>
-        <property key="imageCropMarginUnit" value="0"/>
-        <property key="imageCropToContents" value="false"/>
-        <property key="rasterize" value="false"/>
-        <property key="resizeToContentsBottomMargin" value="3.53"/>
-        <property key="resizeToContentsLeftMargin" value="3.53"/>
-        <property key="resizeToContentsRightMargin" value="3.53"/>
-        <property key="resizeToContentsTopMargin" value="3.53"/>
-        <property key="singleFile" value="false"/>
+        <property value="jpg" key="atlasRasterFormat"/>
+        <property value="false" key="forceVector"/>
+        <property value="true" key="imageAntialias"/>
+        <property value="0" key="imageCropMarginBottom"/>
+        <property value="0" key="imageCropMarginLeft"/>
+        <property value="0" key="imageCropMarginRight"/>
+        <property value="0" key="imageCropMarginTop"/>
+        <property value="0" key="imageCropMarginUnit"/>
+        <property value="false" key="imageCropToContents"/>
+        <property value="false" key="rasterize"/>
+        <property value="3.53" key="resizeToContentsBottomMargin"/>
+        <property value="3.53" key="resizeToContentsLeftMargin"/>
+        <property value="3.53" key="resizeToContentsRightMargin"/>
+        <property value="3.53" key="resizeToContentsTopMargin"/>
+        <property value="false" key="singleFile"/>
       </customproperties>
-      <Atlas pageNameExpression="&quot;position&quot;" sortAscending="1" coverageLayer="" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" sortKey="position" filterFeatures="0" enabled="0" sortFeatures="1" hideCoverage="0"/>
+      <Atlas pageNameExpression="&quot;position&quot;" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" sortFeatures="1" sortAscending="1" enabled="0" sortKey="position" coverageLayer="" filterFeatures="0" hideCoverage="0"/>
     </Layout>
-    <Layout units="mm" printResolution="120" name="Marshal Plan" worldFileMap="">
-      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
-      <Grid offsetX="0" resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm"/>
+    <Layout printResolution="120" worldFileMap="" name="Marshal Plan" units="mm">
+      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
+      <Grid offsetUnits="mm" resolution="10" offsetX="0" offsetY="0" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+        <symbol force_rhr="0" name="" clip_to_extent="1" type="fill" alpha="1">
+          <layer pass="0" locked="0" enabled="1" class="SimpleFill">
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
             <prop k="joinstyle" v="miter"/>
@@ -11605,9 +12036,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem frame="false" size="297,420,mm" uuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" position="0,0,mm" type="65638" templateUuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" frameJoinStyle="miter" positionLock="false" background="true" outlineWidthM="0.3,mm" zValue="0" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" excludeFromExports="0" positionOnPage="0,0,mm" itemRotation="0" groupUuid="">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem size="297,420,mm" frame="false" frameJoinStyle="miter" positionLock="false" id="" background="true" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" type="65638" position="0,0,mm" positionOnPage="0,0,mm" blendMode="0" opacity="1" uuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" outlineWidthM="0.3,mm" zValue="0" templateUuid="{b7b60575-1082-47a2-887f-9e62272e9c18}">
+          <FrameColor green="0" blue="0" alpha="255" red="0"/>
+          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -11621,9 +12052,9 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem boxSpace="2" visibility="1" uuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" symbolAlignment="1" frameJoinStyle="miter" title="" wmsLegendHeight="25" itemRotation="0" splitLayer="0" templateUuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" equalColumnWidth="1" size="18.6109,9,mm" id="" type="65642" lineSpacing="1" background="true" wrapChar="" map_uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" positionLock="true" excludeFromExports="0" groupUuid="" zValue="8" rasterBorder="1" fontColor="#000000" position="15.6525,12.5708,mm" blendMode="0" rasterBorderColor="0,0,0,255" positionOnPage="15.6525,12.5708,mm" referencePoint="0" legendFilterByAtlas="0" opacity="1" frame="false" columnCount="1" titleAlignment="1" columnSpace="2" rasterBorderWidth="0" outlineWidthM="0.3,mm" wmsLegendWidth="50" symbolWidth="7" resizeToContents="1" symbolHeight="4">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem rasterBorderColor="0,0,0,255" background="true" lineSpacing="1" columnSpace="2" legendFilterByAtlas="0" symbolAlignment="1" blendMode="0" equalColumnWidth="1" symbolWidth="7" titleAlignment="1" id="" columnCount="1" type="65642" templateUuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" frameJoinStyle="miter" visibility="1" map_uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" rasterBorderWidth="0" excludeFromExports="0" splitLayer="0" uuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" title="" wrapChar="" fontColor="#000000" referencePoint="0" rasterBorder="1" itemRotation="0" wmsLegendHeight="25" size="18.6109,9,mm" wmsLegendWidth="50" resizeToContents="1" zValue="8" positionOnPage="15.6525,12.5708,mm" symbolHeight="4" opacity="1" positionLock="true" position="15.6525,12.5708,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" boxSpace="2">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -11647,7 +12078,7 @@ def my_form_open(dialog, layer, feature):
           <style marginTop="2" alignment="1" name="symbol">
             <styleFont style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style marginTop="2" alignment="1" name="symbolLabel" marginLeft="2">
+          <style marginTop="2" marginLeft="2" alignment="1" name="symbolLabel">
             <styleFont style="Semibold" description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
         </styles>
@@ -11655,21 +12086,21 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
           <layer-tree-group checked="Qt::Checked" name="Routes" expanded="1">
             <customproperties/>
-            <layer-tree-layer checked="Qt::Checked" name="all_routes" expanded="1" id="all_routes20170907054841602">
+            <layer-tree-layer id="all_routes20170907054841602" checked="Qt::Checked" name="all_routes" expanded="1">
               <customproperties>
-                <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"/>
+                <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"/>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem frame="false" size="45.1194,7.36972,mm" uuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" marginX="1" position="5.69321,399.106,mm" type="65641" valign="64" templateUuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="7" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="MARSHAL POSITIONS" excludeFromExports="0" positionOnPage="5.69321,399.106,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="45.1194,7.36972,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="true" id="" labelText="MARSHAL POSITIONS" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="1" valign="64" type="65641" position="5.69321,399.106,mm" marginY="1" positionOnPage="5.69321,399.106,mm" htmlState="0" blendMode="0" opacity="1" uuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" outlineWidthM="0.3,mm" zValue="7" templateUuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -11681,11 +12112,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Semibold" description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="16.2476,7.80192,mm" uuid="{619c5aac-2a47-4730-9726-57b172205ef7}" marginX="1" position="5.69321,406.988,mm" type="65641" valign="32" templateUuid="{619c5aac-2a47-4730-9726-57b172205ef7}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="6" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="Page [% &quot;page&quot; %]" excludeFromExports="0" positionOnPage="5.69321,406.988,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="16.2476,7.80192,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="true" id="" labelText="Page [% &quot;page&quot; %]" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="1" valign="32" type="65641" position="5.69321,406.988,mm" marginY="1" positionOnPage="5.69321,406.988,mm" htmlState="0" blendMode="0" opacity="1" uuid="{619c5aac-2a47-4730-9726-57b172205ef7}" outlineWidthM="0.3,mm" zValue="6" templateUuid="{619c5aac-2a47-4730-9726-57b172205ef7}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -11697,11 +12128,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="27.7839,7.51682,mm" uuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" marginX="1" position="214.292,406.988,mm" type="65641" valign="32" templateUuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="5" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="REVISION 1.1" excludeFromExports="0" positionOnPage="214.292,406.988,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="27.7839,7.51682,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="true" id="" labelText="REVISION 1.1" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="2" valign="32" type="65641" position="214.292,406.988,mm" marginY="1" positionOnPage="214.292,406.988,mm" htmlState="0" blendMode="0" opacity="1" uuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" outlineWidthM="0.3,mm" zValue="5" templateUuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -11713,11 +12144,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="56.3557,7.36902,mm" uuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" marginX="1" position="185.72,399.107,mm" type="65641" valign="64" templateUuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="4" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="Sunday, 20 October 2019" excludeFromExports="0" positionOnPage="185.72,399.107,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="56.3557,7.36902,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="true" id="" labelText="Sunday, 20 October 2019" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="2" valign="64" type="65641" position="185.72,399.107,mm" marginY="1" positionOnPage="185.72,399.107,mm" htmlState="0" blendMode="0" opacity="1" uuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" outlineWidthM="0.3,mm" zValue="4" templateUuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -11729,11 +12160,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="49.3143,31.2967,mm" uuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" position="243.319,382.696,mm" type="65640" pictureWidth="49.3143" templateUuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" pictureRotation="0" frameJoinStyle="miter" positionLock="true" anchorPoint="8" svgFillColor="255,255,255,255" background="false" resizeMode="0" outlineWidthM="0.3,mm" zValue="3" visibility="1" northMode="0" referencePoint="0" svgBorderWidth="0.2" opacity="1" id="" blendMode="0" northOffset="0" mapUuid="" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" excludeFromExports="0" pictureHeight="28.8527" positionOnPage="243.319,382.696,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="49.3143,31.2967,mm" northMode="0" frame="false" svgBorderColor="0,0,0,255" frameJoinStyle="miter" svgBorderWidth="0.2" pictureRotation="0" positionLock="true" id="" anchorPoint="8" mapUuid="" background="false" groupUuid="" referencePoint="0" visibility="1" pictureHeight="28.8527" svgFillColor="255,255,255,255" excludeFromExports="0" itemRotation="0" type="65640" file="../Gun_Run_Logo.png" position="243.319,382.696,mm" northOffset="0" positionOnPage="243.319,382.696,mm" blendMode="0" opacity="1" uuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" outlineWidthM="0.3,mm" resizeMode="0" pictureWidth="49.3143" zValue="3" templateUuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -11751,9 +12182,9 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem frame="false" size="236.083,0.14328,mm" uuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" position="5.84321,406.626,mm" type="65643" templateUuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="2" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" cornerRadiusMeasure="0,mm" excludeFromExports="0" shapeType="1" positionOnPage="5.84321,406.626,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="236.083,0.14328,mm" frame="false" frameJoinStyle="miter" shapeType="1" positionLock="true" id="" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" type="65643" position="5.84321,406.626,mm" positionOnPage="5.84321,406.626,mm" blendMode="0" opacity="1" uuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" outlineWidthM="0.3,mm" cornerRadiusMeasure="0,mm" zValue="2" templateUuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -11764,8 +12195,8 @@ def my_form_open(dialog, layer, feature):
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+        <symbol force_rhr="0" name="" clip_to_extent="1" type="fill" alpha="1">
+          <layer pass="0" locked="0" enabled="1" class="SimpleFill">
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
             <prop k="joinstyle" v="miter"/>
@@ -11787,9 +12218,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem frame="false" size="286.94,392.396,mm" uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" keepLayerSet="false" position="5.03,5.9483,mm" type="65639" drawCanvasItems="false" followPresetName="Marshal overview" templateUuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" frameJoinStyle="miter" positionLock="true" background="true" outlineWidthM="0.3,mm" zValue="1" labelMargin="0,mm" followPreset="true" visibility="1" referencePoint="0" opacity="1" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="5.03,5.9483,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="286.94,392.396,mm" labelMargin="0,mm" frame="false" mapFlags="0" frameJoinStyle="miter" positionLock="true" id="" background="true" groupUuid="" referencePoint="0" visibility="1" keepLayerSet="false" excludeFromExports="0" itemRotation="0" type="65639" position="5.03,5.9483,mm" positionOnPage="5.03,5.9483,mm" mapRotation="0" blendMode="0" drawCanvasItems="false" opacity="1" uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" outlineWidthM="0.3,mm" followPresetName="Marshal overview" followPreset="true" zValue="1" templateUuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -11816,26 +12247,26 @@ def my_form_open(dialog, layer, feature):
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmax="18.42124635930919041" ymin="-33.91857233280978789" ymax="-33.89547273009495854" xmin="18.4043547521658617"/>
+        <Extent ymax="-33.89547273009495854" xmax="18.42124635930919041" xmin="18.4043547521658617" ymin="-33.91857233280978789"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" atlasDriven="1" margin="0"/>
+        <AtlasMap margin="0" atlasDriven="1" scalingMode="2"/>
         <labelBlockingItems/>
       </LayoutItem>
       <customproperties>
-        <property key="atlasRasterFormat" value="png"/>
-        <property key="forceVector" value="0"/>
-        <property key="pdfDisableRasterTiles" value="0"/>
-        <property key="pdfIncludeMetadata" value="1"/>
-        <property key="pdfTextFormat" value="0"/>
+        <property value="png" key="atlasRasterFormat"/>
+        <property value="0" key="forceVector"/>
+        <property value="0" key="pdfDisableRasterTiles"/>
+        <property value="1" key="pdfIncludeMetadata"/>
+        <property value="0" key="pdfTextFormat"/>
       </customproperties>
-      <Atlas pageNameExpression="&quot;page&quot;" sortAscending="1" coverageLayerProvider="ogr" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" coverageLayerSource="/home/tim/Documents/GunRunMaps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" coverageLayerName="marshal_overviews" filenamePattern="'output_'||@atlas_featurenumber" sortKey="page" filterFeatures="0" enabled="1" sortFeatures="1" hideCoverage="1"/>
+      <Atlas pageNameExpression="&quot;page&quot;" coverageLayerProvider="ogr" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1" sortAscending="1" enabled="1" sortKey="page" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" coverageLayerName="marshal_overviews" filterFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" hideCoverage="1"/>
     </Layout>
-    <Layout units="mm" printResolution="300" name="Start &amp; Finish Backgrounds" worldFileMap="">
-      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
-      <Grid offsetX="0" resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm"/>
+    <Layout printResolution="300" worldFileMap="" name="Start &amp; Finish Backgrounds" units="mm">
+      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
+      <Grid offsetUnits="mm" resolution="10" offsetX="0" offsetY="0" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+        <symbol force_rhr="0" name="" clip_to_extent="1" type="fill" alpha="1">
+          <layer pass="0" locked="0" enabled="1" class="SimpleFill">
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
             <prop k="joinstyle" v="miter"/>
@@ -11856,9 +12287,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem frame="false" size="297,210,mm" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" position="0,0,mm" type="65638" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" frameJoinStyle="miter" positionLock="false" background="true" outlineWidthM="0.3,mm" zValue="0" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" excludeFromExports="0" positionOnPage="0,0,mm" itemRotation="0" groupUuid="">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem size="297,210,mm" frame="false" frameJoinStyle="miter" positionLock="false" id="" background="true" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" type="65638" position="0,0,mm" positionOnPage="0,0,mm" blendMode="0" opacity="1" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" outlineWidthM="0.3,mm" zValue="0" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}">
+          <FrameColor green="0" blue="0" alpha="255" red="0"/>
+          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -11872,9 +12303,9 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem frame="false" size="9.45865,11,mm" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" position="286.027,2,mm" type="65640" pictureWidth="6.31767" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" pictureRotation="330" frameJoinStyle="miter" positionLock="true" anchorPoint="0" svgFillColor="255,255,255,255" background="false" resizeMode="0" outlineWidthM="0.3,mm" zValue="4" visibility="1" northMode="0" referencePoint="0" svgBorderWidth="0.2" opacity="1" id="" blendMode="0" northOffset="0" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" svgBorderColor="0,0,0,255" file="arrows/NorthArrow_11.svg" excludeFromExports="0" pictureHeight="7.97477" positionOnPage="286.027,2,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="9.45865,11,mm" northMode="0" frame="false" svgBorderColor="0,0,0,255" frameJoinStyle="miter" svgBorderWidth="0.2" pictureRotation="330" positionLock="true" id="" anchorPoint="0" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" background="false" groupUuid="" referencePoint="0" visibility="1" pictureHeight="7.97477" svgFillColor="255,255,255,255" excludeFromExports="0" itemRotation="0" type="65640" file="arrows/NorthArrow_11.svg" position="286.027,2,mm" northOffset="0" positionOnPage="286.027,2,mm" blendMode="0" opacity="1" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" outlineWidthM="0.3,mm" resizeMode="0" pictureWidth="6.31767" zValue="4" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -11892,9 +12323,9 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem frame="false" size="142.543,10.3185,mm" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" marginX="1" position="285.027,205.886,mm" type="65641" valign="64" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="3" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="[%upper( &quot;area&quot; )%]" excludeFromExports="0" positionOnPage="285.027,205.886,mm" itemRotation="270" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="142.543,10.3185,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="true" id="" labelText="[%upper( &quot;area&quot; )%]" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="270" halign="1" valign="64" type="65641" position="285.027,205.886,mm" marginY="1" positionOnPage="285.027,205.886,mm" htmlState="0" blendMode="0" opacity="1" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" outlineWidthM="0.3,mm" zValue="3" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -11906,11 +12337,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem lineJoinStyle="miter" visibility="1" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" height="3" style="Single Box" frameJoinStyle="miter" numUnitsPerSegment="90" segmentSizeMode="1" itemRotation="0" outlineWidth="0.3" lineCapStyle="square" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" boxContentSpace="1" size="155.102,16.2165,mm" id="" type="65646" background="false" segmentMillimeters="28.5458" labelBarSpace="3" numSegments="4" positionLock="true" excludeFromExports="0" groupUuid="" maxBarWidth="150" numMapUnitsPerScaleBarUnit="1" zValue="2" alignment="0" unitType="meters" unitLabel="m" position="7,189.669,mm" blendMode="0" positionOnPage="7,189.669,mm" referencePoint="0" opacity="1" frame="false" numSegmentsLeft="2" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" outlineWidthM="0.3,mm" minBarWidth="50">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem background="false" segmentMillimeters="28.5458" unitType="meters" numMapUnitsPerScaleBarUnit="1" alignment="0" labelBarSpace="3" outlineWidth="0.3" blendMode="0" numSegments="4" id="" minBarWidth="50" type="65646" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" lineCapStyle="square" frameJoinStyle="miter" visibility="1" excludeFromExports="0" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" referencePoint="0" segmentSizeMode="1" itemRotation="0" size="155.102,16.2165,mm" lineJoinStyle="miter" maxBarWidth="150" zValue="2" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" unitLabel="m" boxContentSpace="1" positionOnPage="7,189.669,mm" opacity="1" positionLock="true" numSegmentsLeft="2" style="Single Box" position="7,189.669,mm" groupUuid="" outlineWidthM="0.3,mm" numUnitsPerSegment="90" frame="false" height="3">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -11921,18 +12352,18 @@ def my_form_open(dialog, layer, feature):
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontItalic="0" fontStrikeout="0" fontFamily="Myriad Pro" textOpacity="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" fontSizeUnit="Point" fontWeight="50" namedStyle="" fontCapitals="0" fontSize="12" fontUnderline="0" fontLetterSpacing="0" blendMode="0" multilineHeight="1">
-          <text-buffer bufferOpacity="1" bufferNoFill="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="0" shapeRotationType="0" shapeSizeX="0" shapeRadiiX="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-          <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+        <text-style fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" textOpacity="1" fontFamily="Myriad Pro" namedStyle="" fontSizeUnit="Point" textColor="0,0,0,255" blendMode="0" fontWordSpacing="0" fontCapitals="0" fontLetterSpacing="0" multilineHeight="1" fontSize="12" fontWeight="50">
+          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiY="0" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeDraw="0" shapeOpacity="1" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="0" shapeRadiiX="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
         </text-style>
-        <fillColor blue="0" green="0" red="0" alpha="255"/>
-        <fillColor2 blue="255" green="255" red="255" alpha="255"/>
-        <strokeColor blue="0" green="0" red="0" alpha="255"/>
+        <fillColor green="0" blue="0" alpha="255" red="0"/>
+        <fillColor2 green="255" blue="255" alpha="255" red="255"/>
+        <strokeColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="278.027,180.318,mm" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" keepLayerSet="false" position="7,5.5,mm" type="65639" drawCanvasItems="false" followPresetName="Start/Finish" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="1" labelMargin="0,mm" followPreset="true" visibility="1" referencePoint="0" opacity="1" mapRotation="330" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="7,5.5,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="278.027,180.318,mm" labelMargin="0,mm" frame="false" mapFlags="0" frameJoinStyle="miter" positionLock="true" id="" background="false" groupUuid="" referencePoint="0" visibility="1" keepLayerSet="false" excludeFromExports="0" itemRotation="0" type="65639" position="7,5.5,mm" positionOnPage="7,5.5,mm" mapRotation="330" blendMode="0" drawCanvasItems="false" opacity="1" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" outlineWidthM="0.3,mm" followPresetName="Start/Finish" followPreset="true" zValue="1" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -11959,12 +12390,12 @@ def my_form_open(dialog, layer, feature):
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmax="18.41790915398017958" ymin="-33.90494830469008747" ymax="-33.89880140828828559" xmin="18.40843143571575169"/>
+        <Extent ymax="-33.89880140828828559" xmax="18.41790915398017958" xmin="18.40843143571575169" ymin="-33.90494830469008747"/>
         <LayerSet/>
-        <ComposerMapGrid offsetY="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" gridFrameWidth="2" frameFillColor1="255,255,255,255" gridStyle="0" bottomFrameDivisions="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" gridFrameMargin="0" leftFrameDivisions="0" rightAnnotationPosition="1" rightAnnotationDirection="0" intervalY="5" frameFillColor2="0,0,0,255" leftAnnotationPosition="1" gridFrameSideFlags="15" topAnnotationDisplay="3" frameAnnotationDistance="1" annotationPrecision="3" offsetX="0" topAnnotationPosition="1" bottomAnnotationDirection="0" show="0" unit="1" rightAnnotationDisplay="3" intervalX="5" annotationFormat="4" gridFrameStyle="0" bottomAnnotationDisplay="3" blendMode="0" position="3" rightFrameDivisions="0" showAnnotation="0" topAnnotationDirection="0" crossLength="3" annotationFontColor="0,0,0,255" leftAnnotationDisplay="3" name="Grid 1" bottomAnnotationPosition="1" annotationExpression="" gridFramePenColor="0,0,0,255" topFrameDivisions="0">
+        <ComposerMapGrid topAnnotationDirection="0" gridFrameMargin="0" bottomAnnotationDirection="0" gridFrameSideFlags="15" annotationFontColor="0,0,0,255" crossLength="3" gridFramePenThickness="0.5" name="Grid 1" leftAnnotationDisplay="3" topFrameDivisions="0" showAnnotation="0" bottomFrameDivisions="0" topAnnotationDisplay="3" frameFillColor2="0,0,0,255" blendMode="0" gridFrameWidth="2" leftAnnotationDirection="0" annotationFormat="4" bottomAnnotationPosition="1" gridFramePenColor="0,0,0,255" annotationPrecision="3" offsetY="0" gridFrameStyle="0" topAnnotationPosition="1" frameFillColor1="255,255,255,255" rightAnnotationDirection="0" rightFrameDivisions="0" show="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" rightAnnotationDisplay="3" annotationExpression="" leftAnnotationPosition="1" unit="1" gridStyle="0" intervalY="5" offsetX="0" rightAnnotationPosition="1" intervalX="5" leftFrameDivisions="0" position="3" bottomAnnotationDisplay="3" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol name="" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <symbol force_rhr="0" name="" clip_to_extent="1" type="line" alpha="1">
+              <layer pass="0" locked="0" enabled="1" class="SimpleLine">
                 <prop k="capstyle" v="square"/>
                 <prop k="customdash" v="5;2"/>
                 <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -11992,8 +12423,8 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <symbol force_rhr="0" name="" clip_to_extent="1" type="marker" alpha="1">
+              <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
                 <prop k="angle" v="0"/>
                 <prop k="color" v="0,0,0,255"/>
                 <prop k="horizontal_anchor_point" v="1"/>
@@ -12034,40 +12465,40 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
           <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" atlasDriven="1" margin="0.05"/>
+        <AtlasMap margin="0.05" atlasDriven="1" scalingMode="2"/>
         <labelBlockingItems/>
       </LayoutItem>
       <customproperties>
-        <property key="atlasRasterFormat" value="png"/>
-        <property key="forceVector" value="0"/>
-        <property key="imageAntialias" value="true"/>
-        <property key="imageCropMarginBottom" value="0"/>
-        <property key="imageCropMarginLeft" value="0"/>
-        <property key="imageCropMarginRight" value="0"/>
-        <property key="imageCropMarginTop" value="0"/>
-        <property key="imageCropToContents" value="false"/>
-        <property key="pdfDisableRasterTiles" value="0"/>
-        <property key="pdfIncludeMetadata" value="1"/>
-        <property key="pdfTextFormat" value="0"/>
-        <property key="singleFile" value="true"/>
-        <property key="svgCropMarginBottom" value="0"/>
-        <property key="svgCropMarginLeft" value="0"/>
-        <property key="svgCropMarginRight" value="0"/>
-        <property key="svgCropMarginTop" value="0"/>
-        <property key="svgCropToContents" value="true"/>
-        <property key="svgDisableRasterTiles" value="0"/>
-        <property key="svgGroupLayers" value="false"/>
-        <property key="svgIncludeMetadata" value="1"/>
-        <property key="svgTextFormat" value="0"/>
+        <property value="png" key="atlasRasterFormat"/>
+        <property value="0" key="forceVector"/>
+        <property value="true" key="imageAntialias"/>
+        <property value="0" key="imageCropMarginBottom"/>
+        <property value="0" key="imageCropMarginLeft"/>
+        <property value="0" key="imageCropMarginRight"/>
+        <property value="0" key="imageCropMarginTop"/>
+        <property value="false" key="imageCropToContents"/>
+        <property value="0" key="pdfDisableRasterTiles"/>
+        <property value="1" key="pdfIncludeMetadata"/>
+        <property value="0" key="pdfTextFormat"/>
+        <property value="true" key="singleFile"/>
+        <property value="0" key="svgCropMarginBottom"/>
+        <property value="0" key="svgCropMarginLeft"/>
+        <property value="0" key="svgCropMarginRight"/>
+        <property value="0" key="svgCropMarginTop"/>
+        <property value="true" key="svgCropToContents"/>
+        <property value="0" key="svgDisableRasterTiles"/>
+        <property value="false" key="svgGroupLayers"/>
+        <property value="1" key="svgIncludeMetadata"/>
+        <property value="0" key="svgTextFormat"/>
       </customproperties>
-      <Atlas pageNameExpression="&quot;area&quot;" sortAscending="1" coverageLayerProvider="ogr" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" coverageLayerSource="/home/tim/Documents/GunRunMaps/GIS Base Map/start_finish_area.shp" coverageLayerName="start_finish_area" filenamePattern="'output_'||@atlas_featurenumber" sortKey="area" filterFeatures="0" enabled="1" sortFeatures="1" hideCoverage="1"/>
+      <Atlas pageNameExpression="&quot;area&quot;" coverageLayerProvider="ogr" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1" sortAscending="1" enabled="1" sortKey="area" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" coverageLayerName="start_finish_area" filterFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/start_finish_area.shp" hideCoverage="1"/>
     </Layout>
-    <Layout units="mm" printResolution="300" name="Fencing" worldFileMap="">
-      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
-      <Grid offsetX="0" resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm"/>
+    <Layout printResolution="300" worldFileMap="" name="Fencing" units="mm">
+      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
+      <Grid offsetUnits="mm" resolution="10" offsetX="0" offsetY="0" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+        <symbol force_rhr="0" name="" clip_to_extent="1" type="fill" alpha="1">
+          <layer pass="0" locked="0" enabled="1" class="SimpleFill">
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
             <prop k="joinstyle" v="miter"/>
@@ -12088,9 +12519,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem frame="false" size="297,210,mm" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" position="0,0,mm" type="65638" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" frameJoinStyle="miter" positionLock="false" background="true" outlineWidthM="0.3,mm" zValue="0" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" excludeFromExports="0" positionOnPage="0,0,mm" itemRotation="0" groupUuid="">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem size="297,210,mm" frame="false" frameJoinStyle="miter" positionLock="false" id="" background="true" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" type="65638" position="0,0,mm" positionOnPage="0,0,mm" blendMode="0" opacity="1" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" outlineWidthM="0.3,mm" zValue="0" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}">
+          <FrameColor green="0" blue="0" alpha="255" red="0"/>
+          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -12104,9 +12535,9 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem frame="false" size="148.46,7.36972,mm" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" marginX="1" position="6.76779,190.27,mm" type="65641" valign="64" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="11" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="FENCING: [% &quot;name&quot; %]" excludeFromExports="0" positionOnPage="6.76779,190.27,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="148.46,7.36972,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="true" id="" labelText="FENCING: [% &quot;name&quot; %]" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="1" valign="64" type="65641" position="6.76779,190.27,mm" marginY="1" positionOnPage="6.76779,190.27,mm" htmlState="0" blendMode="0" opacity="1" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" outlineWidthM="0.3,mm" zValue="11" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12118,11 +12549,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Semibold" description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="27.7839,7.51682,mm" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" marginX="1" position="211.295,197.64,mm" type="65641" valign="32" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="10" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="REVISION 2.3" excludeFromExports="0" positionOnPage="211.295,197.64,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="27.7839,7.51682,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="true" id="" labelText="REVISION 2.3" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="2" valign="32" type="65641" position="211.295,197.64,mm" marginY="1" positionOnPage="211.295,197.64,mm" htmlState="0" blendMode="0" opacity="1" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" outlineWidthM="0.3,mm" zValue="10" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12134,11 +12565,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="67.0856,7.80192,mm" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" marginX="1" position="115.637,198.083,mm" type="65641" valign="32" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="9" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="Total cones: [% &quot;cone_length&quot; %]m" excludeFromExports="0" positionOnPage="115.637,198.083,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="67.0856,7.80192,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="true" id="" labelText="Total cones: [% &quot;cone_length&quot; %]m" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="1" valign="32" type="65641" position="115.637,198.083,mm" marginY="1" positionOnPage="115.637,198.083,mm" htmlState="0" blendMode="0" opacity="1" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" outlineWidthM="0.3,mm" zValue="9" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12150,11 +12581,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="53.0017,7.80192,mm" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" marginX="1" position="59.5581,198.083,mm" type="65641" valign="32" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="8" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="Total fencing: [% &quot;fence_length&quot; %]m" excludeFromExports="0" positionOnPage="59.5581,198.083,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="53.0017,7.80192,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="true" id="" labelText="Total fencing: [% &quot;fence_length&quot; %]m" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="1" valign="32" type="65641" position="59.5581,198.083,mm" marginY="1" positionOnPage="59.5581,198.083,mm" htmlState="0" blendMode="0" opacity="1" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" outlineWidthM="0.3,mm" zValue="8" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12166,11 +12597,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="52.7903,7.80192,mm" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" marginX="1" position="6.76779,198.083,mm" type="65641" valign="32" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="7" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="Page [% @atlas_featurenumber %]" excludeFromExports="0" positionOnPage="6.76779,198.083,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="52.7903,7.80192,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="true" id="" labelText="Page [% @atlas_featurenumber %]" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="1" valign="32" type="65641" position="6.76779,198.083,mm" marginY="1" positionOnPage="6.76779,198.083,mm" htmlState="0" blendMode="0" opacity="1" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" outlineWidthM="0.3,mm" zValue="7" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12182,11 +12613,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="49.3143,29.8354,mm" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" position="243.098,175.353,mm" type="65640" pictureWidth="49.3143" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" pictureRotation="0" frameJoinStyle="miter" positionLock="true" anchorPoint="8" svgFillColor="255,255,255,255" background="false" resizeMode="0" outlineWidthM="0.3,mm" zValue="6" visibility="1" northMode="0" referencePoint="0" svgBorderWidth="0.2" opacity="1" id="" blendMode="0" northOffset="0" mapUuid="" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" excludeFromExports="0" pictureHeight="28.8527" positionOnPage="243.098,175.353,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="49.3143,29.8354,mm" northMode="0" frame="false" svgBorderColor="0,0,0,255" frameJoinStyle="miter" svgBorderWidth="0.2" pictureRotation="0" positionLock="true" id="" anchorPoint="8" mapUuid="" background="false" groupUuid="" referencePoint="0" visibility="1" pictureHeight="28.8527" svgFillColor="255,255,255,255" excludeFromExports="0" itemRotation="0" type="65640" file="../Gun_Run_Logo.png" position="243.098,175.353,mm" northOffset="0" positionOnPage="243.098,175.353,mm" blendMode="0" opacity="1" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" outlineWidthM="0.3,mm" resizeMode="0" pictureWidth="49.3143" zValue="6" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12204,9 +12635,9 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem frame="false" size="56.3557,7.36902,mm" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" marginX="1" position="182.723,190.271,mm" type="65641" valign="64" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="5" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="Sunday, 20 October 2019" excludeFromExports="0" positionOnPage="182.723,190.271,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="56.3557,7.36902,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="true" id="" labelText="Sunday, 20 October 2019" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="2" valign="64" type="65641" position="182.723,190.271,mm" marginY="1" positionOnPage="182.723,190.271,mm" htmlState="0" blendMode="0" opacity="1" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" outlineWidthM="0.3,mm" zValue="5" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12218,11 +12649,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="232.01,0.14328,mm" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" position="6.91779,197.79,mm" type="65643" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="4" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" cornerRadiusMeasure="0,mm" excludeFromExports="0" shapeType="1" positionOnPage="6.91779,197.79,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="232.01,0.14328,mm" frame="false" frameJoinStyle="miter" shapeType="1" positionLock="true" id="" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" type="65643" position="6.91779,197.79,mm" positionOnPage="6.91779,197.79,mm" blendMode="0" opacity="1" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" outlineWidthM="0.3,mm" cornerRadiusMeasure="0,mm" zValue="4" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12233,8 +12664,8 @@ def my_form_open(dialog, layer, feature):
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+        <symbol force_rhr="0" name="" clip_to_extent="1" type="fill" alpha="1">
+          <layer pass="0" locked="0" enabled="1" class="SimpleFill">
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
             <prop k="joinstyle" v="miter"/>
@@ -12256,9 +12687,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem lineJoinStyle="round" visibility="1" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" height="2" style="Double Box" frameJoinStyle="miter" numUnitsPerSegment="400" segmentSizeMode="1" itemRotation="0" outlineWidth="0.2" lineCapStyle="square" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" boxContentSpace="0.2" size="97.6157,15.8378,mm" id="" type="65646" background="false" segmentMillimeters="28.6552" labelBarSpace="1" numSegments="2" positionLock="true" excludeFromExports="0" groupUuid="" maxBarWidth="100" numMapUnitsPerScaleBarUnit="1" zValue="3" alignment="0" unitType="meters" unitLabel="m" position="6.76779,2.8482,mm" blendMode="0" positionOnPage="6.76779,2.8482,mm" referencePoint="0" opacity="1" frame="false" numSegmentsLeft="2" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" outlineWidthM="0.3,mm" minBarWidth="25">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem background="false" segmentMillimeters="28.6552" unitType="meters" numMapUnitsPerScaleBarUnit="1" alignment="0" labelBarSpace="1" outlineWidth="0.2" blendMode="0" numSegments="2" id="" minBarWidth="25" type="65646" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" lineCapStyle="square" frameJoinStyle="miter" visibility="1" excludeFromExports="0" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" referencePoint="0" segmentSizeMode="1" itemRotation="0" size="97.6157,15.8378,mm" lineJoinStyle="round" maxBarWidth="100" zValue="3" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" unitLabel="m" boxContentSpace="0.2" positionOnPage="6.76779,2.8482,mm" opacity="1" positionLock="true" numSegmentsLeft="2" style="Double Box" position="6.76779,2.8482,mm" groupUuid="" outlineWidthM="0.3,mm" numUnitsPerSegment="400" frame="false" height="2">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12269,18 +12700,18 @@ def my_form_open(dialog, layer, feature):
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontItalic="0" fontStrikeout="0" fontFamily="Myriad Pro" textOpacity="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" fontSizeUnit="Point" fontWeight="50" namedStyle="" fontCapitals="0" fontSize="12" fontUnderline="0" fontLetterSpacing="0" blendMode="0" multilineHeight="1">
-          <text-buffer bufferOpacity="1" bufferNoFill="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="0" shapeRotationType="0" shapeSizeX="0" shapeRadiiX="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-          <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+        <text-style fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" textOpacity="1" fontFamily="Myriad Pro" namedStyle="" fontSizeUnit="Point" textColor="0,0,0,255" blendMode="0" fontWordSpacing="0" fontCapitals="0" fontLetterSpacing="0" multilineHeight="1" fontSize="12" fontWeight="50">
+          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiY="0" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeDraw="0" shapeOpacity="1" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="0" shapeRadiiX="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
         </text-style>
-        <fillColor blue="0" green="0" red="0" alpha="255"/>
-        <fillColor2 blue="255" green="255" red="255" alpha="255"/>
-        <strokeColor blue="0" green="0" red="0" alpha="255"/>
+        <fillColor green="0" blue="0" alpha="255" red="0"/>
+        <fillColor2 green="255" blue="255" alpha="255" red="255"/>
+        <strokeColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem boxSpace="2" visibility="1" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" symbolAlignment="1" frameJoinStyle="miter" title="" wmsLegendHeight="25" itemRotation="0" splitLayer="0" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" equalColumnWidth="1" size="38.1563,54.9504,mm" id="" type="65642" lineSpacing="1" background="true" wrapChar="" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" positionLock="true" excludeFromExports="0" groupUuid="" zValue="2" rasterBorder="1" fontColor="#000000" position="256.808,2.9982,mm" blendMode="0" rasterBorderColor="0,0,0,255" positionOnPage="256.808,2.9982,mm" referencePoint="0" legendFilterByAtlas="0" opacity="1" frame="true" columnCount="1" titleAlignment="1" columnSpace="2" rasterBorderWidth="0" outlineWidthM="0.3,mm" wmsLegendWidth="50" symbolWidth="7" resizeToContents="0" symbolHeight="4">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem rasterBorderColor="0,0,0,255" background="true" lineSpacing="1" columnSpace="2" legendFilterByAtlas="0" symbolAlignment="1" blendMode="0" equalColumnWidth="1" symbolWidth="7" titleAlignment="1" id="" columnCount="1" type="65642" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" frameJoinStyle="miter" visibility="1" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" rasterBorderWidth="0" excludeFromExports="0" splitLayer="0" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" title="" wrapChar="" fontColor="#000000" referencePoint="0" rasterBorder="1" itemRotation="0" wmsLegendHeight="25" size="38.1563,54.9504,mm" wmsLegendWidth="50" resizeToContents="0" zValue="2" positionOnPage="256.808,2.9982,mm" symbolHeight="4" opacity="1" positionLock="true" position="256.808,2.9982,mm" groupUuid="" outlineWidthM="0.3,mm" frame="true" boxSpace="2">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12304,7 +12735,7 @@ def my_form_open(dialog, layer, feature):
           <style marginTop="2.5" alignment="1" name="symbol">
             <styleFont style="" description="Myriad Pro,9,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style marginTop="2" alignment="1" name="symbolLabel" marginLeft="2">
+          <style marginTop="2" marginLeft="2" alignment="1" name="symbolLabel">
             <styleFont style="Regular" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular"/>
           </style>
         </styles>
@@ -12312,28 +12743,28 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
           <layer-tree-group checked="Qt::Checked" name="Fencing and Cones" expanded="1">
             <customproperties/>
-            <layer-tree-layer source="./fencing.shp|layername=fencing" checked="Qt::Checked" name="fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr">
+            <layer-tree-layer source="./fencing.shp|layername=fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" checked="Qt::Checked" name="fencing" expanded="1">
               <customproperties>
-                <property key="legend/node-order" value="0,1,2"/>
-                <property key="legend/title-style" value="hidden"/>
+                <property value="0,1,2" key="legend/node-order"/>
+                <property value="hidden" key="legend/title-style"/>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
           <layer-tree-group checked="Qt::Checked" name="Routes" expanded="1">
             <customproperties/>
-            <layer-tree-layer source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" name="all_routes" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr">
+            <layer-tree-layer source="./all_routes.shp|layername=all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" checked="Qt::Checked" name="all_routes" expanded="1">
               <customproperties>
-                <property key="legend/node-order" value="1,2,3"/>
-                <property key="legend/title-style" value="hidden"/>
+                <property value="1,2,3" key="legend/node-order"/>
+                <property value="hidden" key="legend/title-style"/>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem frame="false" size="283.418,180.92,mm" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" keepLayerSet="false" position="6.76779,9.35102,mm" type="65639" drawCanvasItems="false" followPresetName="Fencing" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="1" labelMargin="0,mm" followPreset="true" visibility="1" referencePoint="0" opacity="0.9" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="6.76779,9.35102,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="283.418,180.92,mm" labelMargin="0,mm" frame="false" mapFlags="0" frameJoinStyle="miter" positionLock="true" id="" background="false" groupUuid="" referencePoint="0" visibility="1" keepLayerSet="false" excludeFromExports="0" itemRotation="0" type="65639" position="6.76779,9.35102,mm" positionOnPage="6.76779,9.35102,mm" mapRotation="0" blendMode="0" drawCanvasItems="false" opacity="0.9" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" outlineWidthM="0.3,mm" followPresetName="Fencing" followPreset="true" zValue="1" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12366,7 +12797,7 @@ def my_form_open(dialog, layer, feature):
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmax="18.4006299553904995" ymin="-33.94972755295310662" ymax="-33.92240721182624696" xmin="18.35783154382292537"/>
+        <Extent ymax="-33.92240721182624696" xmax="18.4006299553904995" xmin="18.35783154382292537" ymin="-33.94972755295310662"/>
         <crs>
           <spatialrefsys>
             <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
@@ -12380,10 +12811,10 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid offsetY="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" gridFrameWidth="2" frameFillColor1="255,255,255,255" gridStyle="0" bottomFrameDivisions="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" gridFrameMargin="0" leftFrameDivisions="0" rightAnnotationPosition="1" rightAnnotationDirection="0" intervalY="5" frameFillColor2="0,0,0,255" leftAnnotationPosition="1" gridFrameSideFlags="15" topAnnotationDisplay="3" frameAnnotationDistance="1" annotationPrecision="3" offsetX="0" topAnnotationPosition="1" bottomAnnotationDirection="0" show="0" unit="1" rightAnnotationDisplay="3" intervalX="5" annotationFormat="4" gridFrameStyle="0" bottomAnnotationDisplay="3" blendMode="0" position="3" rightFrameDivisions="0" showAnnotation="0" topAnnotationDirection="0" crossLength="3" annotationFontColor="0,0,0,255" leftAnnotationDisplay="3" name="Grid 1" bottomAnnotationPosition="1" annotationExpression="" gridFramePenColor="0,0,0,255" topFrameDivisions="0">
+        <ComposerMapGrid topAnnotationDirection="0" gridFrameMargin="0" bottomAnnotationDirection="0" gridFrameSideFlags="15" annotationFontColor="0,0,0,255" crossLength="3" gridFramePenThickness="0.5" name="Grid 1" leftAnnotationDisplay="3" topFrameDivisions="0" showAnnotation="0" bottomFrameDivisions="0" topAnnotationDisplay="3" frameFillColor2="0,0,0,255" blendMode="0" gridFrameWidth="2" leftAnnotationDirection="0" annotationFormat="4" bottomAnnotationPosition="1" gridFramePenColor="0,0,0,255" annotationPrecision="3" offsetY="0" gridFrameStyle="0" topAnnotationPosition="1" frameFillColor1="255,255,255,255" rightAnnotationDirection="0" rightFrameDivisions="0" show="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" rightAnnotationDisplay="3" annotationExpression="" leftAnnotationPosition="1" unit="1" gridStyle="0" intervalY="5" offsetX="0" rightAnnotationPosition="1" intervalX="5" leftFrameDivisions="0" position="3" bottomAnnotationDisplay="3" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol name="" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <symbol force_rhr="0" name="" clip_to_extent="1" type="line" alpha="1">
+              <layer pass="0" locked="0" enabled="1" class="SimpleLine">
                 <prop k="capstyle" v="square"/>
                 <prop k="customdash" v="5;2"/>
                 <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -12411,8 +12842,8 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <symbol force_rhr="0" name="" clip_to_extent="1" type="marker" alpha="1">
+              <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
                 <prop k="angle" v="0"/>
                 <prop k="color" v="0,0,0,255"/>
                 <prop k="horizontal_anchor_point" v="1"/>
@@ -12453,25 +12884,25 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
           <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" atlasDriven="1" margin="0.40000000000000002"/>
+        <AtlasMap margin="0.40000000000000002" atlasDriven="1" scalingMode="2"/>
         <labelBlockingItems/>
       </LayoutItem>
       <customproperties>
-        <property key="atlasRasterFormat" value="png"/>
-        <property key="forceVector" value="0"/>
-        <property key="pdfDisableRasterTiles" value="0"/>
-        <property key="pdfIncludeMetadata" value="1"/>
-        <property key="pdfTextFormat" value="0"/>
-        <property key="rasterize" value="true"/>
+        <property value="png" key="atlasRasterFormat"/>
+        <property value="0" key="forceVector"/>
+        <property value="0" key="pdfDisableRasterTiles"/>
+        <property value="1" key="pdfIncludeMetadata"/>
+        <property value="0" key="pdfTextFormat"/>
+        <property value="true" key="rasterize"/>
       </customproperties>
-      <Atlas pageNameExpression="&quot;name&quot;" sortAscending="1" coverageLayerProvider="virtual" coverageLayer="fence_groups_2daa8372_dd22_4979_afdf_08d74ee6b4b1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20[name],%20[group]%20FROM%20fencing%20GROUP%20BY%20%22group%22" coverageLayerName="fence_groups" filenamePattern="'output_'||@atlas_featurenumber" sortKey="group" filterFeatures="0" enabled="1" sortFeatures="1" hideCoverage="1"/>
+      <Atlas pageNameExpression="&quot;name&quot;" coverageLayerProvider="virtual" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1" sortAscending="1" enabled="1" sortKey="group" coverageLayer="fence_groups_2daa8372_dd22_4979_afdf_08d74ee6b4b1" coverageLayerName="fence_groups" filterFeatures="0" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20[name],%20[group]%20FROM%20fencing%20GROUP%20BY%20%22group%22" hideCoverage="1"/>
     </Layout>
-    <Layout units="mm" printResolution="144" name="Ask Me" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
-      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
-      <Grid offsetX="0" resolution="9" resUnits="mm" offsetY="0" offsetUnits="mm"/>
+    <Layout printResolution="144" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" name="Ask Me" units="mm">
+      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
+      <Grid offsetUnits="mm" resolution="9" offsetX="0" offsetY="0" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+        <symbol force_rhr="0" name="" clip_to_extent="1" type="fill" alpha="1">
+          <layer pass="0" locked="0" enabled="1" class="SimpleFill">
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
             <prop k="joinstyle" v="miter"/>
@@ -12492,9 +12923,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem frame="false" size="297,210,mm" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" position="0,0,mm" type="65638" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" frameJoinStyle="miter" positionLock="false" background="true" outlineWidthM="0.3,mm" zValue="0" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" excludeFromExports="0" positionOnPage="0,0,mm" itemRotation="0" groupUuid="">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem size="297,210,mm" frame="false" frameJoinStyle="miter" positionLock="false" id="" background="true" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" type="65638" position="0,0,mm" positionOnPage="0,0,mm" blendMode="0" opacity="1" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" outlineWidthM="0.3,mm" zValue="0" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}">
+          <FrameColor green="0" blue="0" alpha="255" red="0"/>
+          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -12507,12 +12938,12 @@ def my_form_open(dialog, layer, feature):
           </LayoutObject>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide units="mm" orientation="2" page="0" position="0"/>
+          <Guide page="0" orientation="2" position="0" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem frame="false" size="83.9998,10.4638,mm" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" marginX="1" position="4.43449,186.634,mm" type="65641" valign="64" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" htmlState="0" frameJoinStyle="miter" positionLock="false" background="false" outlineWidthM="0.3,mm" zValue="8" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="Directions to Start of Race" excludeFromExports="0" positionOnPage="4.43449,186.634,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="83.9998,10.4638,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="false" id="" labelText="Directions to Start of Race" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="1" valign="64" type="65641" position="4.43449,186.634,mm" marginY="1" positionOnPage="4.43449,186.634,mm" htmlState="0" blendMode="0" opacity="1" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" outlineWidthM="0.3,mm" zValue="8" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12524,11 +12955,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="48.2923,9.511,mm" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" marginX="1" position="4.43449,197.498,mm" type="65641" valign="32" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" htmlState="0" frameJoinStyle="miter" positionLock="false" background="false" outlineWidthM="0.3,mm" zValue="7" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="Gun Run" excludeFromExports="0" positionOnPage="4.43449,197.498,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="48.2923,9.511,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="false" id="" labelText="Gun Run" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="1" valign="32" type="65641" position="4.43449,197.498,mm" marginY="1" positionOnPage="4.43449,197.498,mm" htmlState="0" blendMode="0" opacity="1" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" outlineWidthM="0.3,mm" zValue="7" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12540,11 +12971,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem boxSpace="2" visibility="1" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" symbolAlignment="1" frameJoinStyle="round" title="" wmsLegendHeight="25" itemRotation="0" splitLayer="0" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" equalColumnWidth="0" size="59.0766,76,mm" id="" type="65642" lineSpacing="2" background="true" wrapChar="" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" positionLock="false" legendFilterByMap="1" excludeFromExports="0" groupUuid="" zValue="6" rasterBorder="1" fontColor="#000000" position="10.096,10.8563,mm" blendMode="0" rasterBorderColor="0,0,0,255" positionOnPage="10.096,10.8563,mm" referencePoint="0" legendFilterByAtlas="0" opacity="1" frame="true" columnCount="1" titleAlignment="1" columnSpace="0" rasterBorderWidth="0" outlineWidthM="0.3,mm" wmsLegendWidth="50" symbolWidth="9" resizeToContents="1" symbolHeight="5">
-        <FrameColor blue="139" green="139" red="139" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem rasterBorderColor="0,0,0,255" background="true" lineSpacing="2" columnSpace="0" legendFilterByAtlas="0" legendFilterByMap="1" symbolAlignment="1" blendMode="0" equalColumnWidth="0" symbolWidth="9" titleAlignment="1" id="" columnCount="1" type="65642" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" frameJoinStyle="round" visibility="1" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" rasterBorderWidth="0" excludeFromExports="0" splitLayer="0" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" title="" wrapChar="" fontColor="#000000" referencePoint="0" rasterBorder="1" itemRotation="0" wmsLegendHeight="25" size="59.0766,76,mm" wmsLegendWidth="50" resizeToContents="1" zValue="6" positionOnPage="10.096,10.8563,mm" symbolHeight="5" opacity="1" positionLock="false" position="10.096,10.8563,mm" groupUuid="" outlineWidthM="0.3,mm" frame="true" boxSpace="2">
+        <FrameColor green="139" blue="139" alpha="255" red="139"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12568,7 +12999,7 @@ def my_form_open(dialog, layer, feature):
           <style marginTop="2.5" alignment="1" name="symbol">
             <styleFont style="" description="Myriad Pro,12,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style marginTop="2.5" alignment="1" name="symbolLabel" marginLeft="3">
+          <style marginTop="2.5" marginLeft="3" alignment="1" name="symbolLabel">
             <styleFont style="Regular" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular"/>
           </style>
         </styles>
@@ -12576,34 +13007,34 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
           <layer-tree-group checked="Qt::Checked" name="Ask Me" expanded="1">
             <customproperties>
-              <property key="legend/title-style" value="hidden"/>
+              <property value="hidden" key="legend/title-style"/>
             </customproperties>
-            <layer-tree-layer source="./poi_labels.shp|layername=poi_labels" checked="Qt::Checked" name="poi_labels" expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" providerKey="ogr">
+            <layer-tree-layer source="./poi_labels.shp|layername=poi_labels" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" providerKey="ogr" checked="Qt::Checked" name="poi_labels" expanded="1">
               <customproperties>
-                <property key="legend/label-0" value="Start/Finish"/>
-                <property key="legend/label-1" value="Toilets"/>
-                <property key="legend/label-2" value="Tog Bag Drop-off"/>
-                <property key="legend/label-3" value="Road Closed to Cars"/>
-                <property key="legend/label-4" value="MyCiti Drop-off"/>
-                <property key="legend/label-5" value="Parking"/>
-                <property key="legend/title-style" value="hidden"/>
+                <property value="Start/Finish" key="legend/label-0"/>
+                <property value="Toilets" key="legend/label-1"/>
+                <property value="Tog Bag Drop-off" key="legend/label-2"/>
+                <property value="Road Closed to Cars" key="legend/label-3"/>
+                <property value="MyCiti Drop-off" key="legend/label-4"/>
+                <property value="Parking" key="legend/label-5"/>
+                <property value="hidden" key="legend/title-style"/>
               </customproperties>
             </layer-tree-layer>
-            <layer-tree-layer source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Checked" name="directions_to_start" expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" providerKey="ogr">
+            <layer-tree-layer source="./directions_to_start.shp|layername=directions_to_start" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" providerKey="ogr" checked="Qt::Checked" name="directions_to_start" expanded="1">
               <customproperties>
-                <property key="legend/label-0" value="To 21KM Start (06:30)"/>
-                <property key="legend/label-1" value="To 10KM Start (07:30)"/>
-                <property key="legend/label-2" value="To 5KM Start (08:30)"/>
-                <property key="legend/title-style" value="hidden"/>
+                <property value="To 21KM Start (06:30)" key="legend/label-0"/>
+                <property value="To 10KM Start (07:30)" key="legend/label-1"/>
+                <property value="To 5KM Start (08:30)" key="legend/label-2"/>
+                <property value="hidden" key="legend/title-style"/>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem frame="false" size="27.7839,6.871,mm" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" marginX="1" position="221.862,190.027,mm" type="65641" valign="32" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" htmlState="0" frameJoinStyle="miter" positionLock="false" background="false" outlineWidthM="0.3,mm" zValue="5" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="REVISION 1.0" excludeFromExports="0" positionOnPage="221.862,190.027,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="27.7839,6.871,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="false" id="" labelText="REVISION 1.0" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="2" valign="32" type="65641" position="221.862,190.027,mm" marginY="1" positionOnPage="221.862,190.027,mm" htmlState="0" blendMode="0" opacity="1" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" outlineWidthM="0.3,mm" zValue="5" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12615,11 +13046,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="51.6706,6.60801,mm" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" marginX="1" position="197.975,197.498,mm" type="65641" valign="64" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" htmlState="0" frameJoinStyle="miter" positionLock="false" background="false" outlineWidthM="0.3,mm" zValue="4" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="Sunday, 20 October 2019" excludeFromExports="0" positionOnPage="197.975,197.498,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="51.6706,6.60801,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="false" id="" labelText="Sunday, 20 October 2019" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="2" valign="64" type="65641" position="197.975,197.498,mm" marginY="1" positionOnPage="197.975,197.498,mm" htmlState="0" blendMode="0" opacity="1" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" outlineWidthM="0.3,mm" zValue="4" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12631,11 +13062,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="42.9838,24.3824,mm" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" position="249.646,179.724,mm" type="65640" pictureWidth="41.6737" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" pictureRotation="0" frameJoinStyle="miter" positionLock="false" anchorPoint="4" svgFillColor="255,255,255,255" background="false" resizeMode="0" outlineWidthM="0.3,mm" zValue="3" visibility="1" northMode="0" referencePoint="0" svgBorderWidth="0.2" opacity="1" id="" blendMode="0" northOffset="0" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" excludeFromExports="0" pictureHeight="24.3824" positionOnPage="249.646,179.724,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="42.9838,24.3824,mm" northMode="0" frame="false" svgBorderColor="0,0,0,255" frameJoinStyle="miter" svgBorderWidth="0.2" pictureRotation="0" positionLock="false" id="" anchorPoint="4" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" background="false" groupUuid="" referencePoint="0" visibility="1" pictureHeight="24.3824" svgFillColor="255,255,255,255" excludeFromExports="0" itemRotation="0" type="65640" file="../Gun_Run_Logo.png" position="249.646,179.724,mm" northOffset="0" positionOnPage="249.646,179.724,mm" blendMode="0" opacity="1" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" outlineWidthM="0.3,mm" resizeMode="0" pictureWidth="41.6737" zValue="3" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12653,9 +13084,9 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem frame="false" size="244.912,0.1,mm" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" position="4.58449,197.248,mm" type="65643" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" frameJoinStyle="miter" positionLock="false" background="false" outlineWidthM="0.3,mm" zValue="2" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" cornerRadiusMeasure="0,mm" excludeFromExports="0" shapeType="1" positionOnPage="4.58449,197.248,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="244.912,0.1,mm" frame="false" frameJoinStyle="miter" shapeType="1" positionLock="false" id="" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" type="65643" position="4.58449,197.248,mm" positionOnPage="4.58449,197.248,mm" blendMode="0" opacity="1" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" outlineWidthM="0.3,mm" cornerRadiusMeasure="0,mm" zValue="2" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12666,8 +13097,8 @@ def my_form_open(dialog, layer, feature):
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+        <symbol force_rhr="0" name="" clip_to_extent="1" type="fill" alpha="1">
+          <layer pass="0" locked="0" enabled="1" class="SimpleFill">
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
             <prop k="joinstyle" v="miter"/>
@@ -12689,9 +13120,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem frame="false" size="288.007,183.616,mm" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" keepLayerSet="false" position="4.43449,6.411,mm" type="65639" drawCanvasItems="false" followPresetName="Ask Me" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" frameJoinStyle="miter" positionLock="false" background="true" outlineWidthM="0.3,mm" zValue="1" labelMargin="0,mm" followPreset="true" visibility="1" referencePoint="0" opacity="1" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="4.43449,6.411,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="288.007,183.616,mm" labelMargin="0,mm" frame="false" mapFlags="0" frameJoinStyle="miter" positionLock="false" id="" background="true" groupUuid="" referencePoint="0" visibility="1" keepLayerSet="false" excludeFromExports="0" itemRotation="0" type="65639" position="4.43449,6.411,mm" positionOnPage="4.43449,6.411,mm" mapRotation="0" blendMode="0" drawCanvasItems="false" opacity="1" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" outlineWidthM="0.3,mm" followPresetName="Ask Me" followPreset="true" zValue="1" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12718,7 +13149,7 @@ def my_form_open(dialog, layer, feature):
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmax="18.41789384089274151" ymin="-33.90994364588821952" ymax="-33.8970204297764468" xmin="18.39762336729721071"/>
+        <Extent ymax="-33.8970204297764468" xmax="18.41789384089274151" xmin="18.39762336729721071" ymin="-33.90994364588821952"/>
         <crs>
           <spatialrefsys>
             <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
@@ -12732,10 +13163,10 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid offsetY="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFrameWidth="2" frameFillColor1="255,255,255,255" gridStyle="0" bottomFrameDivisions="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" gridFrameMargin="0" leftFrameDivisions="0" rightAnnotationPosition="1" rightAnnotationDirection="0" intervalY="0" frameFillColor2="0,0,0,255" leftAnnotationPosition="1" gridFrameSideFlags="15" topAnnotationDisplay="0" frameAnnotationDistance="1" annotationPrecision="3" offsetX="0" topAnnotationPosition="1" bottomAnnotationDirection="0" show="0" unit="0" rightAnnotationDisplay="0" intervalX="0" annotationFormat="0" gridFrameStyle="0" bottomAnnotationDisplay="0" blendMode="0" position="3" rightFrameDivisions="0" showAnnotation="0" topAnnotationDirection="0" crossLength="3" annotationFontColor="0,0,0,255" leftAnnotationDisplay="0" name="Grid 1" bottomAnnotationPosition="1" annotationExpression="" gridFramePenColor="0,0,0,255" topFrameDivisions="0">
+        <ComposerMapGrid topAnnotationDirection="0" gridFrameMargin="0" bottomAnnotationDirection="0" gridFrameSideFlags="15" annotationFontColor="0,0,0,255" crossLength="3" gridFramePenThickness="0.5" name="Grid 1" leftAnnotationDisplay="0" topFrameDivisions="0" showAnnotation="0" bottomFrameDivisions="0" topAnnotationDisplay="0" frameFillColor2="0,0,0,255" blendMode="0" gridFrameWidth="2" leftAnnotationDirection="0" annotationFormat="0" bottomAnnotationPosition="1" gridFramePenColor="0,0,0,255" annotationPrecision="3" offsetY="0" gridFrameStyle="0" topAnnotationPosition="1" frameFillColor1="255,255,255,255" rightAnnotationDirection="0" rightFrameDivisions="0" show="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rightAnnotationDisplay="0" annotationExpression="" leftAnnotationPosition="1" unit="0" gridStyle="0" intervalY="0" offsetX="0" rightAnnotationPosition="1" intervalX="0" leftFrameDivisions="0" position="3" bottomAnnotationDisplay="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol name="" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <symbol force_rhr="0" name="" clip_to_extent="1" type="line" alpha="1">
+              <layer pass="0" locked="0" enabled="1" class="SimpleLine">
                 <prop k="capstyle" v="square"/>
                 <prop k="customdash" v="5;2"/>
                 <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -12763,8 +13194,8 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <symbol force_rhr="0" name="" clip_to_extent="1" type="marker" alpha="1">
+              <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
                 <prop k="angle" v="0"/>
                 <prop k="color" v="0,0,0,255"/>
                 <prop k="horizontal_anchor_point" v="1"/>
@@ -12795,31 +13226,31 @@ def my_form_open(dialog, layer, feature):
           </markerStyle>
           <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
       </LayoutItem>
       <customproperties>
-        <property key="atlasRasterFormat" value="png"/>
-        <property key="forceVector" value="0"/>
-        <property key="imageAntialias" value="true"/>
-        <property key="imageCropMarginBottom" value="0"/>
-        <property key="imageCropMarginLeft" value="0"/>
-        <property key="imageCropMarginRight" value="0"/>
-        <property key="imageCropMarginTop" value="0"/>
-        <property key="imageCropToContents" value="false"/>
-        <property key="pdfDisableRasterTiles" value="0"/>
-        <property key="pdfIncludeMetadata" value="1"/>
-        <property key="pdfTextFormat" value="0"/>
-        <property key="singleFile" value="true"/>
+        <property value="png" key="atlasRasterFormat"/>
+        <property value="0" key="forceVector"/>
+        <property value="true" key="imageAntialias"/>
+        <property value="0" key="imageCropMarginBottom"/>
+        <property value="0" key="imageCropMarginLeft"/>
+        <property value="0" key="imageCropMarginRight"/>
+        <property value="0" key="imageCropMarginTop"/>
+        <property value="false" key="imageCropToContents"/>
+        <property value="0" key="pdfDisableRasterTiles"/>
+        <property value="1" key="pdfIncludeMetadata"/>
+        <property value="0" key="pdfTextFormat"/>
+        <property value="true" key="singleFile"/>
       </customproperties>
-      <Atlas pageNameExpression="" coverageLayer="" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" filterFeatures="0" enabled="0" sortFeatures="0" hideCoverage="0"/>
+      <Atlas pageNameExpression="" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" sortFeatures="0" enabled="0" coverageLayer="" filterFeatures="0" hideCoverage="0"/>
     </Layout>
-    <Layout units="mm" printResolution="144" name="All Routes" worldFileMap="">
-      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
-      <Grid offsetX="0" resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm"/>
+    <Layout printResolution="144" worldFileMap="" name="All Routes" units="mm">
+      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
+      <Grid offsetUnits="mm" resolution="10" offsetX="0" offsetY="0" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+        <symbol force_rhr="0" name="" clip_to_extent="1" type="fill" alpha="1">
+          <layer pass="0" locked="0" enabled="1" class="SimpleFill">
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
             <prop k="joinstyle" v="miter"/>
@@ -12840,9 +13271,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem frame="false" size="297,210,mm" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" position="0,0,mm" type="65638" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" frameJoinStyle="miter" positionLock="false" background="true" outlineWidthM="0.3,mm" zValue="0" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" excludeFromExports="0" positionOnPage="0,0,mm" itemRotation="0" groupUuid="">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem size="297,210,mm" frame="false" frameJoinStyle="miter" positionLock="false" id="" background="true" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" type="65638" position="0,0,mm" positionOnPage="0,0,mm" blendMode="0" opacity="1" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" outlineWidthM="0.3,mm" zValue="0" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}">
+          <FrameColor green="0" blue="0" alpha="255" red="0"/>
+          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -12855,12 +13286,12 @@ def my_form_open(dialog, layer, feature):
           </LayoutObject>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide units="mm" orientation="2" page="0" position="0"/>
+          <Guide page="0" orientation="2" position="0" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem frame="false" size="57.4836,6.8714,mm" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" marginX="1" position="204.225,191.81,mm" type="65641" valign="64" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="6" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="REVISION 1.6" excludeFromExports="0" positionOnPage="204.225,191.81,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="57.4836,6.8714,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="true" id="" labelText="REVISION 1.6" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="2" valign="64" type="65641" position="204.225,191.81,mm" marginY="1" positionOnPage="204.225,191.81,mm" htmlState="0" blendMode="0" opacity="1" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" outlineWidthM="0.3,mm" zValue="6" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12872,11 +13303,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="51.6706,6.60801,mm" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" marginX="1" position="210.038,199.082,mm" type="65641" valign="64" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="5" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="Sunday, 20 October 2019" excludeFromExports="0" positionOnPage="210.038,199.082,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="51.6706,6.60801,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="true" id="" labelText="Sunday, 20 October 2019" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="2" valign="64" type="65641" position="210.038,199.082,mm" marginY="1" positionOnPage="210.038,199.082,mm" htmlState="0" blendMode="0" opacity="1" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" outlineWidthM="0.3,mm" zValue="5" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12888,11 +13319,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="29.7523,17.4718,mm" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" position="262.196,188.218,mm" type="65640" pictureWidth="29.7523" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" pictureRotation="0" frameJoinStyle="miter" positionLock="true" anchorPoint="4" svgFillColor="255,255,255,255" background="false" resizeMode="0" outlineWidthM="0.3,mm" zValue="4" visibility="1" northMode="0" referencePoint="0" svgBorderWidth="0.2" opacity="1" id="" blendMode="0" northOffset="0" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" excludeFromExports="0" pictureHeight="17.4074" positionOnPage="262.196,188.218,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="29.7523,17.4718,mm" northMode="0" frame="false" svgBorderColor="0,0,0,255" frameJoinStyle="miter" svgBorderWidth="0.2" pictureRotation="0" positionLock="true" id="" anchorPoint="4" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" background="false" groupUuid="" referencePoint="0" visibility="1" pictureHeight="17.4074" svgFillColor="255,255,255,255" excludeFromExports="0" itemRotation="0" type="65640" file="../Gun_Run_Logo.png" position="262.196,188.218,mm" northOffset="0" positionOnPage="262.196,188.218,mm" blendMode="0" opacity="1" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" outlineWidthM="0.3,mm" resizeMode="0" pictureWidth="29.7523" zValue="4" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12910,9 +13341,9 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem frame="false" size="251.959,0.1,mm" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" position="9.59946,198.832,mm" type="65643" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="3" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" cornerRadiusMeasure="0,mm" excludeFromExports="0" shapeType="1" positionOnPage="9.59946,198.832,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="251.959,0.1,mm" frame="false" frameJoinStyle="miter" shapeType="1" positionLock="true" id="" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" type="65643" position="9.59946,198.832,mm" positionOnPage="9.59946,198.832,mm" blendMode="0" opacity="1" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" outlineWidthM="0.3,mm" cornerRadiusMeasure="0,mm" zValue="3" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12923,8 +13354,8 @@ def my_form_open(dialog, layer, feature):
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+        <symbol force_rhr="0" name="" clip_to_extent="1" type="fill" alpha="1">
+          <layer pass="0" locked="0" enabled="1" class="SimpleFill">
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
             <prop k="joinstyle" v="miter"/>
@@ -12946,9 +13377,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem frame="true" size="67.7828,166.874,mm" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" keepLayerSet="false" position="5.86559,4.09761,mm" type="65639" drawCanvasItems="false" followPresetName="Routes" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" frameJoinStyle="miter" positionLock="true" background="true" outlineWidthM="0.3,mm" zValue="2" labelMargin="0,mm" followPreset="false" visibility="1" referencePoint="0" opacity="1" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="5.86559,4.09761,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="67.7828,166.874,mm" labelMargin="0,mm" frame="true" mapFlags="0" frameJoinStyle="miter" positionLock="true" id="" background="true" groupUuid="" referencePoint="0" visibility="1" keepLayerSet="false" excludeFromExports="0" itemRotation="0" type="65639" position="5.86559,4.09761,mm" positionOnPage="5.86559,4.09761,mm" mapRotation="0" blendMode="0" drawCanvasItems="false" opacity="1" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" outlineWidthM="0.3,mm" followPresetName="Routes" followPreset="false" zValue="2" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12990,12 +13421,12 @@ def my_form_open(dialog, layer, feature):
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmax="18.38563681624126289" ymin="-33.94652930000000168" ymax="-33.91513741583252539" xmin="18.37288570000000121"/>
+        <Extent ymax="-33.91513741583252539" xmax="18.38563681624126289" xmin="18.37288570000000121" ymin="-33.94652930000000168"/>
         <LayerSet/>
-        <ComposerMapGrid offsetY="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" gridFrameWidth="2" frameFillColor1="255,255,255,255" gridStyle="0" bottomFrameDivisions="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" gridFrameMargin="0" leftFrameDivisions="0" rightAnnotationPosition="1" rightAnnotationDirection="0" intervalY="0" frameFillColor2="0,0,0,255" leftAnnotationPosition="1" gridFrameSideFlags="15" topAnnotationDisplay="0" frameAnnotationDistance="1" annotationPrecision="3" offsetX="0" topAnnotationPosition="1" bottomAnnotationDirection="0" show="0" unit="0" rightAnnotationDisplay="0" intervalX="0" annotationFormat="0" gridFrameStyle="0" bottomAnnotationDisplay="0" blendMode="0" position="3" rightFrameDivisions="0" showAnnotation="0" topAnnotationDirection="0" crossLength="3" annotationFontColor="0,0,0,255" leftAnnotationDisplay="0" name="Grid 1" bottomAnnotationPosition="1" annotationExpression="" gridFramePenColor="0,0,0,255" topFrameDivisions="0">
+        <ComposerMapGrid topAnnotationDirection="0" gridFrameMargin="0" bottomAnnotationDirection="0" gridFrameSideFlags="15" annotationFontColor="0,0,0,255" crossLength="3" gridFramePenThickness="0.5" name="Grid 1" leftAnnotationDisplay="0" topFrameDivisions="0" showAnnotation="0" bottomFrameDivisions="0" topAnnotationDisplay="0" frameFillColor2="0,0,0,255" blendMode="0" gridFrameWidth="2" leftAnnotationDirection="0" annotationFormat="0" bottomAnnotationPosition="1" gridFramePenColor="0,0,0,255" annotationPrecision="3" offsetY="0" gridFrameStyle="0" topAnnotationPosition="1" frameFillColor1="255,255,255,255" rightAnnotationDirection="0" rightFrameDivisions="0" show="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" rightAnnotationDisplay="0" annotationExpression="" leftAnnotationPosition="1" unit="0" gridStyle="0" intervalY="0" offsetX="0" rightAnnotationPosition="1" intervalX="0" leftFrameDivisions="0" position="3" bottomAnnotationDisplay="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol name="" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <symbol force_rhr="0" name="" clip_to_extent="1" type="line" alpha="1">
+              <layer pass="0" locked="0" enabled="1" class="SimpleLine">
                 <prop k="capstyle" v="square"/>
                 <prop k="customdash" v="5;2"/>
                 <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -13023,8 +13454,8 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <symbol force_rhr="0" name="" clip_to_extent="1" type="marker" alpha="1">
+              <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
                 <prop k="angle" v="0"/>
                 <prop k="color" v="0,0,0,255"/>
                 <prop k="horizontal_anchor_point" v="1"/>
@@ -13055,12 +13486,12 @@ def my_form_open(dialog, layer, feature):
           </markerStyle>
           <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.05"/>
+        <AtlasMap margin="0.05" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutItem frame="true" size="282.012,182.649,mm" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" keepLayerSet="false" position="9.44946,9.08557,mm" type="65639" drawCanvasItems="false" followPresetName="Routes" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" frameJoinStyle="round" positionLock="true" background="true" outlineWidthM="0.15,mm" zValue="1" labelMargin="0,mm" followPreset="false" visibility="1" referencePoint="0" opacity="1" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="9.44946,9.08557,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="282.012,182.649,mm" labelMargin="0,mm" frame="true" mapFlags="0" frameJoinStyle="round" positionLock="true" id="" background="true" groupUuid="" referencePoint="0" visibility="1" keepLayerSet="false" excludeFromExports="0" itemRotation="0" type="65639" position="9.44946,9.08557,mm" positionOnPage="9.44946,9.08557,mm" mapRotation="0" blendMode="0" drawCanvasItems="false" opacity="1" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" outlineWidthM="0.15,mm" followPresetName="Routes" followPreset="false" zValue="1" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -13087,12 +13518,12 @@ def my_form_open(dialog, layer, feature):
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmax="18.42103445111282056" ymin="-33.92999999999999972" ymax="-33.89565141814492932" xmin="18.36799999999999855"/>
+        <Extent ymax="-33.89565141814492932" xmax="18.42103445111282056" xmin="18.36799999999999855" ymin="-33.92999999999999972"/>
         <LayerSet/>
-        <ComposerMapGrid offsetY="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFrameWidth="2" frameFillColor1="255,255,255,255" gridStyle="0" bottomFrameDivisions="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" gridFrameMargin="0" leftFrameDivisions="0" rightAnnotationPosition="1" rightAnnotationDirection="0" intervalY="0" frameFillColor2="0,0,0,255" leftAnnotationPosition="1" gridFrameSideFlags="15" topAnnotationDisplay="0" frameAnnotationDistance="1" annotationPrecision="3" offsetX="0" topAnnotationPosition="1" bottomAnnotationDirection="0" show="0" unit="0" rightAnnotationDisplay="0" intervalX="0" annotationFormat="0" gridFrameStyle="0" bottomAnnotationDisplay="0" blendMode="0" position="3" rightFrameDivisions="0" showAnnotation="0" topAnnotationDirection="0" crossLength="3" annotationFontColor="0,0,0,255" leftAnnotationDisplay="0" name="Grid 1" bottomAnnotationPosition="1" annotationExpression="" gridFramePenColor="0,0,0,255" topFrameDivisions="0">
+        <ComposerMapGrid topAnnotationDirection="0" gridFrameMargin="0" bottomAnnotationDirection="0" gridFrameSideFlags="15" annotationFontColor="0,0,0,255" crossLength="3" gridFramePenThickness="0.5" name="Grid 1" leftAnnotationDisplay="0" topFrameDivisions="0" showAnnotation="0" bottomFrameDivisions="0" topAnnotationDisplay="0" frameFillColor2="0,0,0,255" blendMode="0" gridFrameWidth="2" leftAnnotationDirection="0" annotationFormat="0" bottomAnnotationPosition="1" gridFramePenColor="0,0,0,255" annotationPrecision="3" offsetY="0" gridFrameStyle="0" topAnnotationPosition="1" frameFillColor1="255,255,255,255" rightAnnotationDirection="0" rightFrameDivisions="0" show="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rightAnnotationDisplay="0" annotationExpression="" leftAnnotationPosition="1" unit="0" gridStyle="0" intervalY="0" offsetX="0" rightAnnotationPosition="1" intervalX="0" leftFrameDivisions="0" position="3" bottomAnnotationDisplay="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol name="" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <symbol force_rhr="0" name="" clip_to_extent="1" type="line" alpha="1">
+              <layer pass="0" locked="0" enabled="1" class="SimpleLine">
                 <prop k="capstyle" v="square"/>
                 <prop k="customdash" v="5;2"/>
                 <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -13120,8 +13551,8 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <symbol force_rhr="0" name="" clip_to_extent="1" type="marker" alpha="1">
+              <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
                 <prop k="angle" v="0"/>
                 <prop k="color" v="0,0,0,255"/>
                 <prop k="horizontal_anchor_point" v="1"/>
@@ -13152,31 +13583,31 @@ def my_form_open(dialog, layer, feature):
           </markerStyle>
           <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
       </LayoutItem>
       <customproperties>
-        <property key="atlasRasterFormat" value="png"/>
-        <property key="forceVector" value="0"/>
-        <property key="imageAntialias" value="true"/>
-        <property key="imageCropMarginBottom" value="0"/>
-        <property key="imageCropMarginLeft" value="0"/>
-        <property key="imageCropMarginRight" value="0"/>
-        <property key="imageCropMarginTop" value="0"/>
-        <property key="imageCropToContents" value="false"/>
-        <property key="pdfDisableRasterTiles" value="0"/>
-        <property key="pdfIncludeMetadata" value="1"/>
-        <property key="pdfTextFormat" value="0"/>
-        <property key="singleFile" value="true"/>
+        <property value="png" key="atlasRasterFormat"/>
+        <property value="0" key="forceVector"/>
+        <property value="true" key="imageAntialias"/>
+        <property value="0" key="imageCropMarginBottom"/>
+        <property value="0" key="imageCropMarginLeft"/>
+        <property value="0" key="imageCropMarginRight"/>
+        <property value="0" key="imageCropMarginTop"/>
+        <property value="false" key="imageCropToContents"/>
+        <property value="0" key="pdfDisableRasterTiles"/>
+        <property value="1" key="pdfIncludeMetadata"/>
+        <property value="0" key="pdfTextFormat"/>
+        <property value="true" key="singleFile"/>
       </customproperties>
-      <Atlas pageNameExpression="&quot;Distance&quot;" sortAscending="0" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21)' )" coverageLayer="" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortKey="length_m" filterFeatures="1" enabled="0" sortFeatures="1" hideCoverage="0"/>
+      <Atlas pageNameExpression="&quot;Distance&quot;" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortFeatures="1" sortAscending="0" enabled="0" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21)' )" sortKey="length_m" coverageLayer="" filterFeatures="1" hideCoverage="0"/>
     </Layout>
-    <Layout units="mm" printResolution="120" name="Marshal Plan A1" worldFileMap="">
-      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
-      <Grid offsetX="0" resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm"/>
+    <Layout printResolution="120" worldFileMap="" name="Marshal Plan A1" units="mm">
+      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
+      <Grid offsetUnits="mm" resolution="10" offsetX="0" offsetY="0" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+        <symbol force_rhr="0" name="" clip_to_extent="1" type="fill" alpha="1">
+          <layer pass="0" locked="0" enabled="1" class="SimpleFill">
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
             <prop k="joinstyle" v="miter"/>
@@ -13197,9 +13628,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem frame="false" size="594,841,mm" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" position="0,0,mm" type="65638" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" frameJoinStyle="miter" positionLock="false" background="true" outlineWidthM="0.3,mm" zValue="0" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" excludeFromExports="0" positionOnPage="0,0,mm" itemRotation="0" groupUuid="">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem size="594,841,mm" frame="false" frameJoinStyle="miter" positionLock="false" id="" background="true" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" type="65638" position="0,0,mm" positionOnPage="0,0,mm" blendMode="0" opacity="1" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" outlineWidthM="0.3,mm" zValue="0" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}">
+          <FrameColor green="0" blue="0" alpha="255" red="0"/>
+          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -13213,9 +13644,9 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem boxSpace="2" visibility="1" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" symbolAlignment="1" frameJoinStyle="miter" title="" wmsLegendHeight="25" itemRotation="0" splitLayer="0" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" equalColumnWidth="1" size="18.6109,9,mm" id="" type="65642" lineSpacing="1" background="true" wrapChar="" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" positionLock="true" excludeFromExports="0" groupUuid="" zValue="8" rasterBorder="1" fontColor="#000000" position="25.5925,18.7971,mm" blendMode="0" rasterBorderColor="0,0,0,255" positionOnPage="25.5925,18.7971,mm" referencePoint="0" legendFilterByAtlas="0" opacity="1" frame="false" columnCount="1" titleAlignment="1" columnSpace="2" rasterBorderWidth="0" outlineWidthM="0.3,mm" wmsLegendWidth="50" symbolWidth="7" resizeToContents="1" symbolHeight="4">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem rasterBorderColor="0,0,0,255" background="true" lineSpacing="1" columnSpace="2" legendFilterByAtlas="0" symbolAlignment="1" blendMode="0" equalColumnWidth="1" symbolWidth="7" titleAlignment="1" id="" columnCount="1" type="65642" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" frameJoinStyle="miter" visibility="1" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" rasterBorderWidth="0" excludeFromExports="0" splitLayer="0" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" title="" wrapChar="" fontColor="#000000" referencePoint="0" rasterBorder="1" itemRotation="0" wmsLegendHeight="25" size="18.6109,9,mm" wmsLegendWidth="50" resizeToContents="1" zValue="8" positionOnPage="25.5925,18.7971,mm" symbolHeight="4" opacity="1" positionLock="true" position="25.5925,18.7971,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" boxSpace="2">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -13239,7 +13670,7 @@ def my_form_open(dialog, layer, feature):
           <style marginTop="2" alignment="1" name="symbol">
             <styleFont style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style marginTop="2" alignment="1" name="symbolLabel" marginLeft="2">
+          <style marginTop="2" marginLeft="2" alignment="1" name="symbolLabel">
             <styleFont style="Semibold" description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
         </styles>
@@ -13247,21 +13678,21 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
           <layer-tree-group checked="Qt::Checked" name="Routes" expanded="1">
             <customproperties/>
-            <layer-tree-layer checked="Qt::Checked" name="all_routes" expanded="1" id="all_routes20170907054841602">
+            <layer-tree-layer id="all_routes20170907054841602" checked="Qt::Checked" name="all_routes" expanded="1">
               <customproperties>
-                <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"/>
+                <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"/>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem frame="false" size="91.9494,15.0649,mm" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" marginX="1" position="5.2963,808.939,mm" type="65641" valign="64" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="7" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="MARSHAL POSITIONS" excludeFromExports="0" positionOnPage="5.2963,808.939,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="91.9494,15.0649,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="true" id="" labelText="MARSHAL POSITIONS" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="1" valign="64" type="65641" position="5.2963,808.939,mm" marginY="1" positionOnPage="5.2963,808.939,mm" htmlState="0" blendMode="0" opacity="1" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" outlineWidthM="0.3,mm" zValue="7" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -13273,11 +13704,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Semibold" description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="56.6212,15.3656,mm" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" marginX="1" position="430.403,825.052,mm" type="65641" valign="32" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="5" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="REVISION 0.91" excludeFromExports="0" positionOnPage="430.403,825.052,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="56.6212,15.3656,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="true" id="" labelText="REVISION 0.91" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="2" valign="32" type="65641" position="430.403,825.052,mm" marginY="1" positionOnPage="430.403,825.052,mm" htmlState="0" blendMode="0" opacity="1" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" outlineWidthM="0.3,mm" zValue="5" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -13289,11 +13720,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="114.848,15.0635,mm" uuid="{d177957c-7ab6-40ae-8769-347428500538}" marginX="1" position="372.175,808.942,mm" type="65641" valign="64" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="4" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="Sunday, 20 October 2019" excludeFromExports="0" positionOnPage="372.175,808.942,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="114.848,15.0635,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="true" id="" labelText="Sunday, 20 October 2019" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="2" valign="64" type="65641" position="372.175,808.942,mm" marginY="1" positionOnPage="372.175,808.942,mm" htmlState="0" blendMode="0" opacity="1" uuid="{d177957c-7ab6-40ae-8769-347428500538}" outlineWidthM="0.3,mm" zValue="4" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -13305,11 +13736,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="100.498,63.9757,mm" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" position="489.557,775.395,mm" type="65640" pictureWidth="100.498" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" pictureRotation="0" frameJoinStyle="miter" positionLock="true" anchorPoint="8" svgFillColor="255,255,255,255" background="false" resizeMode="0" outlineWidthM="0.3,mm" zValue="3" visibility="1" northMode="0" referencePoint="0" svgBorderWidth="0.2" opacity="1" id="" blendMode="0" northOffset="0" mapUuid="" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" excludeFromExports="0" pictureHeight="58.7992" positionOnPage="489.557,775.395,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="100.498,63.9757,mm" northMode="0" frame="false" svgBorderColor="0,0,0,255" frameJoinStyle="miter" svgBorderWidth="0.2" pictureRotation="0" positionLock="true" id="" anchorPoint="8" mapUuid="" background="false" groupUuid="" referencePoint="0" visibility="1" pictureHeight="58.7992" svgFillColor="255,255,255,255" excludeFromExports="0" itemRotation="0" type="65640" file="../Gun_Run_Logo.png" position="489.557,775.395,mm" northOffset="0" positionOnPage="489.557,775.395,mm" blendMode="0" opacity="1" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" outlineWidthM="0.3,mm" resizeMode="0" pictureWidth="100.498" zValue="3" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -13327,9 +13758,9 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem frame="false" size="481.428,0.606138,mm" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" position="5.4463,824.155,mm" type="65643" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="2" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" cornerRadiusMeasure="0,mm" excludeFromExports="0" shapeType="1" positionOnPage="5.4463,824.155,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="481.428,0.606138,mm" frame="false" frameJoinStyle="miter" shapeType="1" positionLock="true" id="" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" type="65643" position="5.4463,824.155,mm" positionOnPage="5.4463,824.155,mm" blendMode="0" opacity="1" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" outlineWidthM="0.3,mm" cornerRadiusMeasure="0,mm" zValue="2" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -13340,8 +13771,8 @@ def my_form_open(dialog, layer, feature):
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+        <symbol force_rhr="0" name="" clip_to_extent="1" type="fill" alpha="1">
+          <layer pass="0" locked="0" enabled="1" class="SimpleFill">
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
             <prop k="joinstyle" v="miter"/>
@@ -13363,9 +13794,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem frame="true" size="584.759,811.213,mm" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" keepLayerSet="false" position="3.94474,5.25965,mm" type="65639" drawCanvasItems="false" followPresetName="Marshal overview" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" frameJoinStyle="miter" positionLock="true" background="true" outlineWidthM="0.3,mm" zValue="1" labelMargin="0,mm" followPreset="true" visibility="1" referencePoint="0" opacity="1" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="3.94474,5.25965,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="584.759,811.213,mm" labelMargin="0,mm" frame="true" mapFlags="0" frameJoinStyle="miter" positionLock="true" id="" background="true" groupUuid="" referencePoint="0" visibility="1" keepLayerSet="false" excludeFromExports="0" itemRotation="0" type="65639" position="3.94474,5.25965,mm" positionOnPage="3.94474,5.25965,mm" mapRotation="0" blendMode="0" drawCanvasItems="false" opacity="1" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" outlineWidthM="0.3,mm" followPresetName="Marshal overview" followPreset="true" zValue="1" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -13392,26 +13823,26 @@ def my_form_open(dialog, layer, feature):
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmax="18.42299397558693741" ymin="-33.95821655848814657" ymax="-33.89072661913806428" xmin="18.37434415142052657"/>
+        <Extent ymax="-33.89072661913806428" xmax="18.42299397558693741" xmin="18.37434415142052657" ymin="-33.95821655848814657"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" atlasDriven="0" margin="0"/>
+        <AtlasMap margin="0" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
       </LayoutItem>
       <customproperties>
-        <property key="atlasRasterFormat" value="png"/>
-        <property key="forceVector" value="0"/>
-        <property key="pdfDisableRasterTiles" value="0"/>
-        <property key="pdfIncludeMetadata" value="1"/>
-        <property key="pdfTextFormat" value="0"/>
+        <property value="png" key="atlasRasterFormat"/>
+        <property value="0" key="forceVector"/>
+        <property value="0" key="pdfDisableRasterTiles"/>
+        <property value="1" key="pdfIncludeMetadata"/>
+        <property value="0" key="pdfTextFormat"/>
       </customproperties>
-      <Atlas pageNameExpression="&quot;page&quot;" sortAscending="1" coverageLayerProvider="virtual" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" coverageLayerName="complete_marshal_overview" filenamePattern="'output_'||@atlas_featurenumber" sortKey="page" filterFeatures="0" enabled="1" sortFeatures="1" hideCoverage="1"/>
+      <Atlas pageNameExpression="&quot;page&quot;" coverageLayerProvider="virtual" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1" sortAscending="1" enabled="1" sortKey="page" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" coverageLayerName="complete_marshal_overview" filterFeatures="0" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" hideCoverage="1"/>
     </Layout>
-    <Layout units="mm" printResolution="144" name="Access Roads" worldFileMap="">
-      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
-      <Grid offsetX="0" resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm"/>
+    <Layout printResolution="144" worldFileMap="" name="Access Roads" units="mm">
+      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
+      <Grid offsetUnits="mm" resolution="10" offsetX="0" offsetY="0" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+        <symbol force_rhr="0" name="" clip_to_extent="1" type="fill" alpha="1">
+          <layer pass="0" locked="0" enabled="1" class="SimpleFill">
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
             <prop k="joinstyle" v="miter"/>
@@ -13432,9 +13863,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem frame="false" size="297,210,mm" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" position="0,0,mm" type="65638" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" frameJoinStyle="miter" positionLock="false" background="true" outlineWidthM="0.3,mm" zValue="0" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" excludeFromExports="0" positionOnPage="0,0,mm" itemRotation="0" groupUuid="">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem size="297,210,mm" frame="false" frameJoinStyle="miter" positionLock="false" id="" background="true" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" type="65638" position="0,0,mm" positionOnPage="0,0,mm" blendMode="0" opacity="1" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" outlineWidthM="0.3,mm" zValue="0" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}">
+          <FrameColor green="0" blue="0" alpha="255" red="0"/>
+          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -13447,12 +13878,12 @@ def my_form_open(dialog, layer, feature):
           </LayoutObject>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide units="mm" orientation="2" page="0" position="0"/>
+          <Guide page="0" orientation="2" position="0" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem boxSpace="2" visibility="1" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" symbolAlignment="1" frameJoinStyle="miter" title="" wmsLegendHeight="25" itemRotation="0" splitLayer="0" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" equalColumnWidth="0" size="34.45,40.8,mm" id="" type="65642" lineSpacing="1" background="true" wrapChar="" positionLock="true" excludeFromExports="0" groupUuid="" zValue="15" rasterBorder="1" fontColor="#000000" position="244.484,130.172,mm" blendMode="0" rasterBorderColor="0,0,0,255" positionOnPage="244.484,130.172,mm" referencePoint="0" legendFilterByAtlas="0" opacity="1" frame="true" columnCount="1" titleAlignment="1" columnSpace="2" rasterBorderWidth="0" outlineWidthM="0.3,mm" wmsLegendWidth="50" symbolWidth="7" resizeToContents="1" symbolHeight="4">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="185"/>
+      <LayoutItem rasterBorderColor="0,0,0,255" background="true" lineSpacing="1" columnSpace="2" legendFilterByAtlas="0" symbolAlignment="1" blendMode="0" equalColumnWidth="0" symbolWidth="7" titleAlignment="1" id="" columnCount="1" type="65642" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" frameJoinStyle="miter" visibility="1" rasterBorderWidth="0" excludeFromExports="0" splitLayer="0" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" title="" wrapChar="" fontColor="#000000" referencePoint="0" rasterBorder="1" itemRotation="0" wmsLegendHeight="25" size="34.45,40.8,mm" wmsLegendWidth="50" resizeToContents="1" zValue="15" positionOnPage="244.484,130.172,mm" symbolHeight="4" opacity="1" positionLock="true" position="244.484,130.172,mm" groupUuid="" outlineWidthM="0.3,mm" frame="true" boxSpace="2">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="185" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -13476,7 +13907,7 @@ def my_form_open(dialog, layer, feature):
           <style marginTop="2.5" alignment="1" name="symbol">
             <styleFont style="" description="Myriad Pro,9,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style marginTop="2" alignment="1" name="symbolLabel" marginLeft="2">
+          <style marginTop="2" marginLeft="2" alignment="1" name="symbolLabel">
             <styleFont style="Regular" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular"/>
           </style>
         </styles>
@@ -13484,19 +13915,19 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
           <layer-tree-group checked="Qt::Checked" name="Residents Access" expanded="1">
             <customproperties/>
-            <layer-tree-layer source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Checked" name="residents_access_roads" expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" providerKey="ogr">
+            <layer-tree-layer source="./residents_access_roads.shp|layername=residents_access_roads" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" providerKey="ogr" checked="Qt::Checked" name="residents_access_roads" expanded="1">
               <customproperties>
                 <property key="expandedLegendNodes"/>
-                <property key="legend/title-style" value="hidden"/>
+                <property value="hidden" key="legend/title-style"/>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem frame="false" size="194.851,7.272,mm" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" marginX="0" position="9.37446,191.81,mm" type="65641" valign="64" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="8" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="ACCESS ROUTES FOR RESIDENTS" excludeFromExports="0" positionOnPage="9.37446,191.81,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="194.851,7.272,mm" frame="false" frameJoinStyle="miter" marginX="0" positionLock="true" id="" labelText="ACCESS ROUTES FOR RESIDENTS" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="1" valign="64" type="65641" position="9.37446,191.81,mm" marginY="1" positionOnPage="9.37446,191.81,mm" htmlState="0" blendMode="0" opacity="1" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" outlineWidthM="0.3,mm" zValue="8" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -13508,11 +13939,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="57.4836,6.8714,mm" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" marginX="1" position="204.225,191.81,mm" type="65641" valign="64" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="6" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="REVISION 1.1" excludeFromExports="0" positionOnPage="204.225,191.81,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="57.4836,6.8714,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="true" id="" labelText="REVISION 1.1" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="2" valign="64" type="65641" position="204.225,191.81,mm" marginY="1" positionOnPage="204.225,191.81,mm" htmlState="0" blendMode="0" opacity="1" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" outlineWidthM="0.3,mm" zValue="6" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -13524,11 +13955,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="51.6706,6.60801,mm" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" marginX="1" position="210.038,199.082,mm" type="65641" valign="64" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="5" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="Sunday, 20 October 2019" excludeFromExports="0" positionOnPage="210.038,199.082,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="51.6706,6.60801,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="true" id="" labelText="Sunday, 20 October 2019" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="2" valign="64" type="65641" position="210.038,199.082,mm" marginY="1" positionOnPage="210.038,199.082,mm" htmlState="0" blendMode="0" opacity="1" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" outlineWidthM="0.3,mm" zValue="5" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -13540,11 +13971,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="29.7523,17.4718,mm" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" position="262.196,188.218,mm" type="65640" pictureWidth="29.7523" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" pictureRotation="0" frameJoinStyle="miter" positionLock="true" anchorPoint="4" svgFillColor="255,255,255,255" background="false" resizeMode="0" outlineWidthM="0.3,mm" zValue="4" visibility="1" northMode="0" referencePoint="0" svgBorderWidth="0.2" opacity="1" id="" blendMode="0" northOffset="0" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" excludeFromExports="0" pictureHeight="17.4074" positionOnPage="262.196,188.218,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="29.7523,17.4718,mm" northMode="0" frame="false" svgBorderColor="0,0,0,255" frameJoinStyle="miter" svgBorderWidth="0.2" pictureRotation="0" positionLock="true" id="" anchorPoint="4" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" background="false" groupUuid="" referencePoint="0" visibility="1" pictureHeight="17.4074" svgFillColor="255,255,255,255" excludeFromExports="0" itemRotation="0" type="65640" file="../Gun_Run_Logo.png" position="262.196,188.218,mm" northOffset="0" positionOnPage="262.196,188.218,mm" blendMode="0" opacity="1" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" outlineWidthM="0.3,mm" resizeMode="0" pictureWidth="29.7523" zValue="4" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -13562,9 +13993,9 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem frame="false" size="251.959,0.1,mm" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" position="9.59946,198.832,mm" type="65643" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="3" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" cornerRadiusMeasure="0,mm" excludeFromExports="0" shapeType="1" positionOnPage="9.59946,198.832,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="251.959,0.1,mm" frame="false" frameJoinStyle="miter" shapeType="1" positionLock="true" id="" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" type="65643" position="9.59946,198.832,mm" positionOnPage="9.59946,198.832,mm" blendMode="0" opacity="1" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" outlineWidthM="0.3,mm" cornerRadiusMeasure="0,mm" zValue="3" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -13575,8 +14006,8 @@ def my_form_open(dialog, layer, feature):
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+        <symbol force_rhr="0" name="" clip_to_extent="1" type="fill" alpha="1">
+          <layer pass="0" locked="0" enabled="1" class="SimpleFill">
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
             <prop k="joinstyle" v="miter"/>
@@ -13598,9 +14029,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem frame="true" size="67.7828,166.874,mm" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" keepLayerSet="false" position="5.86559,4.09761,mm" type="65639" drawCanvasItems="false" followPresetName="Access Routes" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" frameJoinStyle="miter" positionLock="true" background="true" outlineWidthM="0.3,mm" zValue="2" labelMargin="0,mm" followPreset="true" visibility="1" referencePoint="0" opacity="1" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="5.86559,4.09761,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="67.7828,166.874,mm" labelMargin="0,mm" frame="true" mapFlags="0" frameJoinStyle="miter" positionLock="true" id="" background="true" groupUuid="" referencePoint="0" visibility="1" keepLayerSet="false" excludeFromExports="0" itemRotation="0" type="65639" position="5.86559,4.09761,mm" positionOnPage="5.86559,4.09761,mm" mapRotation="0" blendMode="0" drawCanvasItems="false" opacity="1" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" outlineWidthM="0.3,mm" followPresetName="Access Routes" followPreset="true" zValue="2" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -13642,7 +14073,7 @@ def my_form_open(dialog, layer, feature):
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmax="18.38563681624126289" ymin="-33.94652930000000168" ymax="-33.91513741583252539" xmin="18.37288570000000121"/>
+        <Extent ymax="-33.91513741583252539" xmax="18.38563681624126289" xmin="18.37288570000000121" ymin="-33.94652930000000168"/>
         <crs>
           <spatialrefsys>
             <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
@@ -13656,10 +14087,10 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid offsetY="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" gridFrameWidth="2" frameFillColor1="255,255,255,255" gridStyle="0" bottomFrameDivisions="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" gridFrameMargin="0" leftFrameDivisions="0" rightAnnotationPosition="1" rightAnnotationDirection="0" intervalY="0" frameFillColor2="0,0,0,255" leftAnnotationPosition="1" gridFrameSideFlags="15" topAnnotationDisplay="0" frameAnnotationDistance="1" annotationPrecision="3" offsetX="0" topAnnotationPosition="1" bottomAnnotationDirection="0" show="0" unit="0" rightAnnotationDisplay="0" intervalX="0" annotationFormat="0" gridFrameStyle="0" bottomAnnotationDisplay="0" blendMode="0" position="3" rightFrameDivisions="0" showAnnotation="0" topAnnotationDirection="0" crossLength="3" annotationFontColor="0,0,0,255" leftAnnotationDisplay="0" name="Grid 1" bottomAnnotationPosition="1" annotationExpression="" gridFramePenColor="0,0,0,255" topFrameDivisions="0">
+        <ComposerMapGrid topAnnotationDirection="0" gridFrameMargin="0" bottomAnnotationDirection="0" gridFrameSideFlags="15" annotationFontColor="0,0,0,255" crossLength="3" gridFramePenThickness="0.5" name="Grid 1" leftAnnotationDisplay="0" topFrameDivisions="0" showAnnotation="0" bottomFrameDivisions="0" topAnnotationDisplay="0" frameFillColor2="0,0,0,255" blendMode="0" gridFrameWidth="2" leftAnnotationDirection="0" annotationFormat="0" bottomAnnotationPosition="1" gridFramePenColor="0,0,0,255" annotationPrecision="3" offsetY="0" gridFrameStyle="0" topAnnotationPosition="1" frameFillColor1="255,255,255,255" rightAnnotationDirection="0" rightFrameDivisions="0" show="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" rightAnnotationDisplay="0" annotationExpression="" leftAnnotationPosition="1" unit="0" gridStyle="0" intervalY="0" offsetX="0" rightAnnotationPosition="1" intervalX="0" leftFrameDivisions="0" position="3" bottomAnnotationDisplay="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol name="" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <symbol force_rhr="0" name="" clip_to_extent="1" type="line" alpha="1">
+              <layer pass="0" locked="0" enabled="1" class="SimpleLine">
                 <prop k="capstyle" v="square"/>
                 <prop k="customdash" v="5;2"/>
                 <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -13687,8 +14118,8 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <symbol force_rhr="0" name="" clip_to_extent="1" type="marker" alpha="1">
+              <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
                 <prop k="angle" v="0"/>
                 <prop k="color" v="0,0,0,255"/>
                 <prop k="horizontal_anchor_point" v="1"/>
@@ -13719,12 +14150,12 @@ def my_form_open(dialog, layer, feature):
           </markerStyle>
           <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.05"/>
+        <AtlasMap margin="0.05" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutItem frame="true" size="282.012,175.592,mm" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" keepLayerSet="false" position="9.44946,9.08557,mm" type="65639" drawCanvasItems="false" followPresetName="Access Routes" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" frameJoinStyle="round" positionLock="true" background="true" outlineWidthM="0.15,mm" zValue="1" labelMargin="0,mm" followPreset="true" visibility="1" referencePoint="0" opacity="1" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="9.44946,9.08557,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="282.012,175.592,mm" labelMargin="0,mm" frame="true" mapFlags="0" frameJoinStyle="round" positionLock="true" id="" background="true" groupUuid="" referencePoint="0" visibility="1" keepLayerSet="false" excludeFromExports="0" itemRotation="0" type="65639" position="9.44946,9.08557,mm" positionOnPage="9.44946,9.08557,mm" mapRotation="0" blendMode="0" drawCanvasItems="false" opacity="1" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" outlineWidthM="0.15,mm" followPresetName="Access Routes" followPreset="true" zValue="1" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -13751,7 +14182,7 @@ def my_form_open(dialog, layer, feature):
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmax="18.42303507276415431" ymin="-33.92999999999999972" ymax="-33.89697816224119009" xmin="18.37000000000000099"/>
+        <Extent ymax="-33.89697816224119009" xmax="18.42303507276415431" xmin="18.37000000000000099" ymin="-33.92999999999999972"/>
         <crs>
           <spatialrefsys>
             <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
@@ -13765,10 +14196,10 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid offsetY="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFrameWidth="2" frameFillColor1="255,255,255,255" gridStyle="0" bottomFrameDivisions="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" gridFrameMargin="0" leftFrameDivisions="0" rightAnnotationPosition="1" rightAnnotationDirection="0" intervalY="0" frameFillColor2="0,0,0,255" leftAnnotationPosition="1" gridFrameSideFlags="15" topAnnotationDisplay="0" frameAnnotationDistance="1" annotationPrecision="3" offsetX="0" topAnnotationPosition="1" bottomAnnotationDirection="0" show="0" unit="0" rightAnnotationDisplay="0" intervalX="0" annotationFormat="0" gridFrameStyle="0" bottomAnnotationDisplay="0" blendMode="0" position="3" rightFrameDivisions="0" showAnnotation="0" topAnnotationDirection="0" crossLength="3" annotationFontColor="0,0,0,255" leftAnnotationDisplay="0" name="Grid 1" bottomAnnotationPosition="1" annotationExpression="" gridFramePenColor="0,0,0,255" topFrameDivisions="0">
+        <ComposerMapGrid topAnnotationDirection="0" gridFrameMargin="0" bottomAnnotationDirection="0" gridFrameSideFlags="15" annotationFontColor="0,0,0,255" crossLength="3" gridFramePenThickness="0.5" name="Grid 1" leftAnnotationDisplay="0" topFrameDivisions="0" showAnnotation="0" bottomFrameDivisions="0" topAnnotationDisplay="0" frameFillColor2="0,0,0,255" blendMode="0" gridFrameWidth="2" leftAnnotationDirection="0" annotationFormat="0" bottomAnnotationPosition="1" gridFramePenColor="0,0,0,255" annotationPrecision="3" offsetY="0" gridFrameStyle="0" topAnnotationPosition="1" frameFillColor1="255,255,255,255" rightAnnotationDirection="0" rightFrameDivisions="0" show="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rightAnnotationDisplay="0" annotationExpression="" leftAnnotationPosition="1" unit="0" gridStyle="0" intervalY="0" offsetX="0" rightAnnotationPosition="1" intervalX="0" leftFrameDivisions="0" position="3" bottomAnnotationDisplay="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol name="" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <symbol force_rhr="0" name="" clip_to_extent="1" type="line" alpha="1">
+              <layer pass="0" locked="0" enabled="1" class="SimpleLine">
                 <prop k="capstyle" v="square"/>
                 <prop k="customdash" v="5;2"/>
                 <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -13796,8 +14227,8 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <symbol force_rhr="0" name="" clip_to_extent="1" type="marker" alpha="1">
+              <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
                 <prop k="angle" v="0"/>
                 <prop k="color" v="0,0,0,255"/>
                 <prop k="horizontal_anchor_point" v="1"/>
@@ -13828,24 +14259,24 @@ def my_form_open(dialog, layer, feature):
           </markerStyle>
           <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
       </LayoutItem>
       <customproperties>
-        <property key="atlasRasterFormat" value="png"/>
-        <property key="forceVector" value="0"/>
-        <property key="imageAntialias" value="true"/>
-        <property key="imageCropMarginBottom" value="0"/>
-        <property key="imageCropMarginLeft" value="0"/>
-        <property key="imageCropMarginRight" value="0"/>
-        <property key="imageCropMarginTop" value="0"/>
-        <property key="imageCropToContents" value="false"/>
-        <property key="pdfDisableRasterTiles" value="0"/>
-        <property key="pdfIncludeMetadata" value="1"/>
-        <property key="pdfTextFormat" value="0"/>
-        <property key="singleFile" value="false"/>
+        <property value="png" key="atlasRasterFormat"/>
+        <property value="0" key="forceVector"/>
+        <property value="true" key="imageAntialias"/>
+        <property value="0" key="imageCropMarginBottom"/>
+        <property value="0" key="imageCropMarginLeft"/>
+        <property value="0" key="imageCropMarginRight"/>
+        <property value="0" key="imageCropMarginTop"/>
+        <property value="false" key="imageCropToContents"/>
+        <property value="0" key="pdfDisableRasterTiles"/>
+        <property value="1" key="pdfIncludeMetadata"/>
+        <property value="0" key="pdfTextFormat"/>
+        <property value="false" key="singleFile"/>
       </customproperties>
-      <Atlas pageNameExpression="&quot;FID&quot;" coverageLayerProvider="ogr" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" coverageLayerSource="/home/tim/Documents/GunRunMaps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayerName="residents_access" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" filterFeatures="0" enabled="1" sortFeatures="0" hideCoverage="1"/>
+      <Atlas pageNameExpression="&quot;FID&quot;" coverageLayerProvider="ogr" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" sortFeatures="0" enabled="1" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" coverageLayerName="residents_access" filterFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" hideCoverage="1"/>
     </Layout>
   </Layouts>
 </qgis>
diff --git a/GIS Base Map/Gun Run.qgs.mldata b/GIS Base Map/Gun Run.qgs.mldata
index 90dcf22..0e8374a 100644
Binary files a/GIS Base Map/Gun Run.qgs.mldata and b/GIS Base Map/Gun Run.qgs.mldata differ
diff --git a/GIS Base Map/Gun Run.qgs~ b/GIS Base Map/Gun Run.qgs~
index 2b0b1e8..6ddde31 100644
--- a/GIS Base Map/Gun Run.qgs~	
+++ b/GIS Base Map/Gun Run.qgs~	
@@ -1,5 +1,5 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis version="3.8.3-Zanzibar" projectname="Gun Run">
+<qgis projectname="Gun Run" version="3.8.3-Zanzibar">
   <homePath path=""/>
   <title>Gun Run</title>
   <autotransaction active="0"/>
@@ -19,57 +19,55 @@
   </projectCrs>
   <layer-tree-group>
     <customproperties/>
-    <layer-tree-group checked="Qt::Unchecked" name="Marshals" expanded="1">
+    <layer-tree-group checked="Qt::Unchecked" name="Marshals" expanded="0">
       <customproperties/>
-      <layer-tree-layer source="./marshal_positions.shp|layername=marshal_positions" checked="Qt::Checked" name="marshal_positions" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" providerKey="ogr">
+      <layer-tree-layer source="./marshal_positions.shp|layername=marshal_positions" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" providerKey="ogr" checked="Qt::Checked" name="marshal_positions" expanded="1">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-layer source="./extra_security.shp" checked="Qt::Unchecked" name="extra_security" expanded="1" id="extra_security20170921130834191" providerKey="ogr">
+      <layer-tree-layer source="./extra_security.shp" id="extra_security20170921130834191" providerKey="ogr" checked="Qt::Unchecked" name="extra_security" expanded="1">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" checked="Qt::Unchecked" name="marshals_by_position" expanded="1" id="marshals_by_position20161003112326575" providerKey="delimitedtext">
+      <layer-tree-layer source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" id="marshals_by_position20161003112326575" providerKey="delimitedtext" checked="Qt::Unchecked" name="marshals_by_position" expanded="1">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-layer source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" checked="Qt::Unchecked" name="complete_marshal_overview" expanded="1" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" providerKey="virtual">
+      <layer-tree-layer source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" providerKey="virtual" checked="Qt::Unchecked" name="complete_marshal_overview" expanded="1">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-layer source="./marshal overviews.shp|layername=marshal overviews" checked="Qt::Unchecked" name="marshal_overviews" expanded="0" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" providerKey="ogr">
+      <layer-tree-layer source="./marshal overviews.shp|layername=marshal overviews" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" providerKey="ogr" checked="Qt::Unchecked" name="marshal_overviews" expanded="0">
         <customproperties/>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Checked" name="Fencing and Cones" expanded="1">
+    <layer-tree-group checked="Qt::Unchecked" name="Fencing and Cones" expanded="1">
       <customproperties/>
-      <layer-tree-layer source="./fencing.shp|layername=fencing" checked="Qt::Checked" name="fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr">
+      <layer-tree-layer source="./fencing.shp|layername=fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" checked="Qt::Checked" name="fencing" expanded="1">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-layer source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20[name],%20[group]%20FROM%20fencing%20GROUP%20BY%20%22group%22" checked="Qt::Unchecked" name="fence_groups" expanded="1" id="fence_groups_2daa8372_dd22_4979_afdf_08d74ee6b4b1" providerKey="virtual">
+      <layer-tree-layer source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20[name],%20[group]%20FROM%20fencing%20GROUP%20BY%20%22group%22" id="fence_groups_2daa8372_dd22_4979_afdf_08d74ee6b4b1" providerKey="virtual" checked="Qt::Unchecked" name="fence_groups" expanded="1">
         <customproperties/>
       </layer-tree-layer>
     </layer-tree-group>
     <layer-tree-group checked="Qt::Checked" name="Routes" expanded="1">
       <customproperties/>
-      <layer-tree-layer source="./timelapse.shp|layername=timelapse" checked="Qt::Unchecked" name="timelapse" expanded="1" id="timelapse_1e9371ed_fd46_407b_8e2a_21ea46053bfe" providerKey="ogr">
-        <customproperties>
-          <property key="showFeatureCount" value="1"/>
-        </customproperties>
+      <layer-tree-layer source="./timelapse.shp|layername=timelapse" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" providerKey="ogr" checked="Qt::Unchecked" name="timelapse" expanded="1">
+        <customproperties/>
       </layer-tree-layer>
       <layer-tree-group checked="Qt::Checked" name="Markers" expanded="1">
         <customproperties/>
-        <layer-tree-layer source="Point?crs=EPSG:4326&amp;uid={92473fdf-e0f9-4b27-ad1c-fa2cfc7b925d}" checked="Qt::Checked" name="route markers" expanded="1" id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" providerKey="memory">
+        <layer-tree-layer 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=Source:String(20,0)&amp;field=length_m:integer(6,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=org_fid:(0,0)&amp;field=distance:(0,0)&amp;uid={66ec81d1-efa9-4920-b869-b4386f16dabe}" id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" providerKey="memory" checked="Qt::Checked" name="route markers" expanded="1">
           <customproperties>
-            <property key="showFeatureCount" value="1"/>
+            <property value="1" key="showFeatureCount"/>
           </customproperties>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-layer source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" name="all_routes" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr">
+      <layer-tree-layer source="./all_routes.shp|layername=all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" checked="Qt::Unchecked" name="all_routes" expanded="1">
         <customproperties/>
       </layer-tree-layer>
     </layer-tree-group>
     <layer-tree-group checked="Qt::Checked" name="Feeding Stations" expanded="1">
       <customproperties/>
-      <layer-tree-layer source="./water_tables.shp" checked="Qt::Checked" name="water_tables" expanded="1" id="water_tables20170921142016467" providerKey="ogr">
+      <layer-tree-layer source="./water_tables.shp" id="water_tables20170921142016467" providerKey="ogr" checked="Qt::Checked" name="water_tables" expanded="1">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
@@ -77,47 +75,47 @@
     </layer-tree-group>
     <layer-tree-group checked="Qt::Unchecked" name="Ask Me" expanded="0">
       <customproperties/>
-      <layer-tree-layer source="./poi_labels.shp|layername=poi_labels" checked="Qt::Checked" name="poi_labels" expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" providerKey="ogr">
+      <layer-tree-layer source="./poi_labels.shp|layername=poi_labels" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" providerKey="ogr" checked="Qt::Checked" name="poi_labels" expanded="1">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-layer source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Checked" name="directions_to_start" expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" providerKey="ogr">
+      <layer-tree-layer source="./directions_to_start.shp|layername=directions_to_start" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" providerKey="ogr" checked="Qt::Checked" name="directions_to_start" expanded="1">
         <customproperties/>
       </layer-tree-layer>
     </layer-tree-group>
     <layer-tree-group checked="Qt::Unchecked" name="Residents Access" expanded="0">
       <customproperties/>
-      <layer-tree-layer source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Checked" name="residents_access_roads" expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" providerKey="ogr">
+      <layer-tree-layer source="./residents_access_roads.shp|layername=residents_access_roads" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" providerKey="ogr" checked="Qt::Checked" name="residents_access_roads" expanded="1">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="./residents_access.shp|layername=residents_access" checked="Qt::Unchecked" name="residents_access" expanded="1" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" providerKey="ogr">
+      <layer-tree-layer source="./residents_access.shp|layername=residents_access" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" providerKey="ogr" checked="Qt::Unchecked" name="residents_access" expanded="1">
         <customproperties/>
       </layer-tree-layer>
     </layer-tree-group>
     <layer-tree-group checked="Qt::Checked" name="OSM data" expanded="1">
       <customproperties/>
-      <layer-tree-layer source="./osm_roads.shp" checked="Qt::Checked" name="osm_roads" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" providerKey="ogr">
+      <layer-tree-layer source="./osm_roads.shp" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" providerKey="ogr" checked="Qt::Checked" name="osm_roads" expanded="0">
         <customproperties>
           <property key="expandedLegendNodes"/>
-          <property key="showFeatureCount" value="1"/>
+          <property value="1" key="showFeatureCount"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="./osm_places.shp|layername=osm_places" checked="Qt::Checked" name="osm_places" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" providerKey="ogr">
+      <layer-tree-layer source="./osm_places.shp|layername=osm_places" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" providerKey="ogr" checked="Qt::Checked" name="osm_places" expanded="1">
         <customproperties>
           <property key="expandedLegendNodes"/>
-          <property key="showFeatureCount" value="1"/>
+          <property value="1" key="showFeatureCount"/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
     <layer-tree-group checked="Qt::Unchecked" name="Start and Finish pages" expanded="0">
       <customproperties/>
-      <layer-tree-layer source="./data-comments.shp" checked="Qt::Unchecked" name="data-comments" expanded="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" providerKey="ogr">
+      <layer-tree-layer source="./data-comments.shp" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" providerKey="ogr" checked="Qt::Unchecked" name="data-comments" expanded="1">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="./start_finish_area.shp" checked="Qt::Unchecked" name="start_finish_area" expanded="1" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" providerKey="ogr">
+      <layer-tree-layer source="./start_finish_area.shp" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" providerKey="ogr" checked="Qt::Unchecked" name="start_finish_area" expanded="1">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
@@ -125,20 +123,20 @@
     </layer-tree-group>
     <layer-tree-group checked="Qt::Unchecked" name="Elevation" expanded="0">
       <customproperties/>
-      <layer-tree-layer source="./capetownelevation-1m.shp" checked="Qt::Unchecked" name="capetownelevation-1m" expanded="1" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" providerKey="ogr">
+      <layer-tree-layer source="./capetownelevation-1m.shp" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" providerKey="ogr" checked="Qt::Unchecked" name="capetownelevation-1m" expanded="1">
         <customproperties>
-          <property key="showFeatureCount" value="1"/>
+          <property value="1" key="showFeatureCount"/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
     <layer-tree-group checked="Qt::Checked" name="Map" expanded="1">
       <customproperties/>
-      <layer-tree-layer source="./GDAL-City of Cape Town 2015 Aerial.xml" checked="Qt::Checked" name="GDAL-City of Cape Town 2015 Aerial" expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" providerKey="gdal">
+      <layer-tree-layer source="./GDAL-City of Cape Town 2015 Aerial.xml" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" providerKey="gdal" checked="Qt::Unchecked" name="GDAL-City of Cape Town 2015 Aerial" expanded="1">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="contextualWMSLegend=0&amp;crs=EPSG:3857&amp;dpiMode=7&amp;featureCount=10&amp;format=image/png&amp;layers=ciry26ojy003tgynmznkc1a6q&amp;styles=default&amp;tileMatrixSet=GoogleMapsCompatible&amp;url=https://api.mapbox.com/styles/v1/ragtagtag/ciry26ojy003tgynmznkc1a6q/wmts?access_token%3Dpk.eyJ1IjoicmFndGFndGFnIiwiYSI6ImNpcnh3bnowbTAwMDUyemw1enBtbm50bTgifQ.WXKQzAfdJjsuQ6P6-BLZhg%2314.88/-33.91505/18.39137" checked="Qt::Unchecked" name="Outlines" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" providerKey="wms">
+      <layer-tree-layer 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" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" providerKey="wms" checked="Qt::Checked" name="Outlines" expanded="1">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
@@ -164,45 +162,45 @@
       <item>complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8</item>
       <item>fence_groups_2daa8372_dd22_4979_afdf_08d74ee6b4b1</item>
       <item>all_routes_5833accf_77da_42ef_a24a_197208cd2190</item>
-      <item>timelapse_1e9371ed_fd46_407b_8e2a_21ea46053bfe</item>
       <item>route_markers_137272a0_69df_47f0_82f8_521b9f4bef83</item>
+      <item>timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings intersection-snapping="1" tolerance="10" mode="3" unit="1" type="1" enabled="0">
+  <snapping-settings mode="3" enabled="0" intersection-snapping="1" type="1" tolerance="10" unit="1">
     <individual-layer-settings>
-      <layer-setting units="1" tolerance="12" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" type="2" enabled="0"/>
-      <layer-setting units="1" tolerance="12" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" type="2" enabled="0"/>
-      <layer-setting units="1" tolerance="12" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" type="2" enabled="0"/>
-      <layer-setting units="1" tolerance="12" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" type="2" enabled="0"/>
-      <layer-setting units="1" tolerance="12" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" type="2" enabled="0"/>
-      <layer-setting units="1" tolerance="12" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" type="2" enabled="0"/>
-      <layer-setting units="1" tolerance="12" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" type="2" enabled="0"/>
-      <layer-setting units="1" tolerance="12" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" type="2" enabled="0"/>
-      <layer-setting units="1" tolerance="12" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" type="2" enabled="0"/>
-      <layer-setting units="1" tolerance="12" id="timelapse_1e9371ed_fd46_407b_8e2a_21ea46053bfe" type="2" enabled="0"/>
-      <layer-setting units="1" tolerance="12" id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" type="1" enabled="0"/>
-      <layer-setting units="1" tolerance="12" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" type="2" enabled="0"/>
-      <layer-setting units="1" tolerance="12" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" type="2" enabled="0"/>
-      <layer-setting units="1" tolerance="12" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" type="2" enabled="0"/>
-      <layer-setting units="2" tolerance="0" id="water_tables20170921142016467" type="2" enabled="0"/>
-      <layer-setting units="2" tolerance="0" id="extra_security20170921130834191" type="2" enabled="0"/>
-      <layer-setting units="1" tolerance="12" id="fence_groups_2daa8372_dd22_4979_afdf_08d74ee6b4b1" type="2" enabled="0"/>
-      <layer-setting units="1" tolerance="12" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" type="2" enabled="0"/>
-      <layer-setting units="1" tolerance="20" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" type="2" enabled="1"/>
+      <layer-setting id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" enabled="0" type="2" units="1" tolerance="12"/>
+      <layer-setting id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" enabled="0" type="2" units="1" tolerance="12"/>
+      <layer-setting id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" enabled="0" type="2" units="1" tolerance="12"/>
+      <layer-setting id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" enabled="1" type="2" units="1" tolerance="20"/>
+      <layer-setting id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" enabled="0" type="2" units="1" tolerance="12"/>
+      <layer-setting id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" enabled="0" type="2" units="1" tolerance="12"/>
+      <layer-setting id="water_tables20170921142016467" enabled="0" type="2" units="2" tolerance="0"/>
+      <layer-setting id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" enabled="0" type="2" units="1" tolerance="12"/>
+      <layer-setting id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" enabled="0" type="2" units="1" tolerance="12"/>
+      <layer-setting id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" enabled="0" type="2" units="1" tolerance="12"/>
+      <layer-setting id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" enabled="0" type="2" units="1" tolerance="12"/>
+      <layer-setting id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" enabled="0" type="2" units="1" tolerance="12"/>
+      <layer-setting id="extra_security20170921130834191" enabled="0" type="2" units="2" tolerance="0"/>
+      <layer-setting id="fence_groups_2daa8372_dd22_4979_afdf_08d74ee6b4b1" enabled="0" type="2" units="1" tolerance="12"/>
+      <layer-setting id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" enabled="0" type="1" units="1" tolerance="12"/>
+      <layer-setting id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" enabled="0" type="2" units="1" tolerance="12"/>
+      <layer-setting id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" enabled="0" type="2" units="1" tolerance="12"/>
+      <layer-setting id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" enabled="0" type="2" units="1" tolerance="12"/>
+      <layer-setting id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" enabled="0" type="2" units="1" tolerance="12"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations>
-    <relation strength="Association" name="fence_group_relationship" id="fence_group_rel" referencingLayer="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" referencedLayer="fence_groups_2daa8372_dd22_4979_afdf_08d74ee6b4b1">
-      <fieldRef referencingField="group" referencedField="group"/>
+    <relation referencedLayer="fence_groups_2daa8372_dd22_4979_afdf_08d74ee6b4b1" id="fence_group_rel" strength="Association" name="fence_group_relationship" referencingLayer="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+      <fieldRef referencedField="group" referencingField="group"/>
     </relation>
   </relations>
   <mapcanvas annotationsVisible="1" name="theMapCanvas">
     <units>degrees</units>
     <extent>
-      <xmin>18.40437472216478199</xmin>
-      <ymin>-33.90415462296931537</ymin>
-      <xmax>18.4068947122138411</xmax>
-      <ymax>-33.90273256048882899</ymax>
+      <xmin>18.3516864610643502</xmin>
+      <ymin>-33.94665807501495891</ymin>
+      <xmax>18.4410370362969509</xmax>
+      <ymax>-33.8962364073994209</ymax>
     </extent>
     <rotation>0</rotation>
     <destinationsrs>
@@ -222,135 +220,135 @@
   </mapcanvas>
   <projectModels/>
   <legend updateDrawingOrder="true">
-    <legendgroup open="true" checked="Qt::Unchecked" name="Marshals">
-      <legendlayer open="true" checked="Qt::Checked" name="marshal_positions" drawingOrder="-1" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0"/>
+    <legendgroup checked="Qt::Unchecked" open="false" name="Marshals">
+      <legendlayer showFeatureCount="0" checked="Qt::Checked" open="true" name="marshal_positions" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="0" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" checked="Qt::Unchecked" name="extra_security" drawingOrder="-1" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="extra_security20170921130834191" visible="0"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" open="true" name="extra_security" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="0" layerid="extra_security20170921130834191" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" checked="Qt::Unchecked" name="marshals_by_position" drawingOrder="-1" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="marshals_by_position20161003112326575" visible="0"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" open="true" name="marshals_by_position" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="0" layerid="marshals_by_position20161003112326575" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" checked="Qt::Unchecked" name="complete_marshal_overview" drawingOrder="-1" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" visible="0"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" open="true" name="complete_marshal_overview" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="false" checked="Qt::Unchecked" name="marshal_overviews" drawingOrder="-1" showFeatureCount="0">
-        <filegroup open="false" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" visible="0"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" open="false" name="marshal_overviews" drawingOrder="-1">
+        <filegroup hidden="false" open="false">
+          <legendlayerfile visible="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" checked="Qt::Checked" name="Fencing and Cones">
-      <legendlayer open="true" checked="Qt::Checked" name="fencing" drawingOrder="-1" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1"/>
+    <legendgroup checked="Qt::Unchecked" open="true" name="Fencing and Cones">
+      <legendlayer showFeatureCount="0" checked="Qt::Checked" open="true" name="fencing" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" checked="Qt::Unchecked" name="fence_groups" drawingOrder="-1" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="fence_groups_2daa8372_dd22_4979_afdf_08d74ee6b4b1" visible="0"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" open="true" name="fence_groups" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="0" layerid="fence_groups_2daa8372_dd22_4979_afdf_08d74ee6b4b1" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" checked="Qt::Checked" name="Routes">
-      <legendlayer open="true" checked="Qt::Unchecked" name="timelapse" drawingOrder="-1" showFeatureCount="1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="timelapse_1e9371ed_fd46_407b_8e2a_21ea46053bfe" visible="0"/>
+    <legendgroup checked="Qt::Checked" open="true" name="Routes">
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" open="true" name="timelapse" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="0" layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendgroup open="true" checked="Qt::Checked" name="Markers">
-        <legendlayer open="true" checked="Qt::Checked" name="route markers" drawingOrder="-1" showFeatureCount="1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile isInOverview="0" layerid="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" visible="1"/>
+      <legendgroup checked="Qt::Checked" open="true" name="Markers">
+        <legendlayer showFeatureCount="1" checked="Qt::Checked" open="true" name="route markers" drawingOrder="-1">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="1" layerid="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" isInOverview="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendlayer open="true" checked="Qt::Checked" name="all_routes" drawingOrder="-1" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" open="true" name="all_routes" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="0" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" checked="Qt::Checked" name="Feeding Stations">
-      <legendlayer open="true" checked="Qt::Checked" name="water_tables" drawingOrder="-1" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="water_tables20170921142016467" visible="1"/>
+    <legendgroup checked="Qt::Checked" open="true" name="Feeding Stations">
+      <legendlayer showFeatureCount="0" checked="Qt::Checked" open="true" name="water_tables" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="1" layerid="water_tables20170921142016467" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" checked="Qt::Unchecked" name="Ask Me">
-      <legendlayer open="true" checked="Qt::Checked" name="poi_labels" drawingOrder="-1" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" visible="0"/>
+    <legendgroup checked="Qt::Unchecked" open="false" name="Ask Me">
+      <legendlayer showFeatureCount="0" checked="Qt::Checked" open="true" name="poi_labels" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" checked="Qt::Checked" name="directions_to_start" drawingOrder="-1" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="0"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Checked" open="true" name="directions_to_start" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" checked="Qt::Unchecked" name="Residents Access">
-      <legendlayer open="true" checked="Qt::Checked" name="residents_access_roads" drawingOrder="-1" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="0"/>
+    <legendgroup checked="Qt::Unchecked" open="false" name="Residents Access">
+      <legendlayer showFeatureCount="0" checked="Qt::Checked" open="true" name="residents_access_roads" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" checked="Qt::Unchecked" name="residents_access" drawingOrder="-1" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" visible="0"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" open="true" name="residents_access" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" checked="Qt::Checked" name="OSM data">
-      <legendlayer open="false" checked="Qt::Checked" name="osm_roads" drawingOrder="-1" showFeatureCount="1">
-        <filegroup open="false" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
+    <legendgroup checked="Qt::Checked" open="true" name="OSM data">
+      <legendlayer showFeatureCount="1" checked="Qt::Checked" open="false" name="osm_roads" drawingOrder="-1">
+        <filegroup hidden="false" open="false">
+          <legendlayerfile visible="1" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" checked="Qt::Checked" name="osm_places" drawingOrder="-1" showFeatureCount="1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1"/>
+      <legendlayer showFeatureCount="1" checked="Qt::Checked" open="true" name="osm_places" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="1" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" checked="Qt::Unchecked" name="Start and Finish pages">
-      <legendlayer open="true" checked="Qt::Unchecked" name="data-comments" drawingOrder="-1" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" visible="0"/>
+    <legendgroup checked="Qt::Unchecked" open="false" name="Start and Finish pages">
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" open="true" name="data-comments" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" checked="Qt::Unchecked" name="start_finish_area" drawingOrder="-1" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" visible="0"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" open="true" name="start_finish_area" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" checked="Qt::Unchecked" name="Elevation">
-      <legendlayer open="true" checked="Qt::Unchecked" name="capetownelevation-1m" drawingOrder="-1" showFeatureCount="1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" visible="0"/>
+    <legendgroup checked="Qt::Unchecked" open="false" name="Elevation">
+      <legendlayer showFeatureCount="1" checked="Qt::Unchecked" open="true" name="capetownelevation-1m" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" checked="Qt::Checked" name="Map">
-      <legendlayer open="true" checked="Qt::Checked" name="GDAL-City of Cape Town 2015 Aerial" drawingOrder="-1" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1"/>
+    <legendgroup checked="Qt::Checked" open="true" name="Map">
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" open="true" name="GDAL-City of Cape Town 2015 Aerial" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" checked="Qt::Unchecked" name="Outlines" drawingOrder="-1" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="0"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Checked" open="true" name="Outlines" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="1" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
@@ -358,7 +356,7 @@
   <mapViewDocks/>
   <mapViewDocks3D/>
   <projectlayers>
-    <maplayer autoRefreshEnabled="0" maxScale="100000" refreshOnNotifyEnabled="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" type="raster" minScale="1e+08">
+    <maplayer hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" maxScale="100000" refreshOnNotifyEnabled="0" minScale="1e+08" type="raster" autoRefreshEnabled="0" autoRefreshTime="0">
       <extent>
         <xmin>-20037508.33999999985098839</xmin>
         <ymin>-20037508.33999999985098839</ymin>
@@ -415,7 +413,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
+          <spatial minz="0" minx="0" maxz="0" maxy="0" maxx="0" crs="" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -426,9 +424,9 @@
       </resourceMetadata>
       <provider>gdal</provider>
       <noData>
-        <noDataList bandNo="1" useSrcNoData="0"/>
-        <noDataList bandNo="2" useSrcNoData="0"/>
-        <noDataList bandNo="3" useSrcNoData="0"/>
+        <noDataList useSrcNoData="0" bandNo="1"/>
+        <noDataList useSrcNoData="0" bandNo="2"/>
+        <noDataList useSrcNoData="0" bandNo="3"/>
       </noData>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -439,13 +437,13 @@
         <Searchable>0</Searchable>
       </flags>
       <customproperties>
-        <property key="WMSBackgroundLayer" value="false"/>
-        <property key="WMSPublishDataSourceUrl" value="false"/>
-        <property key="embeddedWidgets/count" value="0"/>
-        <property key="identify/format" value="Value"/>
+        <property value="false" key="WMSBackgroundLayer"/>
+        <property value="false" key="WMSPublishDataSourceUrl"/>
+        <property value="0" key="embeddedWidgets/count"/>
+        <property value="Value" key="identify/format"/>
       </customproperties>
       <pipe>
-        <rasterrenderer alphaBand="-1" redBand="1" greenBand="2" type="multibandcolor" opacity="0.6" blueBand="3">
+        <rasterrenderer alphaBand="-1" opacity="0.6" blueBand="3" greenBand="2" type="multibandcolor" redBand="1">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -457,12 +455,12 @@
           </minMaxOrigin>
         </rasterrenderer>
         <brightnesscontrast brightness="0" contrast="0"/>
-        <huesaturation colorizeStrength="100" colorizeGreen="128" colorizeOn="0" grayscaleMode="0" colorizeRed="255" colorizeBlue="128" saturation="0"/>
+        <huesaturation saturation="0" colorizeRed="255" colorizeGreen="128" colorizeBlue="128" colorizeOn="0" colorizeStrength="100" grayscaleMode="0"/>
         <rasterresampler maxOversampling="2"/>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" maxScale="0" refreshOnNotifyEnabled="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" type="raster" minScale="1e+08">
+    <maplayer hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" maxScale="0" refreshOnNotifyEnabled="0" minScale="1e+08" type="raster" autoRefreshEnabled="0" autoRefreshTime="0">
       <extent>
         <xmin>-20037508.34278924390673637</xmin>
         <ymin>-20037508.62692910060286522</ymin>
@@ -519,7 +517,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
+          <spatial minz="0" minx="0" maxz="0" maxy="0" maxx="0" crs="" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -530,7 +528,7 @@
       </resourceMetadata>
       <provider>wms</provider>
       <noData>
-        <noDataList bandNo="1" useSrcNoData="0"/>
+        <noDataList useSrcNoData="0" bandNo="1"/>
       </noData>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -541,13 +539,13 @@
         <Searchable>0</Searchable>
       </flags>
       <customproperties>
-        <property key="WMSBackgroundLayer" value="true"/>
-        <property key="WMSPublishDataSourceUrl" value="false"/>
-        <property key="embeddedWidgets/count" value="0"/>
-        <property key="identify/format" value="Undefined"/>
+        <property value="true" key="WMSBackgroundLayer"/>
+        <property value="false" key="WMSPublishDataSourceUrl"/>
+        <property value="0" key="embeddedWidgets/count"/>
+        <property value="Undefined" key="identify/format"/>
       </customproperties>
       <pipe>
-        <rasterrenderer alphaBand="-1" band="1" type="singlebandcolordata" opacity="0.75">
+        <rasterrenderer alphaBand="-1" opacity="0.75" band="1" type="singlebandcolordata">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -559,12 +557,12 @@
           </minMaxOrigin>
         </rasterrenderer>
         <brightnesscontrast brightness="0" contrast="0"/>
-        <huesaturation colorizeStrength="100" colorizeGreen="128" colorizeOn="0" grayscaleMode="0" colorizeRed="255" colorizeBlue="128" saturation="0"/>
+        <huesaturation saturation="0" colorizeRed="255" colorizeGreen="128" colorizeBlue="128" colorizeOn="0" colorizeStrength="100" grayscaleMode="0"/>
         <rasterresampler maxOversampling="2"/>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer maxScale="100000" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Line" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" simplifyDrawingTol="1">
+    <maplayer styleCategories="AllStyleCategories" refreshOnNotifyMessage="" simplifyAlgorithm="0" maxScale="100000" geometry="Line" simplifyMaxScale="1" simplifyLocal="1" labelsEnabled="1" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" type="vector" minScale="1e+08" readOnly="0" autoRefreshTime="0" autoRefreshEnabled="0" simplifyDrawingTol="1" wkbType="MultiLineString" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37527226735897301</xmin>
         <ymin>-33.94586066151139647</ymin>
@@ -621,7 +619,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
+          <spatial minz="0" minx="0" maxz="0" maxy="0" maxx="0" crs="" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -636,8 +634,8 @@
       <dataDependencies/>
       <legend type="default-vector"/>
       <expressionfields>
-        <field name="length_m" expression="$length" typeName="integer" length="6" subType="0" precision="0" comment="" type="2"/>
-        <field name="length_km" expression="$length / 1000" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
+        <field precision="0" subType="0" typeName="integer" name="length_m" type="2" length="6" comment="" expression="$length"/>
+        <field precision="0" subType="0" typeName="double precision" name="length_km" type="6" length="-1" comment="" expression="$length / 1000"/>
       </expressionfields>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -648,18 +646,18 @@
         <Removable>0</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" type="RuleRenderer" forceraster="0" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" enableorderby="0" forceraster="0" symbollevels="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule symbol="0" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" description="Only show when active in Atlas" label="Active Routes" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )">
-            <rule symbol="1" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" description="This should be disabled, since it's only for legends" label="21KM" checkstate="0" filter="&quot;Distance&quot; = '21KM'"/>
-            <rule symbol="2" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" description="This should be disabled, since it's only for legends" label="10KM" filter="&quot;Distance&quot; = '10KM'"/>
-            <rule symbol="3" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" description="This should be disabled, since it's only for legends" label="5KM" checkstate="0" filter="&quot;Distance&quot; = '25'"/>
+          <rule symbol="0" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )" label="Active Routes" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" description="Only show when active in Atlas">
+            <rule symbol="1" filter="&quot;Distance&quot; = '21KM'" checkstate="0" label="21KM" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" description="This should be disabled, since it's only for legends"/>
+            <rule symbol="2" filter="&quot;Distance&quot; = '10KM'" label="10KM" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" description="This should be disabled, since it's only for legends"/>
+            <rule symbol="3" filter="&quot;Distance&quot; = '25'" checkstate="0" label="5KM" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" description="This should be disabled, since it's only for legends"/>
           </rule>
-          <rule symbol="4" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" label="Always show" checkstate="0"/>
+          <rule symbol="4" checkstate="0" label="Always show" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
         </rules>
         <symbols>
-          <symbol name="0" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+          <symbol force_rhr="0" name="0" clip_to_extent="1" type="line" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="MarkerLine">
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="average_angle_unit" v="MM"/>
@@ -693,8 +691,8 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@0@0" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+              <symbol force_rhr="0" name="@0@0" clip_to_extent="1" type="marker" alpha="1">
+                <layer pass="0" locked="0" enabled="1" class="FilledMarker">
                   <prop k="angle" v="0"/>
                   <prop k="color" v="0,0,0,255"/>
                   <prop k="horizontal_anchor_point" v="1"/>
@@ -714,8 +712,8 @@
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@0@0@0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                  <symbol force_rhr="0" name="@@0@0@0" clip_to_extent="1" type="fill" alpha="1">
+                    <layer pass="0" locked="0" enabled="1" class="SimpleFill">
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,0,0,255"/>
                       <prop k="joinstyle" v="bevel"/>
@@ -745,7 +743,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleLine">
               <prop k="capstyle" v="square"/>
               <prop k="customdash" v="5;2"/>
               <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -776,7 +774,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer pass="0" locked="0" enabled="1" class="MarkerLine">
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="average_angle_unit" v="MM"/>
@@ -799,8 +797,8 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@0@2" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <symbol force_rhr="0" name="@0@2" clip_to_extent="1" type="marker" alpha="1">
+                <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
                   <prop k="angle" v="0"/>
                   <prop k="color" v="0,0,0,255"/>
                   <prop k="horizontal_anchor_point" v="1"/>
@@ -835,7 +833,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer pass="0" locked="0" enabled="1" class="MarkerLine">
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="average_angle_unit" v="MM"/>
@@ -858,8 +856,8 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@0@3" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <symbol force_rhr="0" name="@0@3" clip_to_extent="1" type="marker" alpha="1">
+                <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
                   <prop k="angle" v="0"/>
                   <prop k="color" v="0,0,0,255"/>
                   <prop k="horizontal_anchor_point" v="1"/>
@@ -895,8 +893,8 @@
               </symbol>
             </layer>
           </symbol>
-          <symbol name="1" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+          <symbol force_rhr="0" name="1" clip_to_extent="1" type="line" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="MarkerLine">
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="average_angle_unit" v="MM"/>
@@ -930,8 +928,8 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@1@0" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+              <symbol force_rhr="0" name="@1@0" clip_to_extent="1" type="marker" alpha="1">
+                <layer pass="0" locked="0" enabled="1" class="FilledMarker">
                   <prop k="angle" v="0"/>
                   <prop k="color" v="210,32,39,255"/>
                   <prop k="horizontal_anchor_point" v="1"/>
@@ -951,8 +949,8 @@
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@1@0@0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                  <symbol force_rhr="0" name="@@1@0@0" clip_to_extent="1" type="fill" alpha="1">
+                    <layer pass="0" locked="0" enabled="1" class="SimpleFill">
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="210,32,39,255"/>
                       <prop k="joinstyle" v="bevel"/>
@@ -982,7 +980,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleLine">
               <prop k="capstyle" v="square"/>
               <prop k="customdash" v="5;2"/>
               <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1013,7 +1011,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer pass="0" locked="0" enabled="1" class="MarkerLine">
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="average_angle_unit" v="MM"/>
@@ -1036,8 +1034,8 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@1@2" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <symbol force_rhr="0" name="@1@2" clip_to_extent="1" type="marker" alpha="1">
+                <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
                   <prop k="angle" v="0"/>
                   <prop k="color" v="210,32,39,255"/>
                   <prop k="horizontal_anchor_point" v="1"/>
@@ -1072,7 +1070,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer pass="0" locked="0" enabled="1" class="MarkerLine">
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="average_angle_unit" v="MM"/>
@@ -1095,8 +1093,8 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@1@3" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <symbol force_rhr="0" name="@1@3" clip_to_extent="1" type="marker" alpha="1">
+                <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
                   <prop k="angle" v="0"/>
                   <prop k="color" v="210,32,39,255"/>
                   <prop k="horizontal_anchor_point" v="1"/>
@@ -1132,8 +1130,8 @@
               </symbol>
             </layer>
           </symbol>
-          <symbol name="2" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+          <symbol force_rhr="0" name="2" clip_to_extent="1" type="line" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="MarkerLine">
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="average_angle_unit" v="MM"/>
@@ -1167,8 +1165,8 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@0" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+              <symbol force_rhr="0" name="@2@0" clip_to_extent="1" type="marker" alpha="1">
+                <layer pass="0" locked="0" enabled="1" class="FilledMarker">
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
                   <prop k="horizontal_anchor_point" v="1"/>
@@ -1188,8 +1186,8 @@
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@2@0@0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                  <symbol force_rhr="0" name="@@2@0@0" clip_to_extent="1" type="fill" alpha="1">
+                    <layer pass="0" locked="0" enabled="1" class="SimpleFill">
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
                       <prop k="joinstyle" v="bevel"/>
@@ -1219,7 +1217,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleLine">
               <prop k="capstyle" v="square"/>
               <prop k="customdash" v="5;2"/>
               <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1250,7 +1248,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer pass="0" locked="0" enabled="1" class="MarkerLine">
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="average_angle_unit" v="MM"/>
@@ -1273,8 +1271,8 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@2" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <symbol force_rhr="0" name="@2@2" clip_to_extent="1" type="marker" alpha="1">
+                <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
                   <prop k="horizontal_anchor_point" v="1"/>
@@ -1309,7 +1307,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer pass="0" locked="0" enabled="1" class="MarkerLine">
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="average_angle_unit" v="MM"/>
@@ -1332,8 +1330,8 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@3" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <symbol force_rhr="0" name="@2@3" clip_to_extent="1" type="marker" alpha="1">
+                <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
                   <prop k="horizontal_anchor_point" v="1"/>
@@ -1369,8 +1367,8 @@
               </symbol>
             </layer>
           </symbol>
-          <symbol name="3" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+          <symbol force_rhr="0" name="3" clip_to_extent="1" type="line" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="MarkerLine">
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="average_angle_unit" v="MM"/>
@@ -1404,8 +1402,8 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@3@0" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+              <symbol force_rhr="0" name="@3@0" clip_to_extent="1" type="marker" alpha="1">
+                <layer pass="0" locked="0" enabled="1" class="FilledMarker">
                   <prop k="angle" v="0"/>
                   <prop k="color" v="145,211,55,255"/>
                   <prop k="horizontal_anchor_point" v="1"/>
@@ -1425,8 +1423,8 @@
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@3@0@0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                  <symbol force_rhr="0" name="@@3@0@0" clip_to_extent="1" type="fill" alpha="1">
+                    <layer pass="0" locked="0" enabled="1" class="SimpleFill">
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="145,211,55,255"/>
                       <prop k="joinstyle" v="bevel"/>
@@ -1456,7 +1454,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleLine">
               <prop k="capstyle" v="square"/>
               <prop k="customdash" v="5;2"/>
               <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1487,7 +1485,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer pass="0" locked="0" enabled="1" class="MarkerLine">
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="average_angle_unit" v="MM"/>
@@ -1510,8 +1508,8 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@3@2" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <symbol force_rhr="0" name="@3@2" clip_to_extent="1" type="marker" alpha="1">
+                <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
                   <prop k="angle" v="0"/>
                   <prop k="color" v="145,211,55,255"/>
                   <prop k="horizontal_anchor_point" v="1"/>
@@ -1546,7 +1544,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer pass="0" locked="0" enabled="1" class="MarkerLine">
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="average_angle_unit" v="MM"/>
@@ -1569,8 +1567,8 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@3@3" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <symbol force_rhr="0" name="@3@3" clip_to_extent="1" type="marker" alpha="1">
+                <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
                   <prop k="angle" v="0"/>
                   <prop k="color" v="145,211,55,255"/>
                   <prop k="horizontal_anchor_point" v="1"/>
@@ -1606,8 +1604,8 @@
               </symbol>
             </layer>
           </symbol>
-          <symbol name="4" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+          <symbol force_rhr="0" name="4" clip_to_extent="1" type="line" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleLine">
               <prop k="capstyle" v="square"/>
               <prop k="customdash" v="5;2"/>
               <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1641,22 +1639,22 @@
           </symbol>
         </symbols>
         <orderby>
-          <orderByClause asc="0" nullsFirst="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
+          <orderByClause nullsFirst="0" asc="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
         </orderby>
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{86cc78bd-cf95-435a-99c5-13093c859aa5}">
-          <rule key="{68d5cde2-f285-4651-b007-1511cc17bfbe}" description="Active routes" active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
+          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{68d5cde2-f285-4651-b007-1511cc17bfbe}" active="0" description="Active routes">
             <settings>
-              <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="1" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="1" fontSizeUnit="Point" fieldName="round($length / 1000, 0)" fontSize="10" blendMode="0" textColor="255,255,255,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
-                <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
-                <background shapeFillColor="0,0,0,255" shapeJoinStyle="128" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="1" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="1" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="1" shapeRadiiX="1" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+              <text-style fontLetterSpacing="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Semibold" textColor="255,255,255,255" multilineHeight="1" fontSize="10" fontWeight="63" fieldName="round($length / 1000, 0)" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="1" useSubstitutions="0" fontUnderline="0">
+                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeType="0" shapeFillColor="0,0,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiY="1" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="128" shapeBorderWidthUnit="MM" shapeDraw="1" shapeOpacity="1" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="0" shapeRadiiX="1" shapeBorderWidth="1" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0" wrapChar="" decimals="0"/>
-              <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="0" geometryGeneratorEnabled="1" repeatDistanceUnits="MM" quadOffset="3" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="km_marker()" dist="2" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="10" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
-              <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="2" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
+              <text-format multilineAlign="0" autoWrapLength="0" plussign="0" addDirectionSymbol="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+              <placement maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="0" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" geometryGeneratorType="PointGeometry" quadOffset="3" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="2" centroidInside="0" geometryGenerator="km_marker()" placementFlags="10" geometryGeneratorEnabled="1" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" maxCurvedCharAngleIn="20" priority="10"/>
+              <rendering displayAll="1" upsidedownLabels="0" mergeLines="0" fontLimitPixelSize="0" maxNumLabels="2000" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="1" scaleMax="10000000" minFeatureSize="0" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="0" fontMaxPixelSize="10000" scaleMin="1" obstacleFactor="2"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -1712,20 +1710,20 @@
           <value>COALESCE( "Name", '&lt;NULL>' )</value>
           <value>COALESCE( "Name", '&lt;NULL>' )</value>
         </property>
-        <property key="embeddedWidgets/count" value="0"/>
+        <property value="0" key="embeddedWidgets/count"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory enabled="0" minScaleDenominator="100000" width="15" rotationOffset="270" penColor="#000000" penAlpha="255" height="15" penWidth="0" diagramOrientation="Up" backgroundColor="#ffffff" scaleDependency="Area" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" opacity="1" lineSizeType="MM" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeType="MM" scaleBasedVisibility="0" backgroundAlpha="255" barWidth="5">
           <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
-          <attribute field="" color="#000000" label=""/>
+          <attribute color="#000000" label="" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" priority="0" dist="0" placement="2" obstacle="0" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" showAll="1" placement="2" linePlacementFlags="2" obstacle="0" dist="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -1734,7 +1732,7 @@
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -1841,16 +1839,16 @@
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" index="0" name=""/>
-        <alias field="descriptio" index="1" name=""/>
-        <alias field="timestamp" index="2" name=""/>
-        <alias field="begin" index="3" name=""/>
-        <alias field="end" index="4" name=""/>
-        <alias field="Distance" index="5" name=""/>
-        <alias field="RouteLen" index="6" name=""/>
-        <alias field="Source" index="7" name=""/>
-        <alias field="length_m" index="8" name=""/>
-        <alias field="length_km" index="9" name=""/>
+        <alias index="0" field="Name" name=""/>
+        <alias index="1" field="descriptio" name=""/>
+        <alias index="2" field="timestamp" name=""/>
+        <alias index="3" field="begin" name=""/>
+        <alias index="4" field="end" name=""/>
+        <alias index="5" field="Distance" name=""/>
+        <alias index="6" field="RouteLen" name=""/>
+        <alias index="7" field="Source" name=""/>
+        <alias index="8" field="length_m" name=""/>
+        <alias index="9" field="length_km" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -1867,49 +1865,49 @@
         <default field="length_km" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="Name" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="descriptio" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="timestamp" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="begin" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="end" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="Distance" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="RouteLen" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="Source" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="length_m" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="length_km" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint exp_strength="0" field="Name" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="descriptio" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="timestamp" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="begin" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="end" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="Distance" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="RouteLen" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="Source" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="length_m" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="length_km" constraints="0" notnull_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="Name" exp="" desc=""/>
-        <constraint field="descriptio" exp="" desc=""/>
-        <constraint field="timestamp" exp="" desc=""/>
-        <constraint field="begin" exp="" desc=""/>
-        <constraint field="end" exp="" desc=""/>
-        <constraint field="Distance" exp="" desc=""/>
-        <constraint field="RouteLen" exp="" desc=""/>
-        <constraint field="Source" exp="" desc=""/>
-        <constraint field="length_m" exp="" desc=""/>
-        <constraint field="length_km" exp="" desc=""/>
+        <constraint exp="" field="Name" desc=""/>
+        <constraint exp="" field="descriptio" desc=""/>
+        <constraint exp="" field="timestamp" desc=""/>
+        <constraint exp="" field="begin" desc=""/>
+        <constraint exp="" field="end" desc=""/>
+        <constraint exp="" field="Distance" desc=""/>
+        <constraint exp="" field="RouteLen" desc=""/>
+        <constraint exp="" field="Source" desc=""/>
+        <constraint exp="" field="length_m" desc=""/>
+        <constraint exp="" field="length_km" desc=""/>
       </constraintExpressions>
       <expressionfields>
-        <field name="length_m" expression="$length" typeName="integer" length="6" subType="0" precision="0" comment="" type="2"/>
-        <field name="length_km" expression="$length / 1000" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
+        <field precision="0" subType="0" typeName="integer" name="length_m" type="2" length="6" comment="" expression="$length"/>
+        <field precision="0" subType="0" typeName="double precision" name="length_km" type="6" length="-1" comment="" expression="$length / 1000"/>
       </expressionfields>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;Name&quot;">
+      <attributetableconfig sortExpression="&quot;Name&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" name="Name" hidden="0" type="field"/>
-          <column width="-1" name="descriptio" hidden="0" type="field"/>
-          <column width="-1" name="timestamp" hidden="0" type="field"/>
-          <column width="163" name="begin" hidden="0" type="field"/>
-          <column width="-1" name="end" hidden="0" type="field"/>
-          <column width="-1" name="Distance" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="RouteLen" hidden="0" type="field"/>
-          <column width="-1" name="Source" hidden="0" type="field"/>
-          <column width="-1" name="length_m" hidden="0" type="field"/>
-          <column width="-1" name="length_km" hidden="0" type="field"/>
+          <column hidden="0" name="Name" type="field" width="-1"/>
+          <column hidden="0" name="descriptio" type="field" width="-1"/>
+          <column hidden="0" name="timestamp" type="field" width="-1"/>
+          <column hidden="0" name="begin" type="field" width="163"/>
+          <column hidden="0" name="end" type="field" width="-1"/>
+          <column hidden="0" name="Distance" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="RouteLen" type="field" width="-1"/>
+          <column hidden="0" name="Source" type="field" width="-1"/>
+          <column hidden="0" name="length_m" type="field" width="-1"/>
+          <column hidden="0" name="length_km" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -1940,34 +1938,34 @@ 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="0"/>
-        <field name="length_m" editable="0"/>
-        <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="0" name="length_km"/>
+        <field editable="0" name="length_m"/>
+        <field editable="1" name="timestamp"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="Distance"/>
-        <field labelOnTop="0" name="Name"/>
-        <field labelOnTop="0" name="RouteLen"/>
-        <field labelOnTop="0" name="Source"/>
-        <field labelOnTop="0" name="begin"/>
-        <field labelOnTop="0" name="descriptio"/>
-        <field labelOnTop="0" name="end"/>
-        <field labelOnTop="0" name="length_km"/>
-        <field labelOnTop="0" name="length_m"/>
-        <field labelOnTop="0" name="timestamp"/>
+        <field name="Distance" labelOnTop="0"/>
+        <field name="Name" labelOnTop="0"/>
+        <field name="RouteLen" labelOnTop="0"/>
+        <field name="Source" labelOnTop="0"/>
+        <field name="begin" labelOnTop="0"/>
+        <field name="descriptio" labelOnTop="0"/>
+        <field name="end" labelOnTop="0"/>
+        <field name="length_km" labelOnTop="0"/>
+        <field name="length_m" labelOnTop="0"/>
+        <field name="timestamp" labelOnTop="0"/>
       </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" simplifyLocal="1" readOnly="0" geometry="Line" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" wkbType="MultiLineString" simplifyDrawingTol="1">
+    <maplayer styleCategories="AllStyleCategories" refreshOnNotifyMessage="" simplifyAlgorithm="0" maxScale="0" geometry="Line" simplifyMaxScale="1" simplifyLocal="1" labelsEnabled="0" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" type="vector" minScale="1e+08" readOnly="0" autoRefreshTime="0" autoRefreshEnabled="0" simplifyDrawingTol="1" wkbType="MultiLineString" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>17.99958333333333371</xmin>
         <ymin>-34.00041666666666629</ymin>
@@ -2031,10 +2029,10 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" type="singleSymbol" forceraster="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" enableorderby="0" forceraster="0" symbollevels="0">
         <symbols>
-          <symbol name="0" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+          <symbol force_rhr="0" name="0" clip_to_extent="1" type="line" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleLine">
               <prop k="capstyle" v="square"/>
               <prop k="customdash" v="5;2"/>
               <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2068,7 +2066,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -2096,9 +2094,9 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="ID" index="0" name=""/>
-        <alias field="height" index="1" name=""/>
-        <alias field="elevation" index="2" name=""/>
+        <alias index="0" field="ID" name=""/>
+        <alias index="1" field="height" name=""/>
+        <alias index="2" field="elevation" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -2108,20 +2106,20 @@ def my_form_open(dialog, layer, feature):
         <default field="elevation" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="ID" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="height" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="elevation" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint exp_strength="0" field="ID" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="height" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="elevation" constraints="0" notnull_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="ID" exp="" desc=""/>
-        <constraint field="height" exp="" desc=""/>
-        <constraint field="elevation" exp="" desc=""/>
+        <constraint exp="" field="ID" desc=""/>
+        <constraint exp="" field="height" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -2141,7 +2139,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" simplifyLocal="1" readOnly="0" geometry="Polygon" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" wkbType="Polygon" simplifyDrawingTol="1">
+    <maplayer styleCategories="AllStyleCategories" refreshOnNotifyMessage="" simplifyAlgorithm="0" maxScale="0" geometry="Polygon" simplifyMaxScale="1" simplifyLocal="1" labelsEnabled="0" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" type="vector" minScale="1e+08" readOnly="0" autoRefreshTime="0" autoRefreshEnabled="0" simplifyDrawingTol="1" wkbType="Polygon" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.94678832168284544</ymin>
@@ -2207,10 +2205,10 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" type="singleSymbol" forceraster="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" enableorderby="0" forceraster="0" symbollevels="0">
         <symbols>
-          <symbol name="0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+          <symbol force_rhr="0" name="0" clip_to_extent="1" type="fill" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleFill">
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="225,89,137,255"/>
               <prop k="joinstyle" v="bevel"/>
@@ -2239,7 +2237,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option value="" type="QString"/>
         </activeChecks>
@@ -2269,9 +2267,9 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="page" index="2" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
+        <alias index="2" field="page" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -2281,20 +2279,20 @@ def my_form_open(dialog, layer, feature):
         <default field="page" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="type" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="page" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint exp_strength="0" field="id" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="page" constraints="0" notnull_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="page" exp="" desc=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="type" desc=""/>
+        <constraint exp="" field="page" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -2314,7 +2312,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Line" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" wkbType="MultiLineString" simplifyDrawingTol="1">
+    <maplayer styleCategories="AllStyleCategories" refreshOnNotifyMessage="" simplifyAlgorithm="0" maxScale="0" geometry="Line" simplifyMaxScale="1" simplifyLocal="1" labelsEnabled="1" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" type="vector" minScale="1e+08" readOnly="0" autoRefreshTime="0" autoRefreshEnabled="0" simplifyDrawingTol="1" wkbType="MultiLineString" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.41275838185438474</xmin>
         <ymin>-33.90124710387746632</ymin>
@@ -2371,7 +2369,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
+          <spatial minz="0" minx="0" maxz="0" maxy="0" maxx="0" crs="" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -2395,10 +2393,10 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" type="singleSymbol" forceraster="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" enableorderby="0" forceraster="0" symbollevels="0">
         <symbols>
-          <symbol name="0" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+          <symbol force_rhr="0" name="0" clip_to_extent="1" type="line" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleLine">
               <prop k="capstyle" v="square"/>
               <prop k="customdash" v="5;2"/>
               <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2430,15 +2428,15 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings>
-          <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="1" fontSizeUnit="Point" fieldName="Name" fontSize="10" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <text-buffer bufferOpacity="1" bufferNoFill="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1"/>
-            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="0" shapeRotationType="0" shapeSizeX="0" shapeRadiiX="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+          <text-style fontLetterSpacing="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Semibold" textColor="0,0,0,255" multilineHeight="1" fontSize="10" fontWeight="63" fieldName="Name" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="1" useSubstitutions="0" fontUnderline="0">
+            <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiY="0" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeDraw="0" shapeOpacity="1" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="0" shapeRadiiX="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
             <substitutions/>
           </text-style>
-          <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
-          <placement centroidInside="0" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="2" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" geometryGenerator="" dist="2" yOffset="0" geometryGeneratorType="LineGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="5" placementFlags="10" offsetType="0" offsetUnits="MM"/>
-          <rendering labelPerPart="0" obstacleType="0" scaleMax="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="0" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="0"/>
+          <text-format multilineAlign="0" autoWrapLength="0" plussign="0" addDirectionSymbol="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+          <placement maxCurvedCharAngleOut="-25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="2" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" geometryGeneratorType="LineGeometry" quadOffset="4" distUnits="MM" offsetUnits="MM" repeatDistanceUnits="MM" dist="2" centroidInside="0" geometryGenerator="" placementFlags="10" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" maxCurvedCharAngleIn="25" priority="5"/>
+          <rendering displayAll="0" upsidedownLabels="0" mergeLines="0" fontLimitPixelSize="0" maxNumLabels="2000" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="1" scaleMax="0" minFeatureSize="0" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="0" fontMaxPixelSize="10000" scaleMin="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -2449,21 +2447,21 @@ def my_form_open(dialog, layer, feature):
         </settings>
       </labeling>
       <customproperties>
-        <property key="dualview/previewExpressions" value="Name"/>
-        <property key="embeddedWidgets/count" value="0"/>
+        <property value="Name" key="dualview/previewExpressions"/>
+        <property value="0" key="embeddedWidgets/count"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory enabled="0" minScaleDenominator="0" width="15" rotationOffset="270" penColor="#000000" penAlpha="255" height="15" penWidth="0" diagramOrientation="Up" backgroundColor="#ffffff" scaleDependency="Area" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" opacity="1" lineSizeType="MM" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeType="MM" scaleBasedVisibility="0" backgroundAlpha="255" barWidth="5">
           <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-          <attribute field="" color="#000000" label=""/>
+          <attribute color="#000000" label="" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" priority="0" dist="0" placement="2" obstacle="0" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" showAll="1" placement="2" linePlacementFlags="18" obstacle="0" dist="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -2472,7 +2470,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -2493,8 +2491,8 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="Name" index="1" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="Name" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -2503,22 +2501,22 @@ def my_form_open(dialog, layer, feature):
         <default field="Name" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="Name" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint exp_strength="0" field="id" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="Name" constraints="0" notnull_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="Name" exp="" desc=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="Name" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="-1" name="Name" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="0" name="Name" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -2549,18 +2547,18 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="Name" editable="1"/>
-        <field name="id" editable="1"/>
+        <field editable="1" name="Name"/>
+        <field editable="1" name="id"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="Name"/>
-        <field labelOnTop="0" name="id"/>
+        <field name="Name" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
       </labelOnTop>
       <widgets/>
       <previewExpression>Name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="100000" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" simplifyLocal="1" readOnly="0" geometry="Line" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" simplifyDrawingTol="1">
+    <maplayer styleCategories="AllStyleCategories" refreshOnNotifyMessage="" simplifyAlgorithm="0" maxScale="100000" geometry="Line" simplifyMaxScale="1" simplifyLocal="1" labelsEnabled="0" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" type="vector" minScale="1e+08" readOnly="0" autoRefreshTime="0" autoRefreshEnabled="0" simplifyDrawingTol="1" wkbType="MultiLineString" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.40814103070666974</xmin>
         <ymin>-33.90827185075657724</ymin>
@@ -2617,7 +2615,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
+          <spatial minz="0" minx="0" maxz="0" maxy="0" maxx="0" crs="" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -2641,15 +2639,15 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" type="RuleRenderer" forceraster="0" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" enableorderby="0" forceraster="0" symbollevels="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule symbol="0" key="{85adf11b-f941-44b6-8847-c828ab845cdc}" description="Only show when active in Atlas" label="21KM" filter="&quot;distance&quot; = '21KM'"/>
-          <rule symbol="1" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" description="Only show when active in Atlas" label="10KM" filter="&quot;distance&quot; = '10KM'"/>
-          <rule symbol="2" key="{cf733f0f-ab72-441e-b213-841aa39c1671}" description="Only show when active in Atlas" label="5KM" filter="&quot;distance&quot; = '5KM'"/>
+          <rule symbol="0" filter="&quot;distance&quot; = '21KM'" label="21KM" key="{85adf11b-f941-44b6-8847-c828ab845cdc}" description="Only show when active in Atlas"/>
+          <rule symbol="1" filter="&quot;distance&quot; = '10KM'" label="10KM" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" description="Only show when active in Atlas"/>
+          <rule symbol="2" filter="&quot;distance&quot; = '5KM'" label="5KM" key="{cf733f0f-ab72-441e-b213-841aa39c1671}" description="Only show when active in Atlas"/>
         </rules>
         <symbols>
-          <symbol name="0" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+          <symbol force_rhr="0" name="0" clip_to_extent="1" type="line" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="MarkerLine">
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="average_angle_unit" v="MM"/>
@@ -2672,8 +2670,8 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@0@0" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <symbol force_rhr="0" name="@0@0" clip_to_extent="1" type="marker" alpha="1">
+                <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
                   <prop k="angle" v="0"/>
                   <prop k="color" v="210,32,39,255"/>
                   <prop k="horizontal_anchor_point" v="1"/>
@@ -2702,7 +2700,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer pass="0" locked="0" enabled="1" class="MarkerLine">
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="average_angle_unit" v="MM"/>
@@ -2736,8 +2734,8 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@0@1" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+              <symbol force_rhr="0" name="@0@1" clip_to_extent="1" type="marker" alpha="1">
+                <layer pass="0" locked="0" enabled="1" class="FilledMarker">
                   <prop k="angle" v="0"/>
                   <prop k="color" v="210,32,39,255"/>
                   <prop k="horizontal_anchor_point" v="1"/>
@@ -2757,8 +2755,8 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@0@1@0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                  <symbol force_rhr="0" name="@@0@1@0" clip_to_extent="1" type="fill" alpha="1">
+                    <layer pass="0" locked="0" enabled="1" class="SimpleFill">
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="210,32,39,255"/>
                       <prop k="joinstyle" v="bevel"/>
@@ -2782,7 +2780,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleLine">
               <prop k="capstyle" v="flat"/>
               <prop k="customdash" v="5;2"/>
               <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2808,8 +2806,8 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+          <symbol force_rhr="0" name="1" clip_to_extent="1" type="line" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="MarkerLine">
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="average_angle_unit" v="MM"/>
@@ -2843,8 +2841,8 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@1@0" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+              <symbol force_rhr="0" name="@1@0" clip_to_extent="1" type="marker" alpha="1">
+                <layer pass="0" locked="0" enabled="1" class="FilledMarker">
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
                   <prop k="horizontal_anchor_point" v="1"/>
@@ -2864,8 +2862,8 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@1@0@0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                  <symbol force_rhr="0" name="@@1@0@0" clip_to_extent="1" type="fill" alpha="1">
+                    <layer pass="0" locked="0" enabled="1" class="SimpleFill">
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
                       <prop k="joinstyle" v="miter"/>
@@ -2889,7 +2887,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer pass="0" locked="0" enabled="1" class="MarkerLine">
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="average_angle_unit" v="MM"/>
@@ -2923,8 +2921,8 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@1@1" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+              <symbol force_rhr="0" name="@1@1" clip_to_extent="1" type="marker" alpha="1">
+                <layer pass="0" locked="0" enabled="1" class="FilledMarker">
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
                   <prop k="horizontal_anchor_point" v="1"/>
@@ -2944,8 +2942,8 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@1@1@0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                  <symbol force_rhr="0" name="@@1@1@0" clip_to_extent="1" type="fill" alpha="1">
+                    <layer pass="0" locked="0" enabled="1" class="SimpleFill">
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
                       <prop k="joinstyle" v="bevel"/>
@@ -2969,7 +2967,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleLine">
               <prop k="capstyle" v="flat"/>
               <prop k="customdash" v="5;2"/>
               <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2995,8 +2993,8 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+          <symbol force_rhr="0" name="2" clip_to_extent="1" type="line" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="MarkerLine">
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="average_angle_unit" v="MM"/>
@@ -3030,8 +3028,8 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@0" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+              <symbol force_rhr="0" name="@2@0" clip_to_extent="1" type="marker" alpha="1">
+                <layer pass="0" locked="0" enabled="1" class="FilledMarker">
                   <prop k="angle" v="0"/>
                   <prop k="color" v="69,100,25,255"/>
                   <prop k="horizontal_anchor_point" v="1"/>
@@ -3051,8 +3049,8 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@2@0@0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                  <symbol force_rhr="0" name="@@2@0@0" clip_to_extent="1" type="fill" alpha="1">
+                    <layer pass="0" locked="0" enabled="1" class="SimpleFill">
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="69,100,25,255"/>
                       <prop k="joinstyle" v="miter"/>
@@ -3076,7 +3074,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer pass="0" locked="0" enabled="1" class="MarkerLine">
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="average_angle_unit" v="MM"/>
@@ -3110,8 +3108,8 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@1" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+              <symbol force_rhr="0" name="@2@1" clip_to_extent="1" type="marker" alpha="1">
+                <layer pass="0" locked="0" enabled="1" class="FilledMarker">
                   <prop k="angle" v="0"/>
                   <prop k="color" v="69,100,25,255"/>
                   <prop k="horizontal_anchor_point" v="1"/>
@@ -3131,8 +3129,8 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol name="@@2@1@0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                  <symbol force_rhr="0" name="@@2@1@0" clip_to_extent="1" type="fill" alpha="1">
+                    <layer pass="0" locked="0" enabled="1" class="SimpleFill">
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="69,100,25,255"/>
                       <prop k="joinstyle" v="bevel"/>
@@ -3156,7 +3154,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleLine">
               <prop k="capstyle" v="flat"/>
               <prop k="customdash" v="5;2"/>
               <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -3184,25 +3182,25 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </symbols>
         <orderby>
-          <orderByClause asc="0" nullsFirst="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
+          <orderByClause nullsFirst="0" asc="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
         </orderby>
       </renderer-v2>
       <customproperties>
-        <property key="dualview/previewExpressions" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-        <property key="embeddedWidgets/count" value="0"/>
+        <property value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" key="dualview/previewExpressions"/>
+        <property value="0" key="embeddedWidgets/count"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory enabled="0" minScaleDenominator="100000" width="15" rotationOffset="270" penColor="#000000" penAlpha="255" height="15" penWidth="0" diagramOrientation="Up" backgroundColor="#ffffff" scaleDependency="Area" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" opacity="1" lineSizeType="MM" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeType="MM" scaleBasedVisibility="0" backgroundAlpha="255" barWidth="5">
           <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
-          <attribute field="" color="#000000" label=""/>
+          <attribute color="#000000" label="" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" priority="0" dist="0" placement="2" obstacle="0" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" showAll="1" placement="2" linePlacementFlags="2" obstacle="0" dist="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -3211,7 +3209,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -3235,8 +3233,8 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="Distance" index="1" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="Distance" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -3245,22 +3243,22 @@ def my_form_open(dialog, layer, feature):
         <default field="Distance" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="Distance" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint exp_strength="0" field="id" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="Distance" constraints="0" notnull_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="Distance" exp="" desc=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="Distance" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;Distance&quot;">
+      <attributetableconfig sortExpression="&quot;Distance&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" name="Distance" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="id" hidden="0" type="field"/>
+          <column hidden="0" name="Distance" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3291,36 +3289,36 @@ 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 labelOnTop="0" name="Distance"/>
-        <field labelOnTop="0" name="Name"/>
-        <field labelOnTop="0" name="RouteLen"/>
-        <field labelOnTop="0" name="Source"/>
-        <field labelOnTop="0" name="begin"/>
-        <field labelOnTop="0" name="descriptio"/>
-        <field labelOnTop="0" name="end"/>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="length_km"/>
-        <field labelOnTop="0" name="length_m"/>
-        <field labelOnTop="0" name="timestamp"/>
+        <field name="Distance" labelOnTop="0"/>
+        <field name="Name" labelOnTop="0"/>
+        <field name="RouteLen" labelOnTop="0"/>
+        <field name="Source" labelOnTop="0"/>
+        <field name="begin" labelOnTop="0"/>
+        <field name="descriptio" labelOnTop="0"/>
+        <field name="end" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="length_km" labelOnTop="0"/>
+        <field name="length_m" labelOnTop="0"/>
+        <field name="timestamp" labelOnTop="0"/>
       </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="100000" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Point" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" wkbType="Point" simplifyDrawingTol="1">
+    <maplayer styleCategories="AllStyleCategories" refreshOnNotifyMessage="" simplifyAlgorithm="0" maxScale="100000" geometry="Point" simplifyMaxScale="1" simplifyLocal="1" labelsEnabled="1" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" type="vector" minScale="1e+08" readOnly="0" autoRefreshTime="0" autoRefreshEnabled="0" simplifyDrawingTol="1" wkbType="Point" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.38517016505928936</xmin>
         <ymin>-33.91987011678683217</ymin>
@@ -3384,10 +3382,10 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" type="singleSymbol" forceraster="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" enableorderby="0" forceraster="0" symbollevels="0">
         <symbols>
-          <symbol name="0" clip_to_extent="1" force_rhr="0" type="marker" alpha="0.796078">
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+          <symbol force_rhr="0" name="0" clip_to_extent="1" type="marker" alpha="0.796078">
+            <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
               <prop k="angle" v="0"/>
               <prop k="color" v="227,0,185,255"/>
               <prop k="horizontal_anchor_point" v="1"/>
@@ -3427,17 +3425,17 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{de1ff1b5-a53a-4841-835f-57785b684a9d}">
-          <rule key="{9ea624c1-7179-4746-8777-84b8008475a1}" description="Show in marshal maps" filter="'marshal' = attribute( $atlasfeature , 'type' )">
+          <rule filter="'marshal' = attribute( $atlasfeature , 'type' )" key="{9ea624c1-7179-4746-8777-84b8008475a1}" description="Show in marshal maps">
             <settings>
-              <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="1" fontSizeUnit="Point" fieldName="position" fontSize="8" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
-                <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
-                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0.4" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0.2" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="0.2" shapeRadiiX="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+              <text-style fontLetterSpacing="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Semibold" textColor="0,0,0,255" multilineHeight="1" fontSize="8" fontWeight="63" fieldName="position" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="1" useSubstitutions="0" fontUnderline="0">
+                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeType="3" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiY="0" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeDraw="1" shapeOpacity="1" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.2" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="0.2" shapeRadiiX="0" shapeBorderWidth="0.4" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
-              <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="1" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="0" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="8" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
-              <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="1" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
+              <text-format multilineAlign="0" autoWrapLength="0" plussign="0" addDirectionSymbol="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+              <placement maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="1" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" geometryGeneratorType="PointGeometry" quadOffset="4" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="0" centroidInside="0" geometryGenerator="" placementFlags="10" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" maxCurvedCharAngleIn="20" priority="8"/>
+              <rendering displayAll="1" upsidedownLabels="0" mergeLines="0" fontLimitPixelSize="0" maxNumLabels="2000" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="1" scaleMax="10000000" minFeatureSize="0" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="0" fontMaxPixelSize="10000" scaleMin="1" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -3478,17 +3476,17 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </settings>
           </rule>
-          <rule key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}" description="Show in marshal overview" filter="'marshal plan' = attribute( $atlasfeature , 'type' )">
+          <rule filter="'marshal plan' = attribute( $atlasfeature , 'type' )" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}" description="Show in marshal overview">
             <settings>
-              <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.9" fontSizeUnit="Point" fieldName="position" fontSize="4" blendMode="0" textColor="227,0,185,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
-                <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
-                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0.1" shapeOpacity="0.5" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="0" shapeRadiiX="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+              <text-style fontLetterSpacing="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Semibold" textColor="227,0,185,255" multilineHeight="1" fontSize="4" fontWeight="63" fieldName="position" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="0.9" useSubstitutions="0" fontUnderline="0">
+                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeType="3" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiY="0" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeDraw="1" shapeOpacity="0.5" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="0" shapeRadiiX="0" shapeBorderWidth="0.1" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
-              <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="6" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="1" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="10" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
-              <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="1" upsidedownLabels="0" obstacle="0" fontMaxPixelSize="10000" zIndex="2" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
+              <text-format multilineAlign="0" autoWrapLength="0" plussign="0" addDirectionSymbol="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+              <placement maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="6" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" geometryGeneratorType="PointGeometry" quadOffset="4" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="1" centroidInside="0" geometryGenerator="" placementFlags="10" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" maxCurvedCharAngleIn="20" priority="10"/>
+              <rendering displayAll="1" upsidedownLabels="0" mergeLines="0" fontLimitPixelSize="0" maxNumLabels="2000" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="0" scaleMax="10000000" minFeatureSize="0" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="2" fontMaxPixelSize="10000" scaleMin="1" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -3517,155 +3515,155 @@ def my_form_open(dialog, layer, feature):
         </rules>
       </labeling>
       <customproperties>
-        <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 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="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory enabled="0" minScaleDenominator="100000" width="15" rotationOffset="270" penColor="#000000" penAlpha="255" height="15" penWidth="0" diagramOrientation="Up" backgroundColor="#ffffff" scaleDependency="Area" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" opacity="1" lineSizeType="MM" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeType="MM" scaleBasedVisibility="0" backgroundAlpha="255" barWidth="5">
           <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
-          <attribute field="" color="#000000" label=""/>
+          <attribute color="#000000" label="" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="10" priority="0" dist="0" placement="0" obstacle="0" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" showAll="1" placement="0" linePlacementFlags="10" obstacle="0" dist="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -3674,7 +3672,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -3711,9 +3709,9 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="position" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="position" name=""/>
+        <alias index="2" field="type" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -3723,25 +3721,25 @@ def my_form_open(dialog, layer, feature):
         <default field="type" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="position" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="type" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint exp_strength="0" field="id" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="position" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" constraints="0" notnull_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="position" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="position" desc=""/>
+        <constraint exp="" field="type" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;position&quot;">
+      <attributetableconfig sortExpression="&quot;position&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="position" hidden="0" type="field"/>
-          <column width="-1" name="type" hidden="0" type="field"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="position" type="field" width="-1"/>
+          <column hidden="0" name="type" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3814,7 +3812,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer maxScale="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" simplifyLocal="1" readOnly="0" geometry="Polygon" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" wkbType="Polygon" simplifyDrawingTol="1">
+    <maplayer styleCategories="AllStyleCategories" refreshOnNotifyMessage="" simplifyAlgorithm="0" maxScale="0" geometry="Polygon" simplifyMaxScale="1" simplifyLocal="1" labelsEnabled="0" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" type="vector" minScale="1e+08" readOnly="0" autoRefreshTime="0" autoRefreshEnabled="0" simplifyDrawingTol="1" wkbType="Polygon" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -3871,7 +3869,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
+          <spatial minz="0" minx="0" maxz="0" maxy="0" maxx="0" crs="" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -3888,12 +3886,12 @@ def my_form_open(dialog, layer, feature):
       <dataDependencies/>
       <legend type="default-vector"/>
       <expressionfields>
-        <field name="fence_length" expression="round( relation_aggregate( 'fence_group_rel', 'sum', &quot;fence_len&quot; ), 0)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
-        <field name="cone_length" expression="round( relation_aggregate( 'fence_group_rel', 'sum', &quot;cone_len&quot; ), 0)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
-        <field name="fence_length" expression="round(relation_aggregate( 'fence_group_rel', 'sum', $length, '', regexp_match(&quot;type&quot;, '^fenc') ), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
-        <field name="fence_length" expression="round( relation_aggregate( 'fence_group_rel', 'sum', $length, '', regexp_match(&quot;type&quot;, '^fenc') ), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
-        <field name="cone_length" expression="relation_aggregate( 'fence_group_rel', 'sum', &quot;cone_len&quot; )" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
-        <field name="type" expression="'fencing'" typeName="string" length="0" subType="0" precision="0" comment="" type="10"/>
+        <field precision="0" subType="0" typeName="double precision" name="fence_length" type="6" length="-1" comment="" expression="round( relation_aggregate( 'fence_group_rel', 'sum', &quot;fence_len&quot; ), 0)"/>
+        <field precision="0" subType="0" typeName="double precision" name="cone_length" type="6" length="-1" comment="" expression="round( relation_aggregate( 'fence_group_rel', 'sum', &quot;cone_len&quot; ), 0)"/>
+        <field precision="0" subType="0" typeName="double precision" name="fence_length" type="6" length="-1" comment="" expression="round(relation_aggregate( 'fence_group_rel', 'sum', $length, '', regexp_match(&quot;type&quot;, '^fenc') ), 1)"/>
+        <field precision="0" subType="0" typeName="double precision" name="fence_length" type="6" length="-1" comment="" expression="round( relation_aggregate( 'fence_group_rel', 'sum', $length, '', regexp_match(&quot;type&quot;, '^fenc') ), 1)"/>
+        <field precision="0" subType="0" typeName="double precision" name="cone_length" type="6" length="-1" comment="" expression="relation_aggregate( 'fence_group_rel', 'sum', &quot;cone_len&quot; )"/>
+        <field precision="0" subType="0" typeName="string" name="type" type="10" length="0" comment="" expression="'fencing'"/>
       </expressionfields>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -3904,10 +3902,10 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" type="singleSymbol" forceraster="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" enableorderby="0" forceraster="0" symbollevels="0">
         <symbols>
-          <symbol name="0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+          <symbol force_rhr="0" name="0" clip_to_extent="1" type="fill" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleFill">
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="0,170,0,255"/>
               <prop k="joinstyle" v="bevel"/>
@@ -3933,21 +3931,21 @@ def my_form_open(dialog, layer, feature):
         <sizescale/>
       </renderer-v2>
       <customproperties>
-        <property key="dualview/previewExpressions" value="name"/>
-        <property key="embeddedWidgets/count" value="0"/>
+        <property value="name" key="dualview/previewExpressions"/>
+        <property value="0" key="embeddedWidgets/count"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory enabled="0" minScaleDenominator="0" width="15" rotationOffset="270" penColor="#000000" penAlpha="255" height="15" penWidth="0" diagramOrientation="Up" backgroundColor="#ffffff" scaleDependency="Area" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" opacity="1" lineSizeType="MM" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeType="MM" scaleBasedVisibility="0" backgroundAlpha="255" barWidth="5">
           <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-          <attribute field="" color="#000000" label=""/>
+          <attribute color="#000000" label="" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" priority="0" dist="0" placement="1" obstacle="0" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" showAll="1" placement="1" linePlacementFlags="18" obstacle="0" dist="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -3956,7 +3954,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -3998,11 +3996,11 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="name" index="0" name=""/>
-        <alias field="group" index="1" name=""/>
-        <alias field="fence_length" index="2" name=""/>
-        <alias field="cone_length" index="3" name=""/>
-        <alias field="type" index="4" name=""/>
+        <alias index="0" field="name" name=""/>
+        <alias index="1" field="group" name=""/>
+        <alias index="2" field="fence_length" name=""/>
+        <alias index="3" field="cone_length" name=""/>
+        <alias index="4" field="type" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -4014,37 +4012,37 @@ def my_form_open(dialog, layer, feature):
         <default field="type" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="name" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="group" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="fence_length" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="cone_length" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="type" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint exp_strength="0" field="name" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="group" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="fence_length" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="cone_length" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" constraints="0" notnull_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="group" exp="" desc=""/>
-        <constraint field="fence_length" exp="" desc=""/>
-        <constraint field="cone_length" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="group" desc=""/>
+        <constraint exp="" field="fence_length" desc=""/>
+        <constraint exp="" field="cone_length" desc=""/>
+        <constraint exp="" field="type" desc=""/>
       </constraintExpressions>
       <expressionfields>
-        <field name="fence_length" expression="round( relation_aggregate( 'fence_group_rel', 'sum', &quot;fence_len&quot; ), 0)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
-        <field name="cone_length" expression="round( relation_aggregate( 'fence_group_rel', 'sum', &quot;cone_len&quot; ), 0)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
-        <field name="fence_length" expression="round(relation_aggregate( 'fence_group_rel', 'sum', $length, '', regexp_match(&quot;type&quot;, '^fenc') ), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
-        <field name="fence_length" expression="round( relation_aggregate( 'fence_group_rel', 'sum', $length, '', regexp_match(&quot;type&quot;, '^fenc') ), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
-        <field name="cone_length" expression="relation_aggregate( 'fence_group_rel', 'sum', &quot;cone_len&quot; )" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
-        <field name="type" expression="'fencing'" typeName="string" length="0" subType="0" precision="0" comment="" type="10"/>
+        <field precision="0" subType="0" typeName="double precision" name="fence_length" type="6" length="-1" comment="" expression="round( relation_aggregate( 'fence_group_rel', 'sum', &quot;fence_len&quot; ), 0)"/>
+        <field precision="0" subType="0" typeName="double precision" name="cone_length" type="6" length="-1" comment="" expression="round( relation_aggregate( 'fence_group_rel', 'sum', &quot;cone_len&quot; ), 0)"/>
+        <field precision="0" subType="0" typeName="double precision" name="fence_length" type="6" length="-1" comment="" expression="round(relation_aggregate( 'fence_group_rel', 'sum', $length, '', regexp_match(&quot;type&quot;, '^fenc') ), 1)"/>
+        <field precision="0" subType="0" typeName="double precision" name="fence_length" type="6" length="-1" comment="" expression="round( relation_aggregate( 'fence_group_rel', 'sum', $length, '', regexp_match(&quot;type&quot;, '^fenc') ), 1)"/>
+        <field precision="0" subType="0" typeName="double precision" name="cone_length" type="6" length="-1" comment="" expression="relation_aggregate( 'fence_group_rel', 'sum', &quot;cone_len&quot; )"/>
+        <field precision="0" subType="0" typeName="string" name="type" type="10" length="0" comment="" expression="'fencing'"/>
       </expressionfields>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="1" sortExpression="&quot;fence_length&quot;">
+      <attributetableconfig sortExpression="&quot;fence_length&quot;" sortOrder="1" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" name="name" hidden="0" type="field"/>
-          <column width="-1" name="group" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="148" name="fence_length" hidden="0" type="field"/>
-          <column width="157" name="cone_length" hidden="0" type="field"/>
+          <column hidden="0" name="name" type="field" width="-1"/>
+          <column hidden="0" name="group" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="fence_length" type="field" width="148"/>
+          <column hidden="0" name="cone_length" type="field" width="157"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -4075,16 +4073,16 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="cone_length" editable="0"/>
-        <field name="fence_length" editable="0"/>
-        <field name="group" editable="1"/>
-        <field name="name" editable="1"/>
+        <field editable="0" name="cone_length"/>
+        <field editable="0" name="fence_length"/>
+        <field editable="1" name="group"/>
+        <field editable="1" name="name"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="cone_length"/>
-        <field labelOnTop="0" name="fence_length"/>
-        <field labelOnTop="0" name="group"/>
-        <field labelOnTop="0" name="name"/>
+        <field name="cone_length" labelOnTop="0"/>
+        <field name="fence_length" labelOnTop="0"/>
+        <field name="group" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
       </labelOnTop>
       <widgets>
         <widget name="fence_group_rel">
@@ -4096,7 +4094,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Line" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" wkbType="MultiLineString" simplifyDrawingTol="1">
+    <maplayer styleCategories="AllStyleCategories" refreshOnNotifyMessage="" simplifyAlgorithm="0" maxScale="0" geometry="Line" simplifyMaxScale="1" simplifyLocal="1" labelsEnabled="1" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" type="vector" minScale="1e+08" readOnly="0" autoRefreshTime="0" autoRefreshEnabled="0" simplifyDrawingTol="1" wkbType="MultiLineString" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -4153,7 +4151,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
+          <spatial minz="0" minx="0" maxz="0" maxy="0" maxx="0" crs="" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -4168,26 +4166,26 @@ def my_form_open(dialog, layer, feature):
       <dataDependencies/>
       <legend type="default-vector"/>
       <expressionfields>
-        <field name="fence_len" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
-        <field name="fence_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
-        <field name="cone_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
+        <field precision="0" subType="0" typeName="double precision" name="fence_len" type="6" length="-1" comment="" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)"/>
+        <field precision="0" subType="0" typeName="double precision" name="fence_len" type="6" length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)"/>
+        <field precision="0" subType="0" typeName="double precision" name="cone_len" type="6" length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)"/>
       </expressionfields>
       <map-layer-style-manager current="Fencing">
         <map-layer-style name="Fencing"/>
         <map-layer-style name="Simple">
-          <qgis labelsEnabled="1" simplifyDrawingTol="1" simplifyMaxScale="1" simplifyDrawingHints="1" simplifyLocal="1" readOnly="0" maxScale="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" version="3.8.3-Zanzibar" hasScaleBasedVisibilityFlag="0" minScale="1e+08">
+          <qgis hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyAlgorithm="0" simplifyDrawingHints="1" simplifyLocal="1" maxScale="0" styleCategories="AllStyleCategories" minScale="1e+08" readOnly="0" labelsEnabled="1" version="3.8.3-Zanzibar" simplifyMaxScale="1">
             <flags>
               <Identifiable>1</Identifiable>
               <Removable>1</Removable>
               <Searchable>1</Searchable>
             </flags>
-            <renderer-v2 symbollevels="1" type="RuleRenderer" forceraster="0" enableorderby="0">
+            <renderer-v2 enableorderby="0" type="RuleRenderer" forceraster="0" symbollevels="1">
               <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-                <rule symbol="0" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" label="Visible" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL"/>
+                <rule symbol="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" label="Visible" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}"/>
               </rules>
               <symbols>
-                <symbol name="0" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-                  <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+                <symbol force_rhr="0" name="0" clip_to_extent="1" type="line" alpha="1">
+                  <layer pass="0" locked="0" enabled="1" class="SimpleLine">
                     <prop k="capstyle" v="square"/>
                     <prop k="customdash" v="5;2"/>
                     <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4217,17 +4215,17 @@ def my_form_open(dialog, layer, feature):
             </renderer-v2>
             <labeling type="rule-based">
               <rules key="{7b0a59ec-9387-4d8e-badd-0d99ebc42174}">
-                <rule key="{4961744d-6387-45d0-90bf-01e48d575e6e}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
+                <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{4961744d-6387-45d0-90bf-01e48d575e6e}">
                   <settings>
-                    <text-style previewBkgrdColor="#ffffff" namedStyle="Regular" fontWeight="50" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.8" fontSizeUnit="Point" fieldName="comment" fontSize="11" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
-                      <text-buffer bufferOpacity="1" bufferNoFill="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
-                      <background shapeFillColor="255,255,255,255" shapeJoinStyle="128" shapeBlendMode="0" shapeBorderWidth="0.6" shapeOffsetX="0" shapeOpacity="0.6" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeBorderColor="255,255,0,255" shapeSizeType="0" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="1" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="1" shapeRadiiX="1" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                      <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+                    <text-style fontLetterSpacing="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Regular" textColor="0,0,0,255" multilineHeight="1" fontSize="11" fontWeight="50" fieldName="comment" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="0.8" useSubstitutions="0" fontUnderline="0">
+                      <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                      <background shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="255,255,0,255" shapeSizeUnit="MM" shapeRadiiY="1" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="128" shapeBorderWidthUnit="MM" shapeDraw="1" shapeOpacity="0.6" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeSizeX="1" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="1" shapeRadiiX="1" shapeBorderWidth="0.6" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                      <shadow shadowBlendMode="6" shadowScale="100" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowRadiusUnit="MM"/>
                       <substitutions/>
                     </text-style>
-                    <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="4294967295" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
-                    <placement centroidInside="0" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="4" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" geometryGenerator="" dist="5" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="5" placementFlags="2" offsetType="0" offsetUnits="MM"/>
-                    <rendering labelPerPart="0" obstacleType="0" scaleMax="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="0" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="1" displayAll="1"/>
+                    <text-format multilineAlign="4294967295" autoWrapLength="0" plussign="0" placeDirectionSymbol="0" addDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+                    <placement maxCurvedCharAngleOut="-25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="4" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorType="PointGeometry" repeatDistance="0" quadOffset="4" distUnits="MM" offsetUnits="MM" repeatDistanceUnits="MM" dist="5" centroidInside="0" geometryGenerator="" placementFlags="2" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" xOffset="0" priority="5"/>
+                    <rendering displayAll="1" upsidedownLabels="0" mergeLines="1" fontLimitPixelSize="0" maxNumLabels="2000" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="1" scaleMax="0" minFeatureSize="0" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="0" fontMaxPixelSize="10000" scaleMin="0" obstacleFactor="1"/>
                     <dd_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -4248,17 +4246,17 @@ def my_form_open(dialog, layer, feature):
                     </dd_properties>
                   </settings>
                 </rule>
-                <rule key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}" filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')">
+                <rule filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}">
                   <settings>
-                    <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="1" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="1" fontSizeUnit="Point" fieldName="round( $length, 1) || 'm'" fontSize="12" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
-                      <text-buffer bufferOpacity="1" bufferNoFill="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1"/>
-                      <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeBorderWidth="0" shapeOffsetX="0" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeSizeType="0" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="0" shapeRotationType="0" shapeSizeX="0" shapeRadiiX="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                      <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+                    <text-style fontLetterSpacing="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Semibold" textColor="0,0,0,255" multilineHeight="1" fontSize="12" fontWeight="63" fieldName="round( $length, 1) || 'm'" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="1" useSubstitutions="0" fontUnderline="0">
+                      <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                      <background shapeFillColor="255,255,255,255" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiY="0" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeDraw="0" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeSizeX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="0" shapeRadiiX="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                      <shadow shadowBlendMode="6" shadowScale="100" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowRadiusUnit="MM"/>
                       <substitutions/>
                     </text-style>
-                    <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="4294967295" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
-                    <placement centroidInside="0" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="2" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" geometryGenerator="" dist="1" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="5" placementFlags="15" offsetType="0" offsetUnits="MM"/>
-                    <rendering labelPerPart="0" obstacleType="0" scaleMax="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="0" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="0"/>
+                    <text-format multilineAlign="4294967295" autoWrapLength="0" plussign="0" placeDirectionSymbol="0" addDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+                    <placement maxCurvedCharAngleOut="-25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="2" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorType="PointGeometry" repeatDistance="0" quadOffset="4" distUnits="MM" offsetUnits="MM" repeatDistanceUnits="MM" dist="1" centroidInside="0" geometryGenerator="" placementFlags="15" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" xOffset="0" priority="5"/>
+                    <rendering displayAll="0" upsidedownLabels="0" mergeLines="0" fontLimitPixelSize="0" maxNumLabels="2000" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="1" scaleMax="0" minFeatureSize="0" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="0" fontMaxPixelSize="10000" scaleMin="0" obstacleFactor="1"/>
                     <dd_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -4282,8 +4280,8 @@ def my_form_open(dialog, layer, feature):
               </rules>
             </labeling>
             <customproperties>
-              <property key="dualview/previewExpressions" value="id"/>
-              <property key="embeddedWidgets/count" value="0"/>
+              <property value="id" key="dualview/previewExpressions"/>
+              <property value="0" key="embeddedWidgets/count"/>
               <property key="variableNames"/>
               <property key="variableValues"/>
             </customproperties>
@@ -4291,12 +4289,12 @@ def my_form_open(dialog, layer, feature):
             <featureBlendMode>0</featureBlendMode>
             <layerOpacity>1</layerOpacity>
             <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-              <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+              <DiagramCategory enabled="0" minScaleDenominator="0" width="15" rotationOffset="270" penColor="#000000" penAlpha="255" height="15" penWidth="0" diagramOrientation="Up" backgroundColor="#ffffff" scaleDependency="Area" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" opacity="1" lineSizeType="MM" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" scaleBasedVisibility="0" sizeType="MM" backgroundAlpha="255" barWidth="5">
                 <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-                <attribute field="" color="#000000" label=""/>
+                <attribute color="#000000" label="" field=""/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings zIndex="0" linePlacementFlags="18" priority="0" dist="0" placement="2" obstacle="0" showAll="1">
+            <DiagramLayerSettings priority="0" zIndex="0" showAll="1" placement="2" linePlacementFlags="18" obstacle="0" dist="0">
               <properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -4305,7 +4303,7 @@ def my_form_open(dialog, layer, feature):
                 </Option>
               </properties>
             </DiagramLayerSettings>
-            <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+            <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
               <activeChecks/>
               <checkConfiguration/>
             </geometryOptions>
@@ -4389,17 +4387,17 @@ def my_form_open(dialog, layer, feature):
               </field>
             </fieldConfiguration>
             <aliases>
-              <alias field="id" index="0" name=""/>
-              <alias field="group" index="1" name=""/>
-              <alias field="comment" index="2" name=""/>
-              <alias field="moveable" index="3" name=""/>
-              <alias field="type" index="4" name=""/>
-              <alias field="name" index="5" name=""/>
-              <alias field="hidden" index="6" name=""/>
-              <alias field="auxiliary_storage_labeling_positiony" index="7" name=""/>
-              <alias field="auxiliary_storage_labeling_positionx" index="8" name=""/>
-              <alias field="fence_len" index="9" name=""/>
-              <alias field="cone_len" index="10" name=""/>
+              <alias index="0" field="id" name=""/>
+              <alias index="1" field="group" name=""/>
+              <alias index="2" field="comment" name=""/>
+              <alias index="3" field="moveable" name=""/>
+              <alias index="4" field="type" name=""/>
+              <alias index="5" field="name" name=""/>
+              <alias index="6" field="hidden" name=""/>
+              <alias index="7" field="auxiliary_storage_labeling_positiony" name=""/>
+              <alias index="8" field="auxiliary_storage_labeling_positionx" name=""/>
+              <alias index="9" field="fence_len" name=""/>
+              <alias index="10" field="cone_len" name=""/>
             </aliases>
             <excludeAttributesWMS/>
             <excludeAttributesWFS/>
@@ -4417,53 +4415,53 @@ def my_form_open(dialog, layer, feature):
               <default field="cone_len" applyOnUpdate="0" expression=""/>
             </defaults>
             <constraints>
-              <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
-              <constraint notnull_strength="0" field="group" constraints="0" unique_strength="0" exp_strength="0"/>
-              <constraint notnull_strength="0" field="comment" constraints="0" unique_strength="0" exp_strength="0"/>
-              <constraint notnull_strength="0" field="moveable" constraints="0" unique_strength="0" exp_strength="0"/>
-              <constraint notnull_strength="0" field="type" constraints="0" unique_strength="0" exp_strength="0"/>
-              <constraint notnull_strength="0" field="name" constraints="0" unique_strength="0" exp_strength="0"/>
-              <constraint notnull_strength="0" field="hidden" constraints="0" unique_strength="0" exp_strength="0"/>
-              <constraint notnull_strength="0" field="auxiliary_storage_labeling_positiony" constraints="0" unique_strength="0" exp_strength="0"/>
-              <constraint notnull_strength="0" field="auxiliary_storage_labeling_positionx" constraints="0" unique_strength="0" exp_strength="0"/>
-              <constraint notnull_strength="0" field="fence_len" constraints="0" unique_strength="0" exp_strength="0"/>
-              <constraint notnull_strength="0" field="cone_len" constraints="0" unique_strength="0" exp_strength="0"/>
+              <constraint exp_strength="0" constraints="0" field="id" notnull_strength="0" unique_strength="0"/>
+              <constraint exp_strength="0" constraints="0" field="group" notnull_strength="0" unique_strength="0"/>
+              <constraint exp_strength="0" constraints="0" field="comment" notnull_strength="0" unique_strength="0"/>
+              <constraint exp_strength="0" constraints="0" field="moveable" notnull_strength="0" unique_strength="0"/>
+              <constraint exp_strength="0" constraints="0" field="type" notnull_strength="0" unique_strength="0"/>
+              <constraint exp_strength="0" constraints="0" field="name" notnull_strength="0" unique_strength="0"/>
+              <constraint exp_strength="0" constraints="0" field="hidden" notnull_strength="0" unique_strength="0"/>
+              <constraint exp_strength="0" constraints="0" field="auxiliary_storage_labeling_positiony" notnull_strength="0" unique_strength="0"/>
+              <constraint exp_strength="0" constraints="0" field="auxiliary_storage_labeling_positionx" notnull_strength="0" unique_strength="0"/>
+              <constraint exp_strength="0" constraints="0" field="fence_len" notnull_strength="0" unique_strength="0"/>
+              <constraint exp_strength="0" constraints="0" field="cone_len" notnull_strength="0" unique_strength="0"/>
             </constraints>
             <constraintExpressions>
-              <constraint field="id" exp="" desc=""/>
-              <constraint field="group" exp="" desc=""/>
-              <constraint field="comment" exp="" desc=""/>
-              <constraint field="moveable" exp="" desc=""/>
-              <constraint field="type" exp="" desc=""/>
-              <constraint field="name" exp="" desc=""/>
-              <constraint field="hidden" exp="" desc=""/>
-              <constraint field="auxiliary_storage_labeling_positiony" exp="" desc=""/>
-              <constraint field="auxiliary_storage_labeling_positionx" exp="" desc=""/>
-              <constraint field="fence_len" exp="" desc=""/>
-              <constraint field="cone_len" exp="" desc=""/>
+              <constraint exp="" field="id" desc=""/>
+              <constraint exp="" field="group" desc=""/>
+              <constraint exp="" field="comment" desc=""/>
+              <constraint exp="" field="moveable" desc=""/>
+              <constraint exp="" field="type" desc=""/>
+              <constraint exp="" field="name" desc=""/>
+              <constraint exp="" field="hidden" desc=""/>
+              <constraint exp="" field="auxiliary_storage_labeling_positiony" desc=""/>
+              <constraint exp="" field="auxiliary_storage_labeling_positionx" desc=""/>
+              <constraint exp="" field="fence_len" desc=""/>
+              <constraint exp="" field="cone_len" desc=""/>
             </constraintExpressions>
             <expressionfields>
-              <field name="fence_len" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
-              <field name="fence_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
-              <field name="cone_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
+              <field precision="0" subType="0" typeName="double precision" name="fence_len" type="6" length="-1" comment="" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)"/>
+              <field precision="0" subType="0" typeName="double precision" name="fence_len" type="6" length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)"/>
+              <field precision="0" subType="0" typeName="double precision" name="cone_len" type="6" length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)"/>
             </expressionfields>
             <attributeactions>
-              <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+              <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
             </attributeactions>
-            <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;cone_len&quot;">
+            <attributetableconfig sortExpression="&quot;cone_len&quot;" sortOrder="0" actionWidgetStyle="dropDown">
               <columns>
-                <column width="-1" name="id" hidden="0" type="field"/>
-                <column width="-1" name="group" hidden="0" type="field"/>
-                <column width="-1" hidden="1" type="actions"/>
-                <column width="223" name="comment" hidden="0" type="field"/>
-                <column width="-1" name="moveable" hidden="0" type="field"/>
-                <column width="-1" name="type" hidden="0" type="field"/>
-                <column width="414" name="name" hidden="0" type="field"/>
-                <column width="-1" name="hidden" hidden="0" type="field"/>
-                <column width="-1" name="fence_len" hidden="0" type="field"/>
-                <column width="-1" name="cone_len" hidden="0" type="field"/>
-                <column width="-1" name="auxiliary_storage_labeling_positiony" hidden="1" type="field"/>
-                <column width="-1" name="auxiliary_storage_labeling_positionx" hidden="1" type="field"/>
+                <column hidden="0" name="id" type="field" width="-1"/>
+                <column hidden="0" name="group" type="field" width="-1"/>
+                <column hidden="1" type="actions" width="-1"/>
+                <column hidden="0" name="comment" type="field" width="223"/>
+                <column hidden="0" name="moveable" type="field" width="-1"/>
+                <column hidden="0" name="type" type="field" width="-1"/>
+                <column hidden="0" name="name" type="field" width="414"/>
+                <column hidden="0" name="hidden" type="field" width="-1"/>
+                <column hidden="0" name="fence_len" type="field" width="-1"/>
+                <column hidden="0" name="cone_len" type="field" width="-1"/>
+                <column hidden="1" name="auxiliary_storage_labeling_positiony" type="field" width="-1"/>
+                <column hidden="1" name="auxiliary_storage_labeling_positionx" type="field" width="-1"/>
               </columns>
             </attributetableconfig>
             <conditionalstyles>
@@ -4494,32 +4492,32 @@ def my_form_open(dialog, layer, feature):
             <featformsuppress>0</featformsuppress>
             <editorlayout>generatedlayout</editorlayout>
             <editable>
-              <field name="auxiliary_storage_labeling_positionx" editable="0"/>
-              <field name="auxiliary_storage_labeling_positiony" editable="0"/>
-              <field name="comment" editable="1"/>
-              <field name="cone_len" editable="0"/>
-              <field name="fence_len" editable="0"/>
-              <field name="group" editable="1"/>
-              <field name="hidden" editable="1"/>
-              <field name="id" editable="1"/>
-              <field name="length" editable="0"/>
-              <field name="moveable" editable="1"/>
-              <field name="name" editable="1"/>
-              <field name="type" editable="1"/>
+              <field editable="0" name="auxiliary_storage_labeling_positionx"/>
+              <field editable="0" name="auxiliary_storage_labeling_positiony"/>
+              <field editable="1" name="comment"/>
+              <field editable="0" name="cone_len"/>
+              <field editable="0" name="fence_len"/>
+              <field editable="1" name="group"/>
+              <field editable="1" name="hidden"/>
+              <field editable="1" name="id"/>
+              <field editable="0" name="length"/>
+              <field editable="1" name="moveable"/>
+              <field editable="1" name="name"/>
+              <field editable="1" name="type"/>
             </editable>
             <labelOnTop>
-              <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
-              <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
-              <field labelOnTop="0" name="comment"/>
-              <field labelOnTop="0" name="cone_len"/>
-              <field labelOnTop="0" name="fence_len"/>
-              <field labelOnTop="0" name="group"/>
-              <field labelOnTop="0" name="hidden"/>
-              <field labelOnTop="0" name="id"/>
-              <field labelOnTop="0" name="length"/>
-              <field labelOnTop="0" name="moveable"/>
-              <field labelOnTop="0" name="name"/>
-              <field labelOnTop="0" name="type"/>
+              <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
+              <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
+              <field name="comment" labelOnTop="0"/>
+              <field name="cone_len" labelOnTop="0"/>
+              <field name="fence_len" labelOnTop="0"/>
+              <field name="group" labelOnTop="0"/>
+              <field name="hidden" labelOnTop="0"/>
+              <field name="id" labelOnTop="0"/>
+              <field name="length" labelOnTop="0"/>
+              <field name="moveable" labelOnTop="0"/>
+              <field name="name" labelOnTop="0"/>
+              <field name="type" labelOnTop="0"/>
             </labelOnTop>
             <widgets/>
             <previewExpression>id</previewExpression>
@@ -4534,17 +4532,17 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="1" type="RuleRenderer" forceraster="0" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" enableorderby="0" forceraster="0" symbollevels="1">
         <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-          <rule symbol="0" key="{b3b38ee9-c245-4839-b078-3b966a2a5c4e}" label="Cones" filter="regexp_match(&quot;type&quot;, '^cone')"/>
-          <rule symbol="1" key="{9da1c54c-0ca9-4db9-a722-ce3f53ccd358}" label="Moveable fences" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1'"/>
-          <rule symbol="2" key="{bb4463e8-e33a-4475-878c-fd2d7b636418}" label="Fixed fences" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1'"/>
-          <rule symbol="3" key="{bb4463e8-e33a-4475-878c-fd2d7b636418}" label="Construction" filter="regexp_match(&quot;type&quot;, '^constr')"/>
-          <rule symbol="4" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" label="Visible" checkstate="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL"/>
+          <rule symbol="0" filter="regexp_match(&quot;type&quot;, '^cone')" label="Cones" key="{b3b38ee9-c245-4839-b078-3b966a2a5c4e}"/>
+          <rule symbol="1" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1'" label="Moveable fences" key="{9da1c54c-0ca9-4db9-a722-ce3f53ccd358}"/>
+          <rule symbol="2" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1'" label="Fixed fences" key="{bb4463e8-e33a-4475-878c-fd2d7b636418}"/>
+          <rule symbol="3" filter="regexp_match(&quot;type&quot;, '^constr')" label="Construction" key="{bb4463e8-e33a-4475-878c-fd2d7b636418}"/>
+          <rule symbol="4" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" checkstate="0" label="Visible" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}"/>
         </rules>
         <symbols>
-          <symbol name="0" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+          <symbol force_rhr="0" name="0" clip_to_extent="1" type="line" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleLine">
               <prop k="capstyle" v="round"/>
               <prop k="customdash" v="1;4"/>
               <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4576,8 +4574,8 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+          <symbol force_rhr="0" name="1" clip_to_extent="1" type="line" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleLine">
               <prop k="capstyle" v="round"/>
               <prop k="customdash" v="4;3"/>
               <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4609,8 +4607,8 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+          <symbol force_rhr="0" name="2" clip_to_extent="1" type="line" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleLine">
               <prop k="capstyle" v="square"/>
               <prop k="customdash" v="5;2"/>
               <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4642,8 +4640,8 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+          <symbol force_rhr="0" name="3" clip_to_extent="1" type="line" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleLine">
               <prop k="capstyle" v="square"/>
               <prop k="customdash" v="5;2"/>
               <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4675,8 +4673,8 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="4" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+          <symbol force_rhr="0" name="4" clip_to_extent="1" type="line" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleLine">
               <prop k="capstyle" v="square"/>
               <prop k="customdash" v="5;2"/>
               <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4706,17 +4704,17 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{c6c63c45-b105-4938-9293-1e0b6b509ffc}">
-          <rule key="{cb13c93f-b798-48fe-be18-377822a9654c}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
+          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{cb13c93f-b798-48fe-be18-377822a9654c}">
             <settings>
-              <text-style previewBkgrdColor="#ffffff" namedStyle="Regular" fontWeight="50" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.8" fontSizeUnit="Point" fieldName="comment" fontSize="11" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
-                <text-buffer bufferOpacity="1" bufferNoFill="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
-                <background shapeFillColor="255,255,255,255" shapeJoinStyle="128" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0.6" shapeOpacity="0.6" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="255,255,0,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="1" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="1" shapeRadiiX="1" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+              <text-style fontLetterSpacing="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Regular" textColor="0,0,0,255" multilineHeight="1" fontSize="11" fontWeight="50" fieldName="comment" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="0.8" useSubstitutions="0" fontUnderline="0">
+                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="255,255,0,255" shapeSizeUnit="MM" shapeRadiiY="1" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="128" shapeBorderWidthUnit="MM" shapeDraw="1" shapeOpacity="0.6" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="1" shapeRadiiX="1" shapeBorderWidth="0.6" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="4294967295" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
-              <placement centroidInside="0" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="2" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" geometryGenerator="" dist="5" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="5" placementFlags="2" offsetType="0" offsetUnits="MM"/>
-              <rendering labelPerPart="0" obstacleType="0" scaleMax="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="0" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="1" displayAll="1"/>
+              <text-format multilineAlign="4294967295" autoWrapLength="0" plussign="0" addDirectionSymbol="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+              <placement maxCurvedCharAngleOut="-25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="2" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" geometryGeneratorType="PointGeometry" quadOffset="4" distUnits="MM" offsetUnits="MM" repeatDistanceUnits="MM" dist="5" centroidInside="0" geometryGenerator="" placementFlags="2" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" maxCurvedCharAngleIn="25" priority="5"/>
+              <rendering displayAll="1" upsidedownLabels="0" mergeLines="1" fontLimitPixelSize="0" maxNumLabels="2000" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="1" scaleMax="0" minFeatureSize="0" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="0" fontMaxPixelSize="10000" scaleMin="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -4737,17 +4735,17 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </settings>
           </rule>
-          <rule key="{f68a5523-5992-4232-8c24-8259482e149e}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^(fenc|cone)')">
+          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{f68a5523-5992-4232-8c24-8259482e149e}">
             <settings>
-              <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="1" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="1" fontSizeUnit="Point" fieldName="round( $length, 1) || 'm'" fontSize="12" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
-                <text-buffer bufferOpacity="1" bufferNoFill="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1"/>
-                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="0" shapeRotationType="0" shapeSizeX="0" shapeRadiiX="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+              <text-style fontLetterSpacing="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Semibold" textColor="0,0,0,255" multilineHeight="1" fontSize="12" fontWeight="63" fieldName="round( $length, 1) || 'm'" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="1" useSubstitutions="0" fontUnderline="0">
+                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiY="0" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeDraw="0" shapeOpacity="1" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="0" shapeRadiiX="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="4294967295" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
-              <placement centroidInside="0" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="2" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" geometryGenerator="" dist="1" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="5" placementFlags="15" offsetType="0" offsetUnits="MM"/>
-              <rendering labelPerPart="0" obstacleType="0" scaleMax="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="0" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="0"/>
+              <text-format multilineAlign="4294967295" autoWrapLength="0" plussign="0" addDirectionSymbol="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+              <placement maxCurvedCharAngleOut="-25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="2" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" geometryGeneratorType="PointGeometry" quadOffset="4" distUnits="MM" offsetUnits="MM" repeatDistanceUnits="MM" dist="1" centroidInside="0" geometryGenerator="" placementFlags="15" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" maxCurvedCharAngleIn="25" priority="5"/>
+              <rendering displayAll="0" upsidedownLabels="0" mergeLines="0" fontLimitPixelSize="0" maxNumLabels="2000" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="1" scaleMax="0" minFeatureSize="0" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="0" fontMaxPixelSize="10000" scaleMin="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -4771,21 +4769,23 @@ def my_form_open(dialog, layer, feature):
         </rules>
       </labeling>
       <customproperties>
-        <property key="dualview/previewExpressions" value="id"/>
-        <property key="embeddedWidgets/count" value="0"/>
+        <property key="dualview/previewExpressions">
+          <value>id</value>
+        </property>
+        <property value="0" key="embeddedWidgets/count"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory enabled="0" minScaleDenominator="0" width="15" rotationOffset="270" penColor="#000000" penAlpha="255" height="15" penWidth="0" diagramOrientation="Up" backgroundColor="#ffffff" scaleDependency="Area" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" opacity="1" lineSizeType="MM" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeType="MM" scaleBasedVisibility="0" backgroundAlpha="255" barWidth="5">
           <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-          <attribute field="" color="#000000" label=""/>
+          <attribute color="#000000" label="" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" priority="0" dist="0" placement="2" obstacle="0" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" showAll="1" placement="2" linePlacementFlags="18" obstacle="0" dist="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -4794,7 +4794,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -4878,17 +4878,17 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="group" index="1" name=""/>
-        <alias field="comment" index="2" name=""/>
-        <alias field="moveable" index="3" name=""/>
-        <alias field="type" index="4" name=""/>
-        <alias field="name" index="5" name=""/>
-        <alias field="hidden" index="6" name=""/>
-        <alias field="auxiliary_storage_labeling_positiony" index="7" name=""/>
-        <alias field="auxiliary_storage_labeling_positionx" index="8" name=""/>
-        <alias field="fence_len" index="9" name=""/>
-        <alias field="cone_len" index="10" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="group" name=""/>
+        <alias index="2" field="comment" name=""/>
+        <alias index="3" field="moveable" name=""/>
+        <alias index="4" field="type" name=""/>
+        <alias index="5" field="name" name=""/>
+        <alias index="6" field="hidden" name=""/>
+        <alias index="7" field="auxiliary_storage_labeling_positiony" name=""/>
+        <alias index="8" field="auxiliary_storage_labeling_positionx" name=""/>
+        <alias index="9" field="fence_len" name=""/>
+        <alias index="10" field="cone_len" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -4906,53 +4906,53 @@ def my_form_open(dialog, layer, feature):
         <default field="cone_len" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="group" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="comment" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="moveable" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="type" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="name" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="hidden" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="auxiliary_storage_labeling_positiony" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="auxiliary_storage_labeling_positionx" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="fence_len" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="cone_len" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint exp_strength="0" field="id" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="group" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="comment" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="moveable" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="name" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="hidden" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="auxiliary_storage_labeling_positiony" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="auxiliary_storage_labeling_positionx" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="fence_len" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="cone_len" constraints="0" notnull_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="group" exp="" desc=""/>
-        <constraint field="comment" exp="" desc=""/>
-        <constraint field="moveable" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="hidden" exp="" desc=""/>
-        <constraint field="auxiliary_storage_labeling_positiony" exp="" desc=""/>
-        <constraint field="auxiliary_storage_labeling_positionx" exp="" desc=""/>
-        <constraint field="fence_len" exp="" desc=""/>
-        <constraint field="cone_len" exp="" desc=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="group" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="moveable" desc=""/>
+        <constraint exp="" field="type" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="hidden" desc=""/>
+        <constraint exp="" field="auxiliary_storage_labeling_positiony" desc=""/>
+        <constraint exp="" field="auxiliary_storage_labeling_positionx" desc=""/>
+        <constraint exp="" field="fence_len" desc=""/>
+        <constraint exp="" field="cone_len" desc=""/>
       </constraintExpressions>
       <expressionfields>
-        <field name="fence_len" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
-        <field name="fence_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
-        <field name="cone_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
+        <field precision="0" subType="0" typeName="double precision" name="fence_len" type="6" length="-1" comment="" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)"/>
+        <field precision="0" subType="0" typeName="double precision" name="fence_len" type="6" length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)"/>
+        <field precision="0" subType="0" typeName="double precision" name="cone_len" type="6" length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)"/>
       </expressionfields>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;group&quot;">
+      <attributetableconfig sortExpression="&quot;group&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="-1" name="group" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="1150" name="comment" hidden="0" type="field"/>
-          <column width="-1" name="moveable" hidden="0" type="field"/>
-          <column width="-1" name="type" hidden="0" type="field"/>
-          <column width="414" name="name" hidden="0" type="field"/>
-          <column width="-1" name="hidden" hidden="0" type="field"/>
-          <column width="-1" name="fence_len" hidden="0" type="field"/>
-          <column width="-1" name="cone_len" hidden="0" type="field"/>
-          <column width="-1" name="auxiliary_storage_labeling_positiony" hidden="1" type="field"/>
-          <column width="-1" name="auxiliary_storage_labeling_positionx" hidden="1" type="field"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="0" name="group" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="comment" type="field" width="1150"/>
+          <column hidden="0" name="moveable" type="field" width="-1"/>
+          <column hidden="0" name="type" type="field" width="-1"/>
+          <column hidden="0" name="name" type="field" width="414"/>
+          <column hidden="0" name="hidden" type="field" width="-1"/>
+          <column hidden="0" name="fence_len" type="field" width="-1"/>
+          <column hidden="0" name="cone_len" type="field" width="-1"/>
+          <column hidden="1" name="auxiliary_storage_labeling_positiony" type="field" width="-1"/>
+          <column hidden="1" name="auxiliary_storage_labeling_positionx" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -4983,38 +4983,38 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="auxiliary_storage_labeling_positionx" editable="0"/>
-        <field name="auxiliary_storage_labeling_positiony" editable="0"/>
-        <field name="comment" editable="1"/>
-        <field name="cone_len" editable="0"/>
-        <field name="fence_len" editable="0"/>
-        <field name="group" editable="1"/>
-        <field name="hidden" editable="1"/>
-        <field name="id" editable="1"/>
-        <field name="length" editable="0"/>
-        <field name="moveable" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="0" name="auxiliary_storage_labeling_positionx"/>
+        <field editable="0" name="auxiliary_storage_labeling_positiony"/>
+        <field editable="1" name="comment"/>
+        <field editable="0" name="cone_len"/>
+        <field editable="0" name="fence_len"/>
+        <field editable="1" name="group"/>
+        <field editable="1" name="hidden"/>
+        <field editable="1" name="id"/>
+        <field editable="0" name="length"/>
+        <field editable="1" name="moveable"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
-        <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
-        <field labelOnTop="0" name="comment"/>
-        <field labelOnTop="0" name="cone_len"/>
-        <field labelOnTop="0" name="fence_len"/>
-        <field labelOnTop="0" name="group"/>
-        <field labelOnTop="0" name="hidden"/>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="length"/>
-        <field labelOnTop="0" name="moveable"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
+        <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
+        <field name="comment" labelOnTop="0"/>
+        <field name="cone_len" labelOnTop="0"/>
+        <field name="fence_len" labelOnTop="0"/>
+        <field name="group" labelOnTop="0"/>
+        <field name="hidden" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="length" labelOnTop="0"/>
+        <field name="moveable" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <widgets/>
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="100000" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" simplifyLocal="1" readOnly="0" geometry="Polygon" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" wkbType="MultiPolygon" simplifyDrawingTol="1">
+    <maplayer styleCategories="AllStyleCategories" refreshOnNotifyMessage="" simplifyAlgorithm="0" maxScale="100000" geometry="Polygon" simplifyMaxScale="1" simplifyLocal="1" labelsEnabled="0" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" type="vector" minScale="1e+08" readOnly="0" autoRefreshTime="0" autoRefreshEnabled="0" simplifyDrawingTol="1" wkbType="MultiPolygon" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.94678832168284544</ymin>
@@ -5078,10 +5078,10 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" type="singleSymbol" forceraster="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" enableorderby="0" forceraster="0" symbollevels="0">
         <symbols>
-          <symbol name="0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+          <symbol force_rhr="0" name="0" clip_to_extent="1" type="fill" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleFill">
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="26,0,201,255"/>
               <prop k="joinstyle" v="bevel"/>
@@ -5107,21 +5107,21 @@ def my_form_open(dialog, layer, feature):
         <sizescale/>
       </renderer-v2>
       <customproperties>
-        <property key="dualview/previewExpressions" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
-        <property key="embeddedWidgets/count" value="0"/>
+        <property value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" key="dualview/previewExpressions"/>
+        <property value="0" key="embeddedWidgets/count"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory enabled="0" minScaleDenominator="100000" width="15" rotationOffset="270" penColor="#000000" penAlpha="255" height="15" penWidth="0" diagramOrientation="Up" backgroundColor="#ffffff" scaleDependency="Area" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" opacity="1" lineSizeType="MM" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeType="MM" scaleBasedVisibility="0" backgroundAlpha="255" barWidth="5">
           <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
-          <attribute field="" color="#000000" label=""/>
+          <attribute color="#000000" label="" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" priority="0" dist="0" placement="0" obstacle="0" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" showAll="1" placement="0" linePlacementFlags="2" obstacle="0" dist="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -5136,7 +5136,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -5173,9 +5173,9 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="page" index="2" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
+        <alias index="2" field="page" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -5185,25 +5185,25 @@ def my_form_open(dialog, layer, feature):
         <default field="page" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="type" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="page" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint exp_strength="0" field="id" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="page" constraints="0" notnull_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="page" exp="" desc=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="type" desc=""/>
+        <constraint exp="" field="page" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="-1" name="type" hidden="0" type="field"/>
-          <column width="-1" name="page" hidden="0" type="field"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="0" name="type" type="field" width="-1"/>
+          <column hidden="0" name="page" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5234,20 +5234,20 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="page" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="page"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="page"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="page" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="100000" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Point" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" wkbType="Point" simplifyDrawingTol="1">
+    <maplayer styleCategories="AllStyleCategories" refreshOnNotifyMessage="" simplifyAlgorithm="0" maxScale="100000" geometry="Point" simplifyMaxScale="1" simplifyLocal="1" labelsEnabled="1" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" type="vector" minScale="1e+08" readOnly="0" autoRefreshTime="0" autoRefreshEnabled="0" simplifyDrawingTol="1" wkbType="Point" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37523075794307204</xmin>
         <ymin>-33.94592961896692884</ymin>
@@ -5304,7 +5304,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
+          <spatial minz="0" minx="0" maxz="0" maxy="0" maxx="0" crs="" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -5328,14 +5328,14 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" type="RuleRenderer" forceraster="0" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" enableorderby="0" forceraster="0" symbollevels="0">
         <rules key="{436a5e05-3485-477a-80b7-cf4d12d6dcec}">
-          <rule symbol="0" key="{308d81eb-cefa-4627-8afb-3baa8363f863}" description="Show in marshal overview" label="Show in marshal overview" filter="'marshal plan' = attribute( @atlas_feature , 'type' )"/>
-          <rule symbol="1" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" description="Show in marshal overview" label="Show in marshal maps" filter="'marshal' = attribute( @atlas_feature , 'type' )"/>
+          <rule symbol="0" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" label="Show in marshal overview" key="{308d81eb-cefa-4627-8afb-3baa8363f863}" description="Show in marshal overview"/>
+          <rule symbol="1" filter="'marshal' = attribute( @atlas_feature , 'type' )" label="Show in marshal maps" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" description="Show in marshal overview"/>
         </rules>
         <symbols>
-          <symbol name="0" clip_to_extent="1" force_rhr="0" type="marker" alpha="0.792157">
-            <layer pass="1" class="SimpleMarker" locked="0" enabled="1">
+          <symbol force_rhr="0" name="0" clip_to_extent="1" type="marker" alpha="0.792157">
+            <layer pass="1" locked="0" enabled="1" class="SimpleMarker">
               <prop k="angle" v="0"/>
               <prop k="color" v="0,0,0,255"/>
               <prop k="horizontal_anchor_point" v="1"/>
@@ -5363,8 +5363,8 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" clip_to_extent="1" force_rhr="0" type="marker" alpha="0.01">
-            <layer pass="1" class="SimpleMarker" locked="0" enabled="1">
+          <symbol force_rhr="0" name="1" clip_to_extent="1" type="marker" alpha="0.01">
+            <layer pass="1" locked="0" enabled="1" class="SimpleMarker">
               <prop k="angle" v="0"/>
               <prop k="color" v="0,0,0,255"/>
               <prop k="horizontal_anchor_point" v="1"/>
@@ -5396,17 +5396,17 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{f4f14825-d873-4bbe-9728-d63dc57afbf9}">
-          <rule key="{3a329855-a43a-4f24-8600-9e8fb5b4d8a4}" description="Show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" filter="'marshal plan' = attribute( @atlas_feature , 'type' )">
+          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' )" key="{3a329855-a43a-4f24-8600-9e8fb5b4d8a4}" description="Show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)">
             <settings>
-              <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.9" fontSizeUnit="Point" fieldName="position" fontSize="6" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
-                <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
-                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0.1" shapeOpacity="0.5" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="0" shapeRadiiX="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+              <text-style fontLetterSpacing="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Semibold" textColor="0,0,0,255" multilineHeight="1" fontSize="6" fontWeight="63" fieldName="position" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="0.9" useSubstitutions="0" fontUnderline="0">
+                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeType="3" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiY="0" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeDraw="1" shapeOpacity="0.5" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="0" shapeRadiiX="0" shapeBorderWidth="0.1" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
-              <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="6" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="1" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="10" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
-              <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="1" upsidedownLabels="0" obstacle="0" fontMaxPixelSize="10000" zIndex="2" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
+              <text-format multilineAlign="0" autoWrapLength="0" plussign="0" addDirectionSymbol="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+              <placement maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="6" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" geometryGeneratorType="PointGeometry" quadOffset="4" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="1" centroidInside="0" geometryGenerator="" placementFlags="10" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" maxCurvedCharAngleIn="20" priority="10"/>
+              <rendering displayAll="1" upsidedownLabels="0" mergeLines="0" fontLimitPixelSize="0" maxNumLabels="2000" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="0" scaleMax="10000000" minFeatureSize="0" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="2" fontMaxPixelSize="10000" scaleMin="1" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -5432,17 +5432,17 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </settings>
           </rule>
-          <rule key="{2296c342-131c-47dd-a5f3-3d062b82ee51}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" active="0" filter="'marshal' = attribute( @atlas_feature , 'type' )">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' )" key="{2296c342-131c-47dd-a5f3-3d062b82ee51}" active="0" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index">
             <settings>
-              <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.5" fontSizeUnit="Point" fieldName="position" fontSize="6" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
-                <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
-                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0.4" shapeOpacity="0.5" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0.2" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="0.2" shapeRadiiX="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+              <text-style fontLetterSpacing="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Semibold" textColor="0,0,0,255" multilineHeight="1" fontSize="6" fontWeight="63" fieldName="position" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="0.5" useSubstitutions="0" fontUnderline="0">
+                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeType="3" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiY="0" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeDraw="1" shapeOpacity="0.5" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.2" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="0.2" shapeRadiiX="0" shapeBorderWidth="0.4" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="1" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
-              <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="6" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="0" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="8" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
-              <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="1.8" upsidedownLabels="0" obstacle="0" fontMaxPixelSize="10000" zIndex="5" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
+              <text-format multilineAlign="1" autoWrapLength="0" plussign="0" addDirectionSymbol="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+              <placement maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="6" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" geometryGeneratorType="PointGeometry" quadOffset="4" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="0" centroidInside="0" geometryGenerator="" placementFlags="10" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" maxCurvedCharAngleIn="20" priority="8"/>
+              <rendering displayAll="1" upsidedownLabels="0" mergeLines="0" fontLimitPixelSize="0" maxNumLabels="2000" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="0" scaleMax="10000000" minFeatureSize="0" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="5" fontMaxPixelSize="10000" scaleMin="1" obstacleFactor="1.8"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -5498,17 +5498,17 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </settings>
           </rule>
-          <rule key="{a58f40a9-df73-4719-aa04-2c30eaa03b8f}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id" key="{a58f40a9-df73-4719-aa04-2c30eaa03b8f}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label">
             <settings>
-              <text-style previewBkgrdColor="#ffffff" namedStyle="Regular" fontWeight="50" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.6" fontSizeUnit="Point" fieldName="position" fontSize="6" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
-                <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
-                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0.4" shapeOpacity="0.6" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0.2" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="0.2" shapeRadiiX="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+              <text-style fontLetterSpacing="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Regular" textColor="0,0,0,255" multilineHeight="1" fontSize="6" fontWeight="50" fieldName="position" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="0.6" useSubstitutions="0" fontUnderline="0">
+                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeType="3" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiY="0" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeDraw="1" shapeOpacity="0.6" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.2" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="0.2" shapeRadiiX="0" shapeBorderWidth="0.4" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="1" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
-              <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="6" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="0" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="8" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
-              <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="1.8" upsidedownLabels="0" obstacle="0" fontMaxPixelSize="10000" zIndex="5" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
+              <text-format multilineAlign="1" autoWrapLength="0" plussign="0" addDirectionSymbol="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+              <placement maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="6" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" geometryGeneratorType="PointGeometry" quadOffset="4" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="0" centroidInside="0" geometryGenerator="" placementFlags="10" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" maxCurvedCharAngleIn="20" priority="8"/>
+              <rendering displayAll="1" upsidedownLabels="0" mergeLines="0" fontLimitPixelSize="0" maxNumLabels="2000" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="0" scaleMax="10000000" minFeatureSize="0" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="5" fontMaxPixelSize="10000" scaleMin="1" obstacleFactor="1.8"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -5564,17 +5564,17 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </settings>
           </rule>
-          <rule key="{46ca2a32-142f-49b9-a885-1f565c6f0b0f}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" key="{46ca2a32-142f-49b9-a885-1f565c6f0b0f}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top">
             <settings>
-              <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.9" fontSizeUnit="Point" fieldName="position" fontSize="8" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
-                <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
-                <background shapeFillColor="255,255,0,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0.4" shapeOpacity="0.9" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0.2" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="0.2" shapeRadiiX="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+              <text-style fontLetterSpacing="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Semibold" textColor="0,0,0,255" multilineHeight="1" fontSize="8" fontWeight="63" fieldName="position" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="0.9" useSubstitutions="0" fontUnderline="0">
+                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeType="3" shapeFillColor="255,255,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiY="0" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeDraw="1" shapeOpacity="0.9" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.2" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="0.2" shapeRadiiX="0" shapeBorderWidth="0.4" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="1" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
-              <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="0" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="0" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="10" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
-              <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="1.8" upsidedownLabels="0" obstacle="0" fontMaxPixelSize="10000" zIndex="10" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
+              <text-format multilineAlign="1" autoWrapLength="0" plussign="0" addDirectionSymbol="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+              <placement maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="0" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" geometryGeneratorType="PointGeometry" quadOffset="4" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="0" centroidInside="0" geometryGenerator="" placementFlags="10" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" maxCurvedCharAngleIn="20" priority="10"/>
+              <rendering displayAll="1" upsidedownLabels="0" mergeLines="0" fontLimitPixelSize="0" maxNumLabels="2000" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="0" scaleMax="10000000" minFeatureSize="0" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="10" fontMaxPixelSize="10000" scaleMin="1" obstacleFactor="1.8"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -5633,156 +5633,156 @@ def my_form_open(dialog, layer, feature):
         </rules>
       </labeling>
       <customproperties>
-        <property key="dualview/previewExpressions" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
-        <property key="embeddedWidgets/count" value="0"/>
-        <property key="labeling/addDirectionSymbol" value="false"/>
-        <property key="labeling/angleOffset" value="0"/>
-        <property key="labeling/blendMode" value="0"/>
-        <property key="labeling/bufferBlendMode" value="0"/>
-        <property key="labeling/bufferColorA" value="255"/>
-        <property key="labeling/bufferColorB" value="255"/>
-        <property key="labeling/bufferColorG" value="255"/>
-        <property key="labeling/bufferColorR" value="255"/>
-        <property key="labeling/bufferDraw" value="false"/>
-        <property key="labeling/bufferJoinStyle" value="64"/>
-        <property key="labeling/bufferNoFill" value="false"/>
-        <property key="labeling/bufferSize" value="1"/>
-        <property key="labeling/bufferSizeInMapUnits" value="false"/>
-        <property key="labeling/bufferSizeMapUnitScale" value="0,0,0,0,0,0"/>
-        <property key="labeling/bufferTransp" value="0"/>
-        <property key="labeling/centroidInside" value="false"/>
-        <property key="labeling/centroidWhole" value="false"/>
-        <property key="labeling/decimals" value="3"/>
-        <property key="labeling/displayAll" value="false"/>
-        <property key="labeling/dist" value="0"/>
-        <property key="labeling/distInMapUnits" value="false"/>
-        <property key="labeling/distMapUnitScale" value="0,0,0,0,0,0"/>
-        <property key="labeling/drawLabels" value="false"/>
-        <property key="labeling/enabled" value="false"/>
-        <property key="labeling/fieldName" value="position"/>
-        <property key="labeling/fitInPolygonOnly" value="false"/>
-        <property key="labeling/fontCapitals" value="0"/>
-        <property key="labeling/fontFamily" value="Myriad Pro"/>
-        <property key="labeling/fontItalic" value="false"/>
-        <property key="labeling/fontLetterSpacing" value="0"/>
-        <property key="labeling/fontLimitPixelSize" value="false"/>
-        <property key="labeling/fontMaxPixelSize" value="10000"/>
-        <property key="labeling/fontMinPixelSize" value="3"/>
-        <property key="labeling/fontSize" value="10"/>
-        <property key="labeling/fontSizeInMapUnits" value="false"/>
-        <property key="labeling/fontSizeMapUnitScale" value="0,0,0,0,0,0"/>
-        <property key="labeling/fontStrikeout" value="false"/>
-        <property key="labeling/fontUnderline" value="false"/>
-        <property key="labeling/fontWeight" value="63"/>
-        <property key="labeling/fontWordSpacing" value="0"/>
-        <property key="labeling/formatNumbers" value="false"/>
-        <property key="labeling/isExpression" value="false"/>
-        <property key="labeling/labelOffsetInMapUnits" value="true"/>
-        <property key="labeling/labelOffsetMapUnitScale" value="0,0,0,0,0,0"/>
-        <property key="labeling/labelPerPart" value="false"/>
-        <property key="labeling/leftDirectionSymbol" value="&lt;"/>
-        <property key="labeling/limitNumLabels" value="false"/>
-        <property key="labeling/maxCurvedCharAngleIn" value="20"/>
-        <property key="labeling/maxCurvedCharAngleOut" value="-20"/>
-        <property key="labeling/maxNumLabels" value="2000"/>
-        <property key="labeling/mergeLines" value="false"/>
-        <property key="labeling/minFeatureSize" value="0"/>
-        <property key="labeling/multilineAlign" value="0"/>
-        <property key="labeling/multilineHeight" value="1"/>
-        <property key="labeling/namedStyle" value="Semibold"/>
-        <property key="labeling/obstacle" value="true"/>
-        <property key="labeling/obstacleFactor" value="1"/>
-        <property key="labeling/obstacleType" value="0"/>
-        <property key="labeling/offsetType" value="0"/>
-        <property key="labeling/placeDirectionSymbol" value="0"/>
-        <property key="labeling/placement" value="0"/>
-        <property key="labeling/placementFlags" value="10"/>
-        <property key="labeling/plussign" value="false"/>
-        <property key="labeling/predefinedPositionOrder" value="TR,TL,BR,BL,R,L,TSR,BSR"/>
-        <property key="labeling/preserveRotation" value="true"/>
-        <property key="labeling/previewBkgrdColor" value="#ffffff"/>
-        <property key="labeling/priority" value="5"/>
-        <property key="labeling/quadOffset" value="4"/>
-        <property key="labeling/repeatDistance" value="0"/>
-        <property key="labeling/repeatDistanceMapUnitScale" value="0,0,0,0,0,0"/>
-        <property key="labeling/repeatDistanceUnit" value="1"/>
-        <property key="labeling/reverseDirectionSymbol" value="false"/>
-        <property key="labeling/rightDirectionSymbol" value=">"/>
-        <property key="labeling/scaleMax" value="10000000"/>
-        <property key="labeling/scaleMin" value="1"/>
-        <property key="labeling/scaleVisibility" value="false"/>
-        <property key="labeling/shadowBlendMode" value="6"/>
-        <property key="labeling/shadowColorB" value="0"/>
-        <property key="labeling/shadowColorG" value="0"/>
-        <property key="labeling/shadowColorR" value="0"/>
-        <property key="labeling/shadowDraw" value="false"/>
-        <property key="labeling/shadowOffsetAngle" value="135"/>
-        <property key="labeling/shadowOffsetDist" value="1"/>
-        <property key="labeling/shadowOffsetGlobal" value="true"/>
-        <property key="labeling/shadowOffsetMapUnitScale" value="0,0,0,0,0,0"/>
-        <property key="labeling/shadowOffsetUnits" value="1"/>
-        <property key="labeling/shadowRadius" value="1.5"/>
-        <property key="labeling/shadowRadiusAlphaOnly" value="false"/>
-        <property key="labeling/shadowRadiusMapUnitScale" value="0,0,0,0,0,0"/>
-        <property key="labeling/shadowRadiusUnits" value="1"/>
-        <property key="labeling/shadowScale" value="100"/>
-        <property key="labeling/shadowTransparency" value="30"/>
-        <property key="labeling/shadowUnder" value="0"/>
-        <property key="labeling/shapeBlendMode" value="0"/>
-        <property key="labeling/shapeBorderColorA" value="255"/>
-        <property key="labeling/shapeBorderColorB" value="128"/>
-        <property key="labeling/shapeBorderColorG" value="128"/>
-        <property key="labeling/shapeBorderColorR" value="128"/>
-        <property key="labeling/shapeBorderWidth" value="0"/>
-        <property key="labeling/shapeBorderWidthMapUnitScale" value="0,0,0,0,0,0"/>
-        <property key="labeling/shapeBorderWidthUnits" value="1"/>
-        <property key="labeling/shapeDraw" value="true"/>
-        <property key="labeling/shapeFillColorA" value="255"/>
-        <property key="labeling/shapeFillColorB" value="138"/>
-        <property key="labeling/shapeFillColorG" value="0"/>
-        <property key="labeling/shapeFillColorR" value="101"/>
-        <property key="labeling/shapeJoinStyle" value="64"/>
-        <property key="labeling/shapeOffsetMapUnitScale" value="0,0,0,0,0,0"/>
-        <property key="labeling/shapeOffsetUnits" value="1"/>
-        <property key="labeling/shapeOffsetX" value="0"/>
-        <property key="labeling/shapeOffsetY" value="0"/>
-        <property key="labeling/shapeRadiiMapUnitScale" value="0,0,0,0,0,0"/>
-        <property key="labeling/shapeRadiiUnits" value="1"/>
-        <property key="labeling/shapeRadiiX" value="0"/>
-        <property key="labeling/shapeRadiiY" value="0"/>
-        <property key="labeling/shapeRotation" value="0"/>
-        <property key="labeling/shapeRotationType" value="0"/>
-        <property key="labeling/shapeSVGFile" value=""/>
-        <property key="labeling/shapeSizeMapUnitScale" value="0,0,0,0,0,0"/>
-        <property key="labeling/shapeSizeType" value="0"/>
-        <property key="labeling/shapeSizeUnits" value="1"/>
-        <property key="labeling/shapeSizeX" value="0"/>
-        <property key="labeling/shapeSizeY" value="0"/>
-        <property key="labeling/shapeTransparency" value="0"/>
-        <property key="labeling/shapeType" value="0"/>
-        <property key="labeling/textColorA" value="255"/>
-        <property key="labeling/textColorB" value="255"/>
-        <property key="labeling/textColorG" value="255"/>
-        <property key="labeling/textColorR" value="255"/>
-        <property key="labeling/textTransp" value="0"/>
-        <property key="labeling/upsidedownLabels" value="0"/>
-        <property key="labeling/wrapChar" value=""/>
-        <property key="labeling/xOffset" value="0"/>
-        <property key="labeling/yOffset" value="0"/>
-        <property key="labeling/zIndex" value="0"/>
+        <property value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" key="dualview/previewExpressions"/>
+        <property value="0" key="embeddedWidgets/count"/>
+        <property value="false" key="labeling/addDirectionSymbol"/>
+        <property value="0" key="labeling/angleOffset"/>
+        <property value="0" key="labeling/blendMode"/>
+        <property value="0" key="labeling/bufferBlendMode"/>
+        <property value="255" key="labeling/bufferColorA"/>
+        <property value="255" key="labeling/bufferColorB"/>
+        <property value="255" key="labeling/bufferColorG"/>
+        <property value="255" key="labeling/bufferColorR"/>
+        <property value="false" key="labeling/bufferDraw"/>
+        <property value="64" key="labeling/bufferJoinStyle"/>
+        <property value="false" key="labeling/bufferNoFill"/>
+        <property value="1" key="labeling/bufferSize"/>
+        <property value="false" key="labeling/bufferSizeInMapUnits"/>
+        <property value="0,0,0,0,0,0" key="labeling/bufferSizeMapUnitScale"/>
+        <property value="0" key="labeling/bufferTransp"/>
+        <property value="false" key="labeling/centroidInside"/>
+        <property value="false" key="labeling/centroidWhole"/>
+        <property value="3" key="labeling/decimals"/>
+        <property value="false" key="labeling/displayAll"/>
+        <property value="0" key="labeling/dist"/>
+        <property value="false" key="labeling/distInMapUnits"/>
+        <property value="0,0,0,0,0,0" key="labeling/distMapUnitScale"/>
+        <property value="false" key="labeling/drawLabels"/>
+        <property value="false" key="labeling/enabled"/>
+        <property value="position" key="labeling/fieldName"/>
+        <property value="false" key="labeling/fitInPolygonOnly"/>
+        <property value="0" key="labeling/fontCapitals"/>
+        <property value="Myriad Pro" key="labeling/fontFamily"/>
+        <property value="false" key="labeling/fontItalic"/>
+        <property value="0" key="labeling/fontLetterSpacing"/>
+        <property value="false" key="labeling/fontLimitPixelSize"/>
+        <property value="10000" key="labeling/fontMaxPixelSize"/>
+        <property value="3" key="labeling/fontMinPixelSize"/>
+        <property value="10" key="labeling/fontSize"/>
+        <property value="false" key="labeling/fontSizeInMapUnits"/>
+        <property value="0,0,0,0,0,0" key="labeling/fontSizeMapUnitScale"/>
+        <property value="false" key="labeling/fontStrikeout"/>
+        <property value="false" key="labeling/fontUnderline"/>
+        <property value="63" key="labeling/fontWeight"/>
+        <property value="0" key="labeling/fontWordSpacing"/>
+        <property value="false" key="labeling/formatNumbers"/>
+        <property value="false" key="labeling/isExpression"/>
+        <property value="true" key="labeling/labelOffsetInMapUnits"/>
+        <property value="0,0,0,0,0,0" key="labeling/labelOffsetMapUnitScale"/>
+        <property value="false" key="labeling/labelPerPart"/>
+        <property value="&lt;" key="labeling/leftDirectionSymbol"/>
+        <property value="false" key="labeling/limitNumLabels"/>
+        <property value="20" key="labeling/maxCurvedCharAngleIn"/>
+        <property value="-20" key="labeling/maxCurvedCharAngleOut"/>
+        <property value="2000" key="labeling/maxNumLabels"/>
+        <property value="false" key="labeling/mergeLines"/>
+        <property value="0" key="labeling/minFeatureSize"/>
+        <property value="0" key="labeling/multilineAlign"/>
+        <property value="1" key="labeling/multilineHeight"/>
+        <property value="Semibold" key="labeling/namedStyle"/>
+        <property value="true" key="labeling/obstacle"/>
+        <property value="1" key="labeling/obstacleFactor"/>
+        <property value="0" key="labeling/obstacleType"/>
+        <property value="0" key="labeling/offsetType"/>
+        <property value="0" key="labeling/placeDirectionSymbol"/>
+        <property value="0" key="labeling/placement"/>
+        <property value="10" key="labeling/placementFlags"/>
+        <property value="false" key="labeling/plussign"/>
+        <property value="TR,TL,BR,BL,R,L,TSR,BSR" key="labeling/predefinedPositionOrder"/>
+        <property value="true" key="labeling/preserveRotation"/>
+        <property value="#ffffff" key="labeling/previewBkgrdColor"/>
+        <property value="5" key="labeling/priority"/>
+        <property value="4" key="labeling/quadOffset"/>
+        <property value="0" key="labeling/repeatDistance"/>
+        <property value="0,0,0,0,0,0" key="labeling/repeatDistanceMapUnitScale"/>
+        <property value="1" key="labeling/repeatDistanceUnit"/>
+        <property value="false" key="labeling/reverseDirectionSymbol"/>
+        <property value=">" key="labeling/rightDirectionSymbol"/>
+        <property value="10000000" key="labeling/scaleMax"/>
+        <property value="1" key="labeling/scaleMin"/>
+        <property value="false" key="labeling/scaleVisibility"/>
+        <property value="6" key="labeling/shadowBlendMode"/>
+        <property value="0" key="labeling/shadowColorB"/>
+        <property value="0" key="labeling/shadowColorG"/>
+        <property value="0" key="labeling/shadowColorR"/>
+        <property value="false" key="labeling/shadowDraw"/>
+        <property value="135" key="labeling/shadowOffsetAngle"/>
+        <property value="1" key="labeling/shadowOffsetDist"/>
+        <property value="true" key="labeling/shadowOffsetGlobal"/>
+        <property value="0,0,0,0,0,0" key="labeling/shadowOffsetMapUnitScale"/>
+        <property value="1" key="labeling/shadowOffsetUnits"/>
+        <property value="1.5" key="labeling/shadowRadius"/>
+        <property value="false" key="labeling/shadowRadiusAlphaOnly"/>
+        <property value="0,0,0,0,0,0" key="labeling/shadowRadiusMapUnitScale"/>
+        <property value="1" key="labeling/shadowRadiusUnits"/>
+        <property value="100" key="labeling/shadowScale"/>
+        <property value="30" key="labeling/shadowTransparency"/>
+        <property value="0" key="labeling/shadowUnder"/>
+        <property value="0" key="labeling/shapeBlendMode"/>
+        <property value="255" key="labeling/shapeBorderColorA"/>
+        <property value="128" key="labeling/shapeBorderColorB"/>
+        <property value="128" key="labeling/shapeBorderColorG"/>
+        <property value="128" key="labeling/shapeBorderColorR"/>
+        <property value="0" key="labeling/shapeBorderWidth"/>
+        <property value="0,0,0,0,0,0" key="labeling/shapeBorderWidthMapUnitScale"/>
+        <property value="1" key="labeling/shapeBorderWidthUnits"/>
+        <property value="true" key="labeling/shapeDraw"/>
+        <property value="255" key="labeling/shapeFillColorA"/>
+        <property value="138" key="labeling/shapeFillColorB"/>
+        <property value="0" key="labeling/shapeFillColorG"/>
+        <property value="101" key="labeling/shapeFillColorR"/>
+        <property value="64" key="labeling/shapeJoinStyle"/>
+        <property value="0,0,0,0,0,0" key="labeling/shapeOffsetMapUnitScale"/>
+        <property value="1" key="labeling/shapeOffsetUnits"/>
+        <property value="0" key="labeling/shapeOffsetX"/>
+        <property value="0" key="labeling/shapeOffsetY"/>
+        <property value="0,0,0,0,0,0" key="labeling/shapeRadiiMapUnitScale"/>
+        <property value="1" key="labeling/shapeRadiiUnits"/>
+        <property value="0" key="labeling/shapeRadiiX"/>
+        <property value="0" key="labeling/shapeRadiiY"/>
+        <property value="0" key="labeling/shapeRotation"/>
+        <property value="0" key="labeling/shapeRotationType"/>
+        <property value="" key="labeling/shapeSVGFile"/>
+        <property value="0,0,0,0,0,0" key="labeling/shapeSizeMapUnitScale"/>
+        <property value="0" key="labeling/shapeSizeType"/>
+        <property value="1" key="labeling/shapeSizeUnits"/>
+        <property value="0" key="labeling/shapeSizeX"/>
+        <property value="0" key="labeling/shapeSizeY"/>
+        <property value="0" key="labeling/shapeTransparency"/>
+        <property value="0" key="labeling/shapeType"/>
+        <property value="255" key="labeling/textColorA"/>
+        <property value="255" key="labeling/textColorB"/>
+        <property value="255" key="labeling/textColorG"/>
+        <property value="255" key="labeling/textColorR"/>
+        <property value="0" key="labeling/textTransp"/>
+        <property value="0" key="labeling/upsidedownLabels"/>
+        <property value="" key="labeling/wrapChar"/>
+        <property value="0" key="labeling/xOffset"/>
+        <property value="0" key="labeling/yOffset"/>
+        <property value="0" key="labeling/zIndex"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory enabled="0" minScaleDenominator="100000" width="15" rotationOffset="270" penColor="#000000" penAlpha="255" height="15" penWidth="0" diagramOrientation="Up" backgroundColor="#ffffff" scaleDependency="Area" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" opacity="1" lineSizeType="MM" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeType="MM" scaleBasedVisibility="0" backgroundAlpha="255" barWidth="5">
           <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
-          <attribute field="" color="#000000" label=""/>
+          <attribute color="#000000" label="" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" priority="0" dist="0" placement="0" obstacle="0" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" showAll="1" placement="0" linePlacementFlags="2" obstacle="0" dist="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -5791,7 +5791,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -5920,20 +5920,20 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="position" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
-        <alias field="notes" index="3" name=""/>
-        <alias field="oldpositio" index="4" name=""/>
-        <alias field="xyposition" index="5" name=""/>
-        <alias field="csv_positi" index="6" name=""/>
-        <alias field="csv_name" index="7" name=""/>
-        <alias field="csv_club" index="8" name=""/>
-        <alias field="csv_captai" index="9" name=""/>
-        <alias field="csv_capt_1" index="10" name=""/>
-        <alias field="csv_first_" index="11" name=""/>
-        <alias field="csv_last_r" index="12" name=""/>
-        <alias field="csv_instru" index="13" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="position" name=""/>
+        <alias index="2" field="type" name=""/>
+        <alias index="3" field="notes" name=""/>
+        <alias index="4" field="oldpositio" name=""/>
+        <alias index="5" field="xyposition" name=""/>
+        <alias index="6" field="csv_positi" name=""/>
+        <alias index="7" field="csv_name" name=""/>
+        <alias index="8" field="csv_club" name=""/>
+        <alias index="9" field="csv_captai" name=""/>
+        <alias index="10" field="csv_capt_1" name=""/>
+        <alias index="11" field="csv_first_" name=""/>
+        <alias index="12" field="csv_last_r" name=""/>
+        <alias index="13" field="csv_instru" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -5954,58 +5954,58 @@ def my_form_open(dialog, layer, feature):
         <default field="csv_instru" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="position" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="type" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="notes" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="oldpositio" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="xyposition" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="csv_positi" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="csv_name" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="csv_club" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="csv_captai" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="csv_capt_1" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="csv_first_" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="csv_last_r" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="csv_instru" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint exp_strength="0" field="id" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="position" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="notes" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="oldpositio" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="xyposition" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="csv_positi" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="csv_name" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="csv_club" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="csv_captai" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="csv_capt_1" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="csv_first_" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="csv_last_r" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="csv_instru" constraints="0" notnull_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="position" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="notes" exp="" desc=""/>
-        <constraint field="oldpositio" exp="" desc=""/>
-        <constraint field="xyposition" exp="" desc=""/>
-        <constraint field="csv_positi" exp="" desc=""/>
-        <constraint field="csv_name" exp="" desc=""/>
-        <constraint field="csv_club" exp="" desc=""/>
-        <constraint field="csv_captai" exp="" desc=""/>
-        <constraint field="csv_capt_1" exp="" desc=""/>
-        <constraint field="csv_first_" exp="" desc=""/>
-        <constraint field="csv_last_r" exp="" desc=""/>
-        <constraint field="csv_instru" exp="" desc=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="position" desc=""/>
+        <constraint exp="" field="type" desc=""/>
+        <constraint exp="" field="notes" desc=""/>
+        <constraint exp="" field="oldpositio" desc=""/>
+        <constraint exp="" field="xyposition" desc=""/>
+        <constraint exp="" field="csv_positi" desc=""/>
+        <constraint exp="" field="csv_name" desc=""/>
+        <constraint exp="" field="csv_club" desc=""/>
+        <constraint exp="" field="csv_captai" desc=""/>
+        <constraint exp="" field="csv_capt_1" desc=""/>
+        <constraint exp="" field="csv_first_" desc=""/>
+        <constraint exp="" field="csv_last_r" desc=""/>
+        <constraint exp="" field="csv_instru" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="1" sortExpression="&quot;csv_club&quot;">
+      <attributetableconfig sortExpression="&quot;csv_club&quot;" sortOrder="1" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="position" hidden="0" type="field"/>
-          <column width="-1" name="type" hidden="0" type="field"/>
-          <column width="-1" name="notes" hidden="0" type="field"/>
-          <column width="-1" name="oldpositio" hidden="0" type="field"/>
-          <column width="-1" name="xyposition" hidden="0" type="field"/>
-          <column width="-1" name="csv_name" hidden="0" type="field"/>
-          <column width="-1" name="csv_club" hidden="0" type="field"/>
-          <column width="-1" name="csv_positi" hidden="0" type="field"/>
-          <column width="-1" name="csv_captai" hidden="0" type="field"/>
-          <column width="-1" name="csv_capt_1" hidden="0" type="field"/>
-          <column width="-1" name="csv_first_" hidden="0" type="field"/>
-          <column width="-1" name="csv_last_r" hidden="0" type="field"/>
-          <column width="-1" name="csv_instru" hidden="0" type="field"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="position" type="field" width="-1"/>
+          <column hidden="0" name="type" type="field" width="-1"/>
+          <column hidden="0" name="notes" type="field" width="-1"/>
+          <column hidden="0" name="oldpositio" type="field" width="-1"/>
+          <column hidden="0" name="xyposition" type="field" width="-1"/>
+          <column hidden="0" name="csv_name" type="field" width="-1"/>
+          <column hidden="0" name="csv_club" type="field" width="-1"/>
+          <column hidden="0" name="csv_positi" type="field" width="-1"/>
+          <column hidden="0" name="csv_captai" type="field" width="-1"/>
+          <column hidden="0" name="csv_capt_1" type="field" width="-1"/>
+          <column hidden="0" name="csv_first_" type="field" width="-1"/>
+          <column hidden="0" name="csv_last_r" type="field" width="-1"/>
+          <column hidden="0" name="csv_instru" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6036,66 +6036,66 @@ 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_Description" editable="0"/>
-        <field name="csv_capt_1" editable="1"/>
-        <field name="csv_captai" editable="1"/>
-        <field name="csv_captain" editable="0"/>
-        <field name="csv_captain_number" editable="0"/>
-        <field name="csv_captain_phone" editable="0"/>
-        <field name="csv_club" editable="0"/>
-        <field name="csv_email" editable="0"/>
-        <field name="csv_first runner" editable="0"/>
-        <field name="csv_first_" editable="1"/>
-        <field name="csv_first_runner" editable="0"/>
-        <field name="csv_instru" editable="1"/>
-        <field name="csv_instructions" editable="0"/>
-        <field name="csv_last runner" editable="0"/>
-        <field name="csv_last_r" editable="1"/>
-        <field name="csv_last_runner" editable="0"/>
-        <field name="csv_name" editable="0"/>
-        <field name="csv_phone" editable="0"/>
-        <field name="csv_positi" editable="1"/>
-        <field name="csv_position" editable="0"/>
-        <field name="csv_races" editable="0"/>
-        <field name="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_Description"/>
+        <field editable="1" name="csv_capt_1"/>
+        <field editable="1" name="csv_captai"/>
+        <field editable="0" name="csv_captain"/>
+        <field editable="0" name="csv_captain_number"/>
+        <field editable="0" name="csv_captain_phone"/>
+        <field editable="0" name="csv_club"/>
+        <field editable="0" name="csv_email"/>
+        <field editable="0" name="csv_first runner"/>
+        <field editable="1" name="csv_first_"/>
+        <field editable="0" name="csv_first_runner"/>
+        <field editable="1" name="csv_instru"/>
+        <field editable="0" name="csv_instructions"/>
+        <field editable="0" name="csv_last runner"/>
+        <field editable="1" name="csv_last_r"/>
+        <field editable="0" name="csv_last_runner"/>
+        <field editable="0" name="csv_name"/>
+        <field editable="0" name="csv_phone"/>
+        <field editable="1" name="csv_positi"/>
+        <field editable="0" name="csv_position"/>
+        <field editable="0" name="csv_races"/>
+        <field editable="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 labelOnTop="0" name="csv_10_distance"/>
-        <field labelOnTop="0" name="csv_21_distance"/>
-        <field labelOnTop="0" name="csv_Description"/>
-        <field labelOnTop="0" name="csv_capt_1"/>
-        <field labelOnTop="0" name="csv_captai"/>
-        <field labelOnTop="0" name="csv_captain"/>
-        <field labelOnTop="0" name="csv_captain_number"/>
-        <field labelOnTop="0" name="csv_captain_phone"/>
-        <field labelOnTop="0" name="csv_club"/>
-        <field labelOnTop="0" name="csv_email"/>
-        <field labelOnTop="0" name="csv_first runner"/>
-        <field labelOnTop="0" name="csv_first_"/>
-        <field labelOnTop="0" name="csv_first_runner"/>
-        <field labelOnTop="0" name="csv_instru"/>
-        <field labelOnTop="0" name="csv_instructions"/>
-        <field labelOnTop="0" name="csv_last runner"/>
-        <field labelOnTop="0" name="csv_last_r"/>
-        <field labelOnTop="0" name="csv_last_runner"/>
-        <field labelOnTop="0" name="csv_name"/>
-        <field labelOnTop="0" name="csv_phone"/>
-        <field labelOnTop="0" name="csv_positi"/>
-        <field labelOnTop="0" name="csv_position"/>
-        <field labelOnTop="0" name="csv_races"/>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="notes"/>
-        <field labelOnTop="0" name="oldpositio"/>
-        <field labelOnTop="0" name="position"/>
-        <field labelOnTop="0" name="type"/>
-        <field labelOnTop="0" name="xyposition"/>
+        <field name="csv_10_distance" labelOnTop="0"/>
+        <field name="csv_21_distance" labelOnTop="0"/>
+        <field name="csv_Description" labelOnTop="0"/>
+        <field name="csv_capt_1" labelOnTop="0"/>
+        <field name="csv_captai" labelOnTop="0"/>
+        <field name="csv_captain" labelOnTop="0"/>
+        <field name="csv_captain_number" labelOnTop="0"/>
+        <field name="csv_captain_phone" labelOnTop="0"/>
+        <field name="csv_club" labelOnTop="0"/>
+        <field name="csv_email" labelOnTop="0"/>
+        <field name="csv_first runner" labelOnTop="0"/>
+        <field name="csv_first_" labelOnTop="0"/>
+        <field name="csv_first_runner" labelOnTop="0"/>
+        <field name="csv_instru" labelOnTop="0"/>
+        <field name="csv_instructions" labelOnTop="0"/>
+        <field name="csv_last runner" labelOnTop="0"/>
+        <field name="csv_last_r" labelOnTop="0"/>
+        <field name="csv_last_runner" labelOnTop="0"/>
+        <field name="csv_name" labelOnTop="0"/>
+        <field name="csv_phone" labelOnTop="0"/>
+        <field name="csv_positi" labelOnTop="0"/>
+        <field name="csv_position" labelOnTop="0"/>
+        <field name="csv_races" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="notes" labelOnTop="0"/>
+        <field name="oldpositio" labelOnTop="0"/>
+        <field name="position" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
+        <field name="xyposition" labelOnTop="0"/>
       </labelOnTop>
       <widgets>
         <widget name="csv_captain_ph">
@@ -6144,7 +6144,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" readOnly="0" maxScale="100000" refreshOnNotifyEnabled="0" refreshOnNotifyMessage="" geometry="No geometry" wkbType="NoGeometry" styleCategories="AllStyleCategories" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" type="vector" minScale="1e+08">
+    <maplayer geometry="No geometry" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" maxScale="100000" refreshOnNotifyEnabled="0" minScale="1e+08" type="vector" readOnly="0" wkbType="NoGeometry" autoRefreshEnabled="0" autoRefreshTime="0">
       <id>marshals_by_position20161003112326575</id>
       <datasource>file:./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes</datasource>
       <keywordList>
@@ -6195,7 +6195,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
+          <spatial minz="0" minx="0" maxz="0" maxy="0" maxx="0" crs="" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -6208,8 +6208,8 @@ def my_form_open(dialog, layer, feature):
       <vectorjoins/>
       <layerDependencies/>
       <dataDependencies>
-        <layer id="marshal_positions20160930121322287"/>
         <layer id="all_routes20170907054841602"/>
+        <layer id="marshal_positions20160930121322287"/>
       </dataDependencies>
       <legend type="default-vector"/>
       <expressionfields/>
@@ -6223,12 +6223,12 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties>
-        <property key="dualview/previewExpressions" value="first_name"/>
-        <property key="embeddedWidgets/count" value="0"/>
+        <property value="first_name" key="dualview/previewExpressions"/>
+        <property value="0" key="embeddedWidgets/count"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -6347,19 +6347,19 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="position" index="0" name=""/>
-        <alias field="firstname" index="1" name=""/>
-        <alias field="surname" 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_phone" index="8" name=""/>
-        <alias field="races" index="9" name=""/>
-        <alias field="first_runner" index="10" name=""/>
-        <alias field="last_runner" index="11" name=""/>
-        <alias field="instructions" index="12" name=""/>
+        <alias index="0" field="position" name=""/>
+        <alias index="1" field="firstname" name=""/>
+        <alias index="2" field="surname" name=""/>
+        <alias index="3" field="name" name=""/>
+        <alias index="4" field="club" name=""/>
+        <alias index="5" field="phone" name=""/>
+        <alias index="6" field="email" name=""/>
+        <alias index="7" field="captain" name=""/>
+        <alias index="8" field="captain_phone" name=""/>
+        <alias index="9" field="races" name=""/>
+        <alias index="10" field="first_runner" name=""/>
+        <alias index="11" field="last_runner" name=""/>
+        <alias index="12" field="instructions" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -6379,55 +6379,55 @@ def my_form_open(dialog, layer, feature):
         <default field="instructions" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="position" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="firstname" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="surname" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="name" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="club" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="phone" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="email" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="captain" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="captain_phone" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="races" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="first_runner" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="last_runner" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="instructions" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint exp_strength="0" field="position" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="firstname" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="surname" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="name" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="club" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="phone" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="email" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="captain" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="captain_phone" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="races" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="first_runner" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="last_runner" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="instructions" constraints="0" notnull_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="position" exp="" desc=""/>
-        <constraint field="firstname" exp="" desc=""/>
-        <constraint field="surname" exp="" desc=""/>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="club" exp="" desc=""/>
-        <constraint field="phone" exp="" desc=""/>
-        <constraint field="email" exp="" desc=""/>
-        <constraint field="captain" exp="" desc=""/>
-        <constraint field="captain_phone" exp="" desc=""/>
-        <constraint field="races" exp="" desc=""/>
-        <constraint field="first_runner" exp="" desc=""/>
-        <constraint field="last_runner" exp="" desc=""/>
-        <constraint field="instructions" exp="" desc=""/>
+        <constraint exp="" field="position" desc=""/>
+        <constraint exp="" field="firstname" desc=""/>
+        <constraint exp="" field="surname" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="club" desc=""/>
+        <constraint exp="" field="phone" desc=""/>
+        <constraint exp="" field="email" desc=""/>
+        <constraint exp="" field="captain" desc=""/>
+        <constraint exp="" field="captain_phone" desc=""/>
+        <constraint exp="" field="races" desc=""/>
+        <constraint exp="" field="first_runner" desc=""/>
+        <constraint exp="" field="last_runner" desc=""/>
+        <constraint exp="" field="instructions" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" name="position" hidden="0" type="field"/>
-          <column width="-1" name="name" hidden="0" type="field"/>
-          <column width="-1" name="club" hidden="0" type="field"/>
-          <column width="-1" name="phone" hidden="0" type="field"/>
-          <column width="-1" name="email" hidden="0" type="field"/>
-          <column width="-1" name="captain" hidden="0" type="field"/>
-          <column width="-1" name="races" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="first_runner" hidden="0" type="field"/>
-          <column width="-1" name="last_runner" hidden="0" type="field"/>
-          <column width="-1" name="instructions" hidden="0" type="field"/>
-          <column width="-1" name="firstname" hidden="0" type="field"/>
-          <column width="-1" name="surname" hidden="0" type="field"/>
-          <column width="-1" name="captain_phone" hidden="0" type="field"/>
+          <column hidden="0" name="position" type="field" width="-1"/>
+          <column hidden="0" name="name" type="field" width="-1"/>
+          <column hidden="0" name="club" type="field" width="-1"/>
+          <column hidden="0" name="phone" type="field" width="-1"/>
+          <column hidden="0" name="email" type="field" width="-1"/>
+          <column hidden="0" name="captain" type="field" width="-1"/>
+          <column hidden="0" name="races" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="first_runner" type="field" width="-1"/>
+          <column hidden="0" name="last_runner" type="field" width="-1"/>
+          <column hidden="0" name="instructions" type="field" width="-1"/>
+          <column hidden="0" name="firstname" type="field" width="-1"/>
+          <column hidden="0" name="surname" type="field" width="-1"/>
+          <column hidden="0" name="captain_phone" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6458,48 +6458,48 @@ 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 labelOnTop="0" name="10_distance"/>
-        <field labelOnTop="0" name="21_distance"/>
-        <field labelOnTop="0" name="5_distance"/>
-        <field labelOnTop="0" name="captain"/>
-        <field labelOnTop="0" name="captain_number"/>
-        <field labelOnTop="0" name="club"/>
-        <field labelOnTop="0" name="email"/>
-        <field labelOnTop="0" name="first_name"/>
-        <field labelOnTop="0" name="first_runner"/>
-        <field labelOnTop="0" name="instructions"/>
-        <field labelOnTop="0" name="last_name"/>
-        <field labelOnTop="0" name="last_runner"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="phone"/>
-        <field labelOnTop="0" name="position"/>
-        <field labelOnTop="0" name="races"/>
-        <field labelOnTop="0" name="tshirt"/>
+        <field name="10_distance" labelOnTop="0"/>
+        <field name="21_distance" labelOnTop="0"/>
+        <field name="5_distance" labelOnTop="0"/>
+        <field name="captain" labelOnTop="0"/>
+        <field name="captain_number" labelOnTop="0"/>
+        <field name="club" labelOnTop="0"/>
+        <field name="email" labelOnTop="0"/>
+        <field name="first_name" labelOnTop="0"/>
+        <field name="first_runner" labelOnTop="0"/>
+        <field name="instructions" labelOnTop="0"/>
+        <field name="last_name" labelOnTop="0"/>
+        <field name="last_runner" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="phone" labelOnTop="0"/>
+        <field name="position" labelOnTop="0"/>
+        <field name="races" labelOnTop="0"/>
+        <field name="tshirt" labelOnTop="0"/>
       </labelOnTop>
       <widgets/>
       <previewExpression>first_name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="100000" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Point" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" wkbType="Point" simplifyDrawingTol="1">
+    <maplayer styleCategories="AllStyleCategories" refreshOnNotifyMessage="" simplifyAlgorithm="0" maxScale="100000" geometry="Point" simplifyMaxScale="1" simplifyLocal="1" labelsEnabled="1" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" type="vector" minScale="1e+08" readOnly="0" autoRefreshTime="0" autoRefreshEnabled="0" simplifyDrawingTol="1" wkbType="Point" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37896929129519208</xmin>
         <ymin>-33.93500027904928373</ymin>
@@ -6556,7 +6556,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
+          <spatial minz="0" minx="0" maxz="0" maxy="0" maxx="0" crs="" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -6583,15 +6583,15 @@ def my_form_open(dialog, layer, feature):
       <renderer-v2 type="nullSymbol"/>
       <labeling type="simple">
         <settings>
-          <text-style previewBkgrdColor="#ffffff" namedStyle="Regular" fontWeight="50" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.75" fontSizeUnit="Point" fieldName="name" fontSize="8.5" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <text-buffer bufferOpacity="0.6" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1.5"/>
-            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="0" shapeRotationType="0" shapeSizeX="0" shapeRadiiX="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+          <text-style fontLetterSpacing="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Regular" textColor="0,0,0,255" multilineHeight="1" fontSize="8.5" fontWeight="50" fieldName="name" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="0.75" useSubstitutions="0" fontUnderline="0">
+            <text-buffer bufferOpacity="0.6" bufferBlendMode="0" bufferSize="1.5" bufferNoFill="0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiY="0" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeDraw="0" shapeOpacity="1" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="0" shapeRadiiX="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
             <substitutions/>
           </text-style>
-          <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
-          <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="6" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="0" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="1" placementFlags="2" offsetType="0" offsetUnits="MapUnit"/>
-          <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="0.2" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="0"/>
+          <text-format multilineAlign="0" autoWrapLength="0" plussign="0" addDirectionSymbol="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+          <placement maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="6" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" geometryGeneratorType="PointGeometry" quadOffset="4" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="0" centroidInside="0" geometryGenerator="" placementFlags="2" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" maxCurvedCharAngleIn="20" priority="1"/>
+          <rendering displayAll="0" upsidedownLabels="0" mergeLines="0" fontLimitPixelSize="0" maxNumLabels="2000" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="1" scaleMax="10000000" minFeatureSize="0" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="0" fontMaxPixelSize="10000" scaleMin="1" obstacleFactor="0.2"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -6623,21 +6623,21 @@ def my_form_open(dialog, layer, feature):
         </settings>
       </labeling>
       <customproperties>
-        <property key="dualview/previewExpressions" value="&quot;name&quot;"/>
-        <property key="embeddedWidgets/count" value="0"/>
+        <property value="&quot;name&quot;" key="dualview/previewExpressions"/>
+        <property value="0" key="embeddedWidgets/count"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory enabled="0" minScaleDenominator="100000" width="15" rotationOffset="270" penColor="#000000" penAlpha="255" height="15" penWidth="0" diagramOrientation="Up" backgroundColor="#ffffff" scaleDependency="Area" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" opacity="1" lineSizeType="MM" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeType="MM" scaleBasedVisibility="0" backgroundAlpha="255" barWidth="5">
           <fontProperties style="" description="Arial,10,-1,5,50,0,0,0,0,0"/>
-          <attribute field="" color="#000000" label=""/>
+          <attribute color="#000000" label="" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" priority="0" dist="0" placement="0" obstacle="0" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" showAll="1" placement="0" linePlacementFlags="2" obstacle="0" dist="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -6646,7 +6646,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -6743,15 +6743,15 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="osm_id" index="1" name=""/>
-        <alias field="name" index="2" name=""/>
-        <alias field="type" index="3" name=""/>
-        <alias field="z_order" index="4" name=""/>
-        <alias field="population" index="5" name=""/>
-        <alias field="label_x" index="6" name=""/>
-        <alias field="label_y" index="7" name=""/>
-        <alias field="label_rota" index="8" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="osm_id" name=""/>
+        <alias index="2" field="name" name=""/>
+        <alias index="3" field="type" name=""/>
+        <alias index="4" field="z_order" name=""/>
+        <alias index="5" field="population" name=""/>
+        <alias index="6" field="label_x" name=""/>
+        <alias index="7" field="label_y" name=""/>
+        <alias index="8" field="label_rota" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -6767,43 +6767,43 @@ def my_form_open(dialog, layer, feature):
         <default field="label_rota" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="osm_id" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="name" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="type" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="z_order" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="population" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="label_x" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="label_y" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="label_rota" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint exp_strength="0" field="id" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="osm_id" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="name" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="z_order" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="population" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="label_x" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="label_y" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="label_rota" constraints="0" notnull_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="osm_id" exp="" desc=""/>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="z_order" exp="" desc=""/>
-        <constraint field="population" exp="" desc=""/>
-        <constraint field="label_x" exp="" desc=""/>
-        <constraint field="label_y" exp="" desc=""/>
-        <constraint field="label_rota" exp="" desc=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="osm_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="type" desc=""/>
+        <constraint exp="" field="z_order" desc=""/>
+        <constraint exp="" field="population" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rota" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="-1" name="osm_id" hidden="0" type="field"/>
-          <column width="-1" name="name" hidden="0" type="field"/>
-          <column width="-1" name="type" hidden="0" type="field"/>
-          <column width="-1" name="z_order" hidden="0" type="field"/>
-          <column width="-1" name="population" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="label_x" hidden="0" type="field"/>
-          <column width="-1" name="label_y" hidden="0" type="field"/>
-          <column width="-1" name="label_rota" hidden="0" type="field"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="0" name="osm_id" type="field" width="-1"/>
+          <column hidden="0" name="name" type="field" width="-1"/>
+          <column hidden="0" name="type" type="field" width="-1"/>
+          <column hidden="0" name="z_order" type="field" width="-1"/>
+          <column hidden="0" name="population" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="label_x" type="field" width="-1"/>
+          <column hidden="0" name="label_y" type="field" width="-1"/>
+          <column hidden="0" name="label_rota" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6834,32 +6834,32 @@ 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 labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="label_rota"/>
-        <field labelOnTop="0" name="label_x"/>
-        <field labelOnTop="0" name="label_y"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="osm_id"/>
-        <field labelOnTop="0" name="population"/>
-        <field labelOnTop="0" name="type"/>
-        <field labelOnTop="0" name="z_order"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="label_rota" labelOnTop="0"/>
+        <field name="label_x" labelOnTop="0"/>
+        <field name="label_y" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="osm_id" labelOnTop="0"/>
+        <field name="population" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
+        <field name="z_order" labelOnTop="0"/>
       </labelOnTop>
       <widgets/>
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="100000" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Line" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" simplifyDrawingTol="1">
+    <maplayer styleCategories="AllStyleCategories" refreshOnNotifyMessage="" simplifyAlgorithm="0" maxScale="100000" geometry="Line" simplifyMaxScale="1" simplifyLocal="1" labelsEnabled="1" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" type="vector" minScale="1e+08" readOnly="0" autoRefreshTime="0" autoRefreshEnabled="0" simplifyDrawingTol="1" wkbType="MultiLineString" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.3437671999999985</xmin>
         <ymin>-34.02801110000000051</ymin>
@@ -6916,7 +6916,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
+          <spatial minz="0" minx="0" maxz="0" maxy="0" maxx="0" crs="" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -6943,15 +6943,15 @@ def my_form_open(dialog, layer, feature):
       <renderer-v2 type="nullSymbol"/>
       <labeling type="simple">
         <settings>
-          <text-style previewBkgrdColor="#ffffff" namedStyle="Regular" fontWeight="50" useSubstitutions="0" fontItalic="0" isExpression="1" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.8" fontSizeUnit="Point" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" fontSize="7" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <text-buffer bufferOpacity="0.6" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1"/>
-            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="0" shapeRotationType="0" shapeSizeX="0" shapeRadiiX="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+          <text-style fontLetterSpacing="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Regular" textColor="0,0,0,255" multilineHeight="1" fontSize="7" fontWeight="50" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="0.8" useSubstitutions="0" fontUnderline="0">
+            <text-buffer bufferOpacity="0.6" bufferBlendMode="0" bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiY="0" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeDraw="0" shapeOpacity="1" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="0" shapeRadiiX="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
             <substitutions/>
           </text-style>
-          <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
-          <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="3" geometryGeneratorEnabled="0" repeatDistanceUnits="MapUnit" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="0" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="3" placementFlags="4" offsetType="0" offsetUnits="MapUnit"/>
-          <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="0.3" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="1" minFeatureSize="5" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="1" displayAll="0"/>
+          <text-format multilineAlign="0" autoWrapLength="0" plussign="0" addDirectionSymbol="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+          <placement maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="3" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" geometryGeneratorType="PointGeometry" quadOffset="4" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MapUnit" dist="0" centroidInside="0" geometryGenerator="" placementFlags="4" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" maxCurvedCharAngleIn="20" priority="3"/>
+          <rendering displayAll="0" upsidedownLabels="0" mergeLines="1" fontLimitPixelSize="0" maxNumLabels="2000" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="1" scaleMax="10000000" minFeatureSize="5" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="0" fontMaxPixelSize="10000" scaleMin="1" obstacleFactor="0.3"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -7015,20 +7015,20 @@ def my_form_open(dialog, layer, feature):
           <value>COALESCE( "name", '&lt;NULL>' )</value>
           <value>COALESCE( "name", '&lt;NULL>' )</value>
         </property>
-        <property key="embeddedWidgets/count" value="0"/>
+        <property value="0" key="embeddedWidgets/count"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory enabled="0" minScaleDenominator="100000" width="15" rotationOffset="270" penColor="#000000" penAlpha="255" height="15" penWidth="0" diagramOrientation="Up" backgroundColor="#ffffff" scaleDependency="Area" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" opacity="1" lineSizeType="MM" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeType="MM" scaleBasedVisibility="0" backgroundAlpha="255" barWidth="5">
           <fontProperties style="" description="Arial,10,-1,5,50,0,0,0,0,0"/>
-          <attribute field="" color="#000000" label=""/>
+          <attribute color="#000000" label="" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" priority="0" dist="0" placement="2" obstacle="0" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" showAll="1" placement="2" linePlacementFlags="2" obstacle="0" dist="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -7037,7 +7037,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -7165,22 +7165,22 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="osm_id" index="0" name=""/>
-        <alias field="name" index="1" name=""/>
-        <alias field="highway" index="2" name=""/>
-        <alias field="waterway" index="3" name=""/>
-        <alias field="aerialway" index="4" name=""/>
-        <alias field="barrier" index="5" name=""/>
-        <alias field="man_made" index="6" name=""/>
-        <alias field="z_order" index="7" name=""/>
-        <alias field="other_tags" index="8" name=""/>
-        <alias field="never_show" index="9" name=""/>
-        <alias field="label_x" index="10" name=""/>
-        <alias field="label_y" index="11" name=""/>
-        <alias field="label_rota" index="12" name=""/>
-        <alias field="always_sho" index="13" name=""/>
-        <alias field="resident_a" index="14" name=""/>
-        <alias field="auxiliary_storage_labeling_show" index="15" name=""/>
+        <alias index="0" field="osm_id" name=""/>
+        <alias index="1" field="name" name=""/>
+        <alias index="2" field="highway" name=""/>
+        <alias index="3" field="waterway" name=""/>
+        <alias index="4" field="aerialway" name=""/>
+        <alias index="5" field="barrier" name=""/>
+        <alias index="6" field="man_made" name=""/>
+        <alias index="7" field="z_order" name=""/>
+        <alias index="8" field="other_tags" name=""/>
+        <alias index="9" field="never_show" name=""/>
+        <alias index="10" field="label_x" name=""/>
+        <alias index="11" field="label_y" name=""/>
+        <alias index="12" field="label_rota" name=""/>
+        <alias index="13" field="always_sho" name=""/>
+        <alias index="14" field="resident_a" name=""/>
+        <alias index="15" field="auxiliary_storage_labeling_show" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -7203,64 +7203,64 @@ def my_form_open(dialog, layer, feature):
         <default field="auxiliary_storage_labeling_show" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="osm_id" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="name" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="highway" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="waterway" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="aerialway" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="barrier" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="man_made" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="z_order" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="other_tags" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="never_show" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="label_x" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="label_y" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="label_rota" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="always_sho" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="resident_a" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="auxiliary_storage_labeling_show" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint exp_strength="0" field="osm_id" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="name" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="highway" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="waterway" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="aerialway" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="barrier" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="man_made" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="z_order" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="other_tags" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="never_show" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="label_x" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="label_y" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="label_rota" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="always_sho" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="resident_a" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="auxiliary_storage_labeling_show" constraints="0" notnull_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="osm_id" exp="" desc=""/>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="highway" exp="" desc=""/>
-        <constraint field="waterway" exp="" desc=""/>
-        <constraint field="aerialway" exp="" desc=""/>
-        <constraint field="barrier" exp="" desc=""/>
-        <constraint field="man_made" exp="" desc=""/>
-        <constraint field="z_order" exp="" desc=""/>
-        <constraint field="other_tags" exp="" desc=""/>
-        <constraint field="never_show" exp="" desc=""/>
-        <constraint field="label_x" exp="" desc=""/>
-        <constraint field="label_y" exp="" desc=""/>
-        <constraint field="label_rota" exp="" desc=""/>
-        <constraint field="always_sho" exp="" desc=""/>
-        <constraint field="resident_a" exp="" desc=""/>
-        <constraint field="auxiliary_storage_labeling_show" exp="" desc=""/>
+        <constraint exp="" field="osm_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="highway" desc=""/>
+        <constraint exp="" field="waterway" desc=""/>
+        <constraint exp="" field="aerialway" desc=""/>
+        <constraint exp="" field="barrier" desc=""/>
+        <constraint exp="" field="man_made" desc=""/>
+        <constraint exp="" field="z_order" desc=""/>
+        <constraint exp="" field="other_tags" desc=""/>
+        <constraint exp="" field="never_show" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rota" desc=""/>
+        <constraint exp="" field="always_sho" desc=""/>
+        <constraint exp="" field="resident_a" desc=""/>
+        <constraint exp="" field="auxiliary_storage_labeling_show" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="1" sortExpression="&quot;resident_a&quot;">
+      <attributetableconfig sortExpression="&quot;resident_a&quot;" sortOrder="1" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" name="osm_id" hidden="0" type="field"/>
-          <column width="-1" name="name" hidden="0" type="field"/>
-          <column width="-1" name="z_order" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="highway" hidden="0" type="field"/>
-          <column width="-1" name="waterway" hidden="0" type="field"/>
-          <column width="-1" name="aerialway" hidden="0" type="field"/>
-          <column width="-1" name="barrier" hidden="0" type="field"/>
-          <column width="-1" name="man_made" hidden="0" type="field"/>
-          <column width="-1" name="other_tags" hidden="0" type="field"/>
-          <column width="-1" name="never_show" hidden="0" type="field"/>
-          <column width="-1" name="label_x" hidden="0" type="field"/>
-          <column width="-1" name="label_y" hidden="0" type="field"/>
-          <column width="-1" name="label_rota" hidden="0" type="field"/>
-          <column width="-1" name="always_sho" hidden="0" type="field"/>
-          <column width="-1" name="resident_a" hidden="0" type="field"/>
-          <column width="-1" name="auxiliary_storage_labeling_show" hidden="0" type="field"/>
+          <column hidden="0" name="osm_id" type="field" width="-1"/>
+          <column hidden="0" name="name" type="field" width="-1"/>
+          <column hidden="0" name="z_order" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="highway" type="field" width="-1"/>
+          <column hidden="0" name="waterway" type="field" width="-1"/>
+          <column hidden="0" name="aerialway" type="field" width="-1"/>
+          <column hidden="0" name="barrier" type="field" width="-1"/>
+          <column hidden="0" name="man_made" type="field" width="-1"/>
+          <column hidden="0" name="other_tags" type="field" width="-1"/>
+          <column hidden="0" name="never_show" type="field" width="-1"/>
+          <column hidden="0" name="label_x" type="field" width="-1"/>
+          <column hidden="0" name="label_y" type="field" width="-1"/>
+          <column hidden="0" name="label_rota" type="field" width="-1"/>
+          <column hidden="0" name="always_sho" type="field" width="-1"/>
+          <column hidden="0" name="resident_a" type="field" width="-1"/>
+          <column hidden="0" name="auxiliary_storage_labeling_show" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7291,76 +7291,76 @@ 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="auxiliary_storage_labeling_show" editable="0"/>
-        <field name="barrier" editable="1"/>
-        <field name="highway" editable="1"/>
-        <field name="label_rota" editable="1"/>
-        <field name="label_x" editable="1"/>
-        <field name="label_y" editable="1"/>
-        <field name="man_made" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="never_show" editable="1"/>
-        <field name="orig_access" editable="0"/>
-        <field name="orig_always_sho" editable="0"/>
-        <field name="orig_bridge" editable="0"/>
-        <field name="orig_c_z_order" editable="0"/>
-        <field name="orig_class" editable="0"/>
-        <field name="orig_id" editable="0"/>
-        <field name="orig_label_rota" editable="0"/>
-        <field name="orig_label_x" editable="0"/>
-        <field name="orig_label_y" editable="0"/>
-        <field name="orig_name" editable="0"/>
-        <field name="orig_oneway" editable="0"/>
-        <field name="orig_ref" editable="0"/>
-        <field name="orig_service" editable="0"/>
-        <field name="orig_show" editable="0"/>
-        <field name="orig_tunnel" editable="0"/>
-        <field name="orig_type" editable="0"/>
-        <field name="orig_z_order" editable="0"/>
-        <field name="osm_id" editable="1"/>
-        <field name="other_tags" editable="1"/>
-        <field name="resident_a" editable="1"/>
-        <field name="resident_access" editable="1"/>
-        <field name="waterway" editable="1"/>
-        <field name="z_order" editable="1"/>
+        <field editable="1" name="aerialway"/>
+        <field editable="1" name="always_sho"/>
+        <field editable="0" name="auxiliary_storage_labeling_show"/>
+        <field editable="1" name="barrier"/>
+        <field editable="1" name="highway"/>
+        <field editable="1" name="label_rota"/>
+        <field editable="1" name="label_x"/>
+        <field editable="1" name="label_y"/>
+        <field editable="1" name="man_made"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="never_show"/>
+        <field editable="0" name="orig_access"/>
+        <field editable="0" name="orig_always_sho"/>
+        <field editable="0" name="orig_bridge"/>
+        <field editable="0" name="orig_c_z_order"/>
+        <field editable="0" name="orig_class"/>
+        <field editable="0" name="orig_id"/>
+        <field editable="0" name="orig_label_rota"/>
+        <field editable="0" name="orig_label_x"/>
+        <field editable="0" name="orig_label_y"/>
+        <field editable="0" name="orig_name"/>
+        <field editable="0" name="orig_oneway"/>
+        <field editable="0" name="orig_ref"/>
+        <field editable="0" name="orig_service"/>
+        <field editable="0" name="orig_show"/>
+        <field editable="0" name="orig_tunnel"/>
+        <field editable="0" name="orig_type"/>
+        <field editable="0" name="orig_z_order"/>
+        <field editable="1" name="osm_id"/>
+        <field editable="1" name="other_tags"/>
+        <field editable="1" name="resident_a"/>
+        <field editable="1" name="resident_access"/>
+        <field editable="1" name="waterway"/>
+        <field editable="1" name="z_order"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="aerialway"/>
-        <field labelOnTop="0" name="always_sho"/>
-        <field labelOnTop="0" name="auxiliary_storage_labeling_show"/>
-        <field labelOnTop="0" name="barrier"/>
-        <field labelOnTop="0" name="highway"/>
-        <field labelOnTop="0" name="label_rota"/>
-        <field labelOnTop="0" name="label_x"/>
-        <field labelOnTop="0" name="label_y"/>
-        <field labelOnTop="0" name="man_made"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="never_show"/>
-        <field labelOnTop="0" name="orig_access"/>
-        <field labelOnTop="0" name="orig_always_sho"/>
-        <field labelOnTop="0" name="orig_bridge"/>
-        <field labelOnTop="0" name="orig_c_z_order"/>
-        <field labelOnTop="0" name="orig_class"/>
-        <field labelOnTop="0" name="orig_id"/>
-        <field labelOnTop="0" name="orig_label_rota"/>
-        <field labelOnTop="0" name="orig_label_x"/>
-        <field labelOnTop="0" name="orig_label_y"/>
-        <field labelOnTop="0" name="orig_name"/>
-        <field labelOnTop="0" name="orig_oneway"/>
-        <field labelOnTop="0" name="orig_ref"/>
-        <field labelOnTop="0" name="orig_service"/>
-        <field labelOnTop="0" name="orig_show"/>
-        <field labelOnTop="0" name="orig_tunnel"/>
-        <field labelOnTop="0" name="orig_type"/>
-        <field labelOnTop="0" name="orig_z_order"/>
-        <field labelOnTop="0" name="osm_id"/>
-        <field labelOnTop="0" name="other_tags"/>
-        <field labelOnTop="0" name="resident_a"/>
-        <field labelOnTop="0" name="resident_access"/>
-        <field labelOnTop="0" name="waterway"/>
-        <field labelOnTop="0" name="z_order"/>
+        <field name="aerialway" labelOnTop="0"/>
+        <field name="always_sho" labelOnTop="0"/>
+        <field name="auxiliary_storage_labeling_show" labelOnTop="0"/>
+        <field name="barrier" labelOnTop="0"/>
+        <field name="highway" labelOnTop="0"/>
+        <field name="label_rota" labelOnTop="0"/>
+        <field name="label_x" labelOnTop="0"/>
+        <field name="label_y" labelOnTop="0"/>
+        <field name="man_made" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="never_show" labelOnTop="0"/>
+        <field name="orig_access" labelOnTop="0"/>
+        <field name="orig_always_sho" labelOnTop="0"/>
+        <field name="orig_bridge" labelOnTop="0"/>
+        <field name="orig_c_z_order" labelOnTop="0"/>
+        <field name="orig_class" labelOnTop="0"/>
+        <field name="orig_id" labelOnTop="0"/>
+        <field name="orig_label_rota" labelOnTop="0"/>
+        <field name="orig_label_x" labelOnTop="0"/>
+        <field name="orig_label_y" labelOnTop="0"/>
+        <field name="orig_name" labelOnTop="0"/>
+        <field name="orig_oneway" labelOnTop="0"/>
+        <field name="orig_ref" labelOnTop="0"/>
+        <field name="orig_service" labelOnTop="0"/>
+        <field name="orig_show" labelOnTop="0"/>
+        <field name="orig_tunnel" labelOnTop="0"/>
+        <field name="orig_type" labelOnTop="0"/>
+        <field name="orig_z_order" labelOnTop="0"/>
+        <field name="osm_id" labelOnTop="0"/>
+        <field name="other_tags" labelOnTop="0"/>
+        <field name="resident_a" labelOnTop="0"/>
+        <field name="resident_access" labelOnTop="0"/>
+        <field name="waterway" labelOnTop="0"/>
+        <field name="z_order" labelOnTop="0"/>
       </labelOnTop>
       <widgets>
         <widget name="always_show">
@@ -7409,7 +7409,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Point" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" wkbType="Point" simplifyDrawingTol="1">
+    <maplayer styleCategories="AllStyleCategories" refreshOnNotifyMessage="" simplifyAlgorithm="0" maxScale="0" geometry="Point" simplifyMaxScale="1" simplifyLocal="1" labelsEnabled="1" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" type="vector" minScale="1e+08" readOnly="0" autoRefreshTime="0" autoRefreshEnabled="0" simplifyDrawingTol="1" wkbType="Point" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.3984390148267174</xmin>
         <ymin>-33.90832575607554134</ymin>
@@ -7466,7 +7466,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
+          <spatial minz="0" minx="0" maxz="0" maxy="0" maxx="0" crs="" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -7490,18 +7490,18 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" type="RuleRenderer" forceraster="0" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" enableorderby="0" forceraster="0" symbollevels="0">
         <rules key="{0927a9cd-bbb2-44ea-811b-fdbcb767a09a}">
-          <rule symbol="0" key="{efda7615-994b-459d-a657-ee8185286b0b}" filter="regexp_match( &quot;type&quot;, '(start|finish)')"/>
-          <rule symbol="1" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}" filter="&quot;type&quot; = 'toilets'"/>
-          <rule symbol="2" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}" filter="&quot;type&quot; = 'togbag'"/>
-          <rule symbol="3" key="{67af661e-65f1-44a7-9993-d5a668077b33}" filter=" &quot;type&quot; = 'closure'"/>
-          <rule symbol="4" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}" filter="&quot;type&quot; = 'myciti'"/>
-          <rule symbol="5" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}" filter="&quot;type&quot; = 'parking'"/>
+          <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" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+          <symbol force_rhr="0" name="0" clip_to_extent="1" type="marker" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
               <prop k="angle" v="0"/>
               <prop k="color" v="0,0,0,255"/>
               <prop k="horizontal_anchor_point" v="1"/>
@@ -7535,8 +7535,8 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-            <layer pass="0" class="SvgMarker" locked="0" enabled="1">
+          <symbol force_rhr="0" name="1" clip_to_extent="1" type="marker" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="SvgMarker">
               <prop k="angle" v="0"/>
               <prop k="color" v="0,32,80,255"/>
               <prop k="fixedAspectRatio" v="0"/>
@@ -7569,8 +7569,8 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-            <layer pass="0" class="SvgMarker" locked="0" enabled="1">
+          <symbol force_rhr="0" name="2" clip_to_extent="1" type="marker" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="SvgMarker">
               <prop k="angle" v="0"/>
               <prop k="color" v="0,0,0,255"/>
               <prop k="fixedAspectRatio" v="0"/>
@@ -7613,8 +7613,8 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="3" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-            <layer pass="0" class="SvgMarker" locked="0" enabled="1">
+          <symbol force_rhr="0" name="3" clip_to_extent="1" type="marker" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="SvgMarker">
               <prop k="angle" v="0"/>
               <prop k="color" v="125,139,143,255"/>
               <prop k="fixedAspectRatio" v="0"/>
@@ -7647,8 +7647,8 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="4" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-            <layer pass="0" class="SvgMarker" locked="0" enabled="1">
+          <symbol force_rhr="0" name="4" clip_to_extent="1" type="marker" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="SvgMarker">
               <prop k="angle" v="0"/>
               <prop k="color" v="0,12,254,255"/>
               <prop k="fixedAspectRatio" v="0"/>
@@ -7666,7 +7666,7 @@ def my_form_open(dialog, layer, feature):
               <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="size_unit" v="MM"/>
               <prop k="vertical_anchor_point" v="1"/>
-              <effect type="effectStack" enabled="0">
+              <effect enabled="0" type="effectStack">
                 <effect type="dropShadow">
                   <prop k="blend_mode" v="13"/>
                   <prop k="blur_level" v="2.645"/>
@@ -7753,8 +7753,8 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="5" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-            <layer pass="0" class="SvgMarker" locked="0" enabled="1">
+          <symbol force_rhr="0" name="5" clip_to_extent="1" type="marker" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="SvgMarker">
               <prop k="angle" v="0"/>
               <prop k="color" v="43,153,41,255"/>
               <prop k="fixedAspectRatio" v="0"/>
@@ -7791,15 +7791,15 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings>
-          <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.9" fontSizeUnit="Point" fieldName="name" fontSize="10" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <text-buffer bufferOpacity="0.8" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="2"/>
-            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0" shapeOpacity="0.7" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="2" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="0" shapeRotationType="0" shapeSizeX="1" shapeRadiiX="2" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+          <text-style fontLetterSpacing="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Semibold" textColor="0,0,0,255" multilineHeight="1" fontSize="10" fontWeight="63" fieldName="name" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="0.9" useSubstitutions="0" fontUnderline="0">
+            <text-buffer bufferOpacity="0.8" bufferBlendMode="0" bufferSize="2" bufferNoFill="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiY="2" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeDraw="0" shapeOpacity="0.7" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="1" shapeRadiiX="2" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
             <substitutions/>
           </text-style>
-          <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
-          <placement centroidInside="0" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="0" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" geometryGenerator="" dist="3" yOffset="3" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="2" priority="10" placementFlags="10" offsetType="0" offsetUnits="MM"/>
-          <rendering labelPerPart="0" obstacleType="0" scaleMax="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1.8" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="10" scaleVisibility="0" scaleMin="0" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
+          <text-format multilineAlign="3" autoWrapLength="0" plussign="0" addDirectionSymbol="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+          <placement maxCurvedCharAngleOut="-25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="0" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" yOffset="3" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" geometryGeneratorType="PointGeometry" quadOffset="2" distUnits="MM" offsetUnits="MM" repeatDistanceUnits="MM" dist="3" centroidInside="0" geometryGenerator="" placementFlags="10" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="2" maxCurvedCharAngleIn="25" priority="10"/>
+          <rendering displayAll="1" upsidedownLabels="0" mergeLines="0" fontLimitPixelSize="0" maxNumLabels="2000" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="1" scaleMax="0" minFeatureSize="0" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="10" fontMaxPixelSize="10000" scaleMin="0" obstacleFactor="1.8"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -7826,21 +7826,21 @@ def my_form_open(dialog, layer, feature):
         </settings>
       </labeling>
       <customproperties>
-        <property key="dualview/previewExpressions" value="id"/>
-        <property key="embeddedWidgets/count" value="0"/>
+        <property value="id" key="dualview/previewExpressions"/>
+        <property value="0" key="embeddedWidgets/count"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory enabled="0" minScaleDenominator="0" width="15" rotationOffset="270" penColor="#000000" penAlpha="255" height="15" penWidth="0" diagramOrientation="Up" backgroundColor="#ffffff" scaleDependency="Area" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" opacity="1" lineSizeType="MM" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeType="MM" scaleBasedVisibility="0" backgroundAlpha="255" barWidth="5">
           <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0"/>
-          <attribute field="" color="#000000" label=""/>
+          <attribute color="#000000" label="" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" priority="0" dist="0" placement="0" obstacle="0" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" showAll="1" placement="0" linePlacementFlags="18" obstacle="0" dist="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -7849,7 +7849,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -7884,10 +7884,10 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="name" index="2" name=""/>
-        <alias field="distance" index="3" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
+        <alias index="2" field="name" name=""/>
+        <alias index="3" field="distance" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -7898,28 +7898,28 @@ def my_form_open(dialog, layer, feature):
         <default field="distance" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="type" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="name" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="distance" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint exp_strength="0" field="id" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="name" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="distance" constraints="0" notnull_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="distance" exp="" desc=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="type" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="distance" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;type&quot;">
+      <attributetableconfig sortExpression="&quot;type&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="-1" name="type" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="name" hidden="0" type="field"/>
-          <column width="-1" name="distance" hidden="0" type="field"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="0" name="type" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="name" type="field" width="-1"/>
+          <column hidden="0" name="distance" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7950,22 +7950,22 @@ 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 labelOnTop="0" name="distance"/>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="distance" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <widgets/>
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" simplifyLocal="1" readOnly="0" geometry="Polygon" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" wkbType="MultiPolygon" simplifyDrawingTol="1">
+    <maplayer styleCategories="AllStyleCategories" refreshOnNotifyMessage="" simplifyAlgorithm="0" maxScale="0" geometry="Polygon" simplifyMaxScale="1" simplifyLocal="1" labelsEnabled="0" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" type="vector" minScale="1e+08" readOnly="0" autoRefreshTime="0" autoRefreshEnabled="0" simplifyDrawingTol="1" wkbType="MultiPolygon" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37312291788339991</xmin>
         <ymin>-33.931815589166888</ymin>
@@ -8029,10 +8029,10 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" type="singleSymbol" forceraster="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" enableorderby="0" forceraster="0" symbollevels="0">
         <symbols>
-          <symbol name="0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-            <layer pass="0" class="LinePatternFill" locked="0" enabled="1">
+          <symbol force_rhr="0" name="0" clip_to_extent="1" type="fill" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="LinePatternFill">
               <prop k="angle" v="135"/>
               <prop k="color" v="211,134,33,255"/>
               <prop k="distance" v="2"/>
@@ -8053,8 +8053,8 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@0@0" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-                <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <symbol force_rhr="0" name="@0@0" clip_to_extent="1" type="line" alpha="1">
+                <layer pass="0" locked="0" enabled="1" class="SimpleLine">
                   <prop k="capstyle" v="square"/>
                   <prop k="customdash" v="5;2"/>
                   <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -8081,7 +8081,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleFill">
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="211,134,33,255"/>
               <prop k="joinstyle" v="bevel"/>
@@ -8107,21 +8107,21 @@ def my_form_open(dialog, layer, feature):
         <sizescale/>
       </renderer-v2>
       <customproperties>
-        <property key="dualview/previewExpressions" value="id"/>
-        <property key="embeddedWidgets/count" value="0"/>
+        <property value="id" key="dualview/previewExpressions"/>
+        <property value="0" key="embeddedWidgets/count"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory enabled="0" minScaleDenominator="0" width="15" rotationOffset="270" penColor="#000000" penAlpha="255" height="15" penWidth="0" diagramOrientation="Up" backgroundColor="#ffffff" scaleDependency="Area" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" opacity="1" lineSizeType="MM" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeType="MM" scaleBasedVisibility="0" backgroundAlpha="255" barWidth="5">
           <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0"/>
-          <attribute field="" color="#000000" label=""/>
+          <attribute color="#000000" label="" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" priority="0" dist="0" placement="1" obstacle="0" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" showAll="1" placement="1" linePlacementFlags="18" obstacle="0" dist="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -8130,7 +8130,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -8144,7 +8144,7 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="FID" index="0" name=""/>
+        <alias index="0" field="FID" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -8152,20 +8152,20 @@ def my_form_open(dialog, layer, feature):
         <default field="FID" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="FID" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint exp_strength="0" field="FID" constraints="0" notnull_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="FID" exp="" desc=""/>
+        <constraint exp="" field="FID" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="431" name="type" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="0" name="type" type="field" width="431"/>
+          <column hidden="1" type="actions" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8196,18 +8196,18 @@ 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 labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <widgets/>
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Line" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" wkbType="MultiLineString" simplifyDrawingTol="1">
+    <maplayer styleCategories="AllStyleCategories" refreshOnNotifyMessage="" simplifyAlgorithm="0" maxScale="0" geometry="Line" simplifyMaxScale="1" simplifyLocal="1" labelsEnabled="1" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" type="vector" minScale="1e+08" readOnly="0" autoRefreshTime="0" autoRefreshEnabled="0" simplifyDrawingTol="1" wkbType="MultiLineString" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.3752895999999879</xmin>
         <ymin>-33.94589500000000726</ymin>
@@ -8264,7 +8264,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
+          <spatial minz="0" minx="0" maxz="0" maxy="0" maxx="0" crs="" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -8288,17 +8288,17 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" type="RuleRenderer" forceraster="0" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" enableorderby="0" forceraster="0" symbollevels="0">
         <rules key="{57366f52-c504-4c9a-800f-dcbf1d415bf6}">
-          <rule symbol="0" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" label="Road Open" filter="&quot;status&quot; = 'open'"/>
-          <rule symbol="1" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" label="No Parking" filter="&quot;status&quot; = 'no-parking'"/>
-          <rule symbol="2" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" label="Lane Closed" filter="&quot;status&quot; = 'lane-closed'"/>
-          <rule symbol="3" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" label="One-Way" filter="&quot;status&quot; = 'one-way'"/>
-          <rule symbol="4" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" label="Road Closures" filter="&quot;status&quot; = 'closure'"/>
+          <rule symbol="0" filter="&quot;status&quot; = 'open'" label="Road Open" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}"/>
+          <rule symbol="1" filter="&quot;status&quot; = 'no-parking'" label="No Parking" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}"/>
+          <rule symbol="2" filter="&quot;status&quot; = 'lane-closed'" label="Lane Closed" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}"/>
+          <rule symbol="3" filter="&quot;status&quot; = 'one-way'" label="One-Way" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}"/>
+          <rule symbol="4" filter="&quot;status&quot; = 'closure'" label="Road Closures" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}"/>
         </rules>
         <symbols>
-          <symbol name="0" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+          <symbol force_rhr="0" name="0" clip_to_extent="1" type="line" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleLine">
               <prop k="capstyle" v="square"/>
               <prop k="customdash" v="5;2"/>
               <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -8335,8 +8335,8 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+          <symbol force_rhr="0" name="1" clip_to_extent="1" type="line" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="MarkerLine">
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="average_angle_unit" v="MM"/>
@@ -8359,8 +8359,8 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@1@0" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <symbol force_rhr="0" name="@1@0" clip_to_extent="1" type="marker" alpha="1">
+                <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
                   <prop k="angle" v="0"/>
                   <prop k="color" v="255,255,255,255"/>
                   <prop k="horizontal_anchor_point" v="1"/>
@@ -8390,8 +8390,8 @@ def my_form_open(dialog, layer, feature):
               </symbol>
             </layer>
           </symbol>
-          <symbol name="2" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+          <symbol force_rhr="0" name="2" clip_to_extent="1" type="line" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleLine">
               <prop k="capstyle" v="square"/>
               <prop k="customdash" v="2;1;1;1"/>
               <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -8427,7 +8427,7 @@ def my_form_open(dialog, layer, feature):
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer pass="0" locked="0" enabled="1" class="MarkerLine">
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="average_angle_unit" v="MM"/>
@@ -8456,8 +8456,8 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@2@1" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <symbol force_rhr="0" name="@2@1" clip_to_extent="1" type="marker" alpha="1">
+                <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
                   <prop k="angle" v="0"/>
                   <prop k="color" v="0,255,0,255"/>
                   <prop k="horizontal_anchor_point" v="1"/>
@@ -8493,8 +8493,8 @@ def my_form_open(dialog, layer, feature):
               </symbol>
             </layer>
           </symbol>
-          <symbol name="3" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+          <symbol force_rhr="0" name="3" clip_to_extent="1" type="line" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleLine">
               <prop k="capstyle" v="square"/>
               <prop k="customdash" v="3;2"/>
               <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -8530,7 +8530,7 @@ def my_form_open(dialog, layer, feature):
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer pass="0" locked="0" enabled="1" class="MarkerLine">
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="average_angle_unit" v="MM"/>
@@ -8559,8 +8559,8 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol name="@3@1" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <symbol force_rhr="0" name="@3@1" clip_to_extent="1" type="marker" alpha="1">
+                <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
                   <prop k="angle" v="0"/>
                   <prop k="color" v="0,255,0,255"/>
                   <prop k="horizontal_anchor_point" v="1"/>
@@ -8596,8 +8596,8 @@ def my_form_open(dialog, layer, feature):
               </symbol>
             </layer>
           </symbol>
-          <symbol name="4" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+          <symbol force_rhr="0" name="4" clip_to_extent="1" type="line" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleLine">
               <prop k="capstyle" v="square"/>
               <prop k="customdash" v="5;2"/>
               <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -8638,15 +8638,15 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings>
-          <text-style previewBkgrdColor="#ffffff" namedStyle="Regular" fontWeight="50" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="1" fontSizeUnit="Point" fieldName="times" fontSize="9" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <text-buffer bufferOpacity="1" bufferNoFill="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1"/>
-            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="0" shapeRotationType="0" shapeSizeX="0" shapeRadiiX="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+          <text-style fontLetterSpacing="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Regular" textColor="0,0,0,255" multilineHeight="1" fontSize="9" fontWeight="50" fieldName="times" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="1" useSubstitutions="0" fontUnderline="0">
+            <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiY="0" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeDraw="0" shapeOpacity="1" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="0" shapeRadiiX="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
             <substitutions/>
           </text-style>
-          <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="4294967295" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
-          <placement centroidInside="0" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="2" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" geometryGenerator="" dist="0" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="5" placementFlags="10" offsetType="0" offsetUnits="MM"/>
-          <rendering labelPerPart="0" obstacleType="0" scaleMax="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="0" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="0"/>
+          <text-format multilineAlign="4294967295" autoWrapLength="0" plussign="0" addDirectionSymbol="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+          <placement maxCurvedCharAngleOut="-25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="2" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" geometryGeneratorType="PointGeometry" quadOffset="4" distUnits="MM" offsetUnits="MM" repeatDistanceUnits="MM" dist="0" centroidInside="0" geometryGenerator="" placementFlags="10" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" maxCurvedCharAngleIn="25" priority="5"/>
+          <rendering displayAll="0" upsidedownLabels="0" mergeLines="0" fontLimitPixelSize="0" maxNumLabels="2000" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="1" scaleMax="0" minFeatureSize="0" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="0" fontMaxPixelSize="10000" scaleMin="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -8657,21 +8657,21 @@ def my_form_open(dialog, layer, feature):
         </settings>
       </labeling>
       <customproperties>
-        <property key="dualview/previewExpressions" value="id"/>
-        <property key="embeddedWidgets/count" value="0"/>
+        <property value="id" key="dualview/previewExpressions"/>
+        <property value="0" key="embeddedWidgets/count"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory enabled="0" minScaleDenominator="0" width="15" rotationOffset="270" penColor="#000000" penAlpha="255" height="15" penWidth="0" diagramOrientation="Up" backgroundColor="#ffffff" scaleDependency="Area" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" opacity="1" lineSizeType="MM" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeType="MM" scaleBasedVisibility="0" backgroundAlpha="255" barWidth="5">
           <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0"/>
-          <attribute field="" color="#000000" label=""/>
+          <attribute color="#000000" label="" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" priority="0" dist="0" placement="2" obstacle="0" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" showAll="1" placement="2" linePlacementFlags="18" obstacle="0" dist="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -8680,7 +8680,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -8715,10 +8715,10 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="status" index="2" name=""/>
-        <alias field="times" index="3" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
+        <alias index="2" field="status" name=""/>
+        <alias index="3" field="times" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -8729,28 +8729,28 @@ def my_form_open(dialog, layer, feature):
         <default field="times" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="type" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="status" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="times" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint exp_strength="0" field="id" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="status" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="times" constraints="0" notnull_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="status" exp="" desc=""/>
-        <constraint field="times" exp="" desc=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="type" desc=""/>
+        <constraint exp="" field="status" desc=""/>
+        <constraint exp="" field="times" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;id&quot;">
+      <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="202" name="type" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="status" hidden="0" type="field"/>
-          <column width="-1" name="times" hidden="0" type="field"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="0" name="type" type="field" width="202"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="status" type="field" width="-1"/>
+          <column hidden="0" name="times" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8781,22 +8781,22 @@ 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 labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="status"/>
-        <field labelOnTop="0" name="times"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="status" labelOnTop="0"/>
+        <field name="times" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <widgets/>
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="100000" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Point" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" wkbType="Point" simplifyDrawingTol="1">
+    <maplayer styleCategories="AllStyleCategories" refreshOnNotifyMessage="" simplifyAlgorithm="0" maxScale="100000" geometry="Point" simplifyMaxScale="1" simplifyLocal="1" labelsEnabled="1" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" type="vector" minScale="1e+08" readOnly="0" autoRefreshTime="0" autoRefreshEnabled="0" simplifyDrawingTol="1" wkbType="Point" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37564632736778236</xmin>
         <ymin>-33.94557692503335744</ymin>
@@ -8828,6 +8828,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -8843,7 +8852,15 @@ def my_form_open(dialog, layer, feature):
             <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial minz="0" minx="0" maxz="0" maxy="0" maxx="0" crs="" dimensions="2" miny="0"/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="UTF-8">memory</provider>
       <vectorjoins/>
@@ -8853,6 +8870,433 @@ def my_form_open(dialog, layer, feature):
       <expressionfields/>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
+        <map-layer-style name="timelapse">
+          <qgis hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" simplifyDrawingTol="1" simplifyDrawingHints="0" simplifyLocal="1" styleCategories="AllStyleCategories" maxScale="100000" minScale="1e+08" readOnly="0" version="3.8.3-Zanzibar" labelsEnabled="1" simplifyMaxScale="1">
+            <flags>
+              <Identifiable>1</Identifiable>
+              <Removable>1</Removable>
+              <Searchable>1</Searchable>
+            </flags>
+            <renderer-v2 type="nullSymbol"/>
+            <labeling type="rule-based">
+              <rules key="{2cf820d0-73b9-4746-94f0-ade0b2da8c4e}">
+                <rule filter="&quot;Source&quot; = '21KM'" key="{84988b39-de25-471d-aa1f-8d688cc3c1cd}" description="21KM">
+                  <settings>
+                    <text-style fontLetterSpacing="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Semibold" textColor="255,255,255,255" multilineHeight="1" fontSize="7" fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="1" useSubstitutions="0" fontUnderline="0">
+                      <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                      <background shapeFillColor="210,32,39,255" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="210,32,39,255" shapeSizeUnit="MM" shapeRadiiY="0.1" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="128" shapeBorderWidthUnit="MM" shapeDraw="1" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeSizeX="0.5" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="0" shapeRadiiX="1" shapeBorderWidth="1" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                      <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+                      <substitutions/>
+                    </text-style>
+                    <text-format multilineAlign="3" autoWrapLength="0" plussign="0" addDirectionSymbol="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+                    <placement maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="6" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorType="PointGeometry" repeatDistance="0" quadOffset="3" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="2" centroidInside="0" geometryGenerator="" placementFlags="10" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" maxCurvedCharAngleIn="20" priority="10"/>
+                    <rendering displayAll="1" upsidedownLabels="0" mergeLines="0" fontLimitPixelSize="0" maxNumLabels="2000" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="1" scaleMax="10000000" minFeatureSize="0" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="0" fontMaxPixelSize="10000" scaleMin="1" obstacleFactor="2"/>
+                    <dd_properties>
+                      <Option type="Map">
+                        <Option value="" name="name" type="QString"/>
+                        <Option name="properties" type="Map">
+                          <Option name="PositionX" type="Map">
+                            <Option value="false" name="active" type="bool"/>
+                            <Option value="1" name="type" type="int"/>
+                            <Option value="" name="val" type="QString"/>
+                          </Option>
+                          <Option name="PositionY" type="Map">
+                            <Option value="false" name="active" type="bool"/>
+                            <Option value="1" name="type" type="int"/>
+                            <Option value="" name="val" type="QString"/>
+                          </Option>
+                          <Option name="PredefinedPositionOrder" type="Map">
+                            <Option value="false" name="active" type="bool"/>
+                            <Option value="1" name="type" type="int"/>
+                            <Option value="" name="val" type="QString"/>
+                          </Option>
+                          <Option name="Rotation" type="Map">
+                            <Option value="false" name="active" type="bool"/>
+                            <Option value="rotation" name="field" type="QString"/>
+                            <Option value="2" name="type" type="int"/>
+                          </Option>
+                        </Option>
+                        <Option value="collection" name="type" type="QString"/>
+                      </Option>
+                    </dd_properties>
+                  </settings>
+                </rule>
+                <rule filter="&quot;Source&quot; = '10KM'" key="{2699b0bb-7177-40de-af85-7bce9fd38af9}" description="10KM">
+                  <settings>
+                    <text-style fontLetterSpacing="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Semibold" textColor="255,255,255,255" multilineHeight="1" fontSize="7" fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="1" useSubstitutions="0" fontUnderline="0">
+                      <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                      <background shapeFillColor="103,34,144,255" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="103,34,144,255" shapeSizeUnit="MM" shapeRadiiY="0.1" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="128" shapeBorderWidthUnit="MM" shapeDraw="1" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeSizeX="0.5" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="0" shapeRadiiX="1" shapeBorderWidth="1" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                      <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+                      <substitutions/>
+                    </text-style>
+                    <text-format multilineAlign="3" autoWrapLength="0" plussign="0" addDirectionSymbol="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+                    <placement maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="6" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorType="PointGeometry" repeatDistance="0" quadOffset="4" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="2" centroidInside="0" geometryGenerator="" placementFlags="10" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" maxCurvedCharAngleIn="20" priority="10"/>
+                    <rendering displayAll="1" upsidedownLabels="0" mergeLines="0" fontLimitPixelSize="0" maxNumLabels="2000" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="1" scaleMax="10000000" minFeatureSize="0" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="0" fontMaxPixelSize="10000" scaleMin="1" obstacleFactor="2"/>
+                    <dd_properties>
+                      <Option type="Map">
+                        <Option value="" name="name" type="QString"/>
+                        <Option name="properties" type="Map">
+                          <Option name="PositionX" type="Map">
+                            <Option value="false" name="active" type="bool"/>
+                            <Option value="1" name="type" type="int"/>
+                            <Option value="" name="val" type="QString"/>
+                          </Option>
+                          <Option name="PositionY" type="Map">
+                            <Option value="false" name="active" type="bool"/>
+                            <Option value="1" name="type" type="int"/>
+                            <Option value="" name="val" type="QString"/>
+                          </Option>
+                          <Option name="PredefinedPositionOrder" type="Map">
+                            <Option value="true" name="active" type="bool"/>
+                            <Option value="quadrant" name="field" type="QString"/>
+                            <Option value="2" name="type" type="int"/>
+                          </Option>
+                          <Option name="Rotation" type="Map">
+                            <Option value="false" name="active" type="bool"/>
+                            <Option value="rotation" name="field" type="QString"/>
+                            <Option value="2" name="type" type="int"/>
+                          </Option>
+                        </Option>
+                        <Option value="collection" name="type" type="QString"/>
+                      </Option>
+                    </dd_properties>
+                  </settings>
+                </rule>
+                <rule filter="&quot;Source&quot; = '5KM'" key="{63d03041-a1e4-4dad-ab41-9339e48044c5}" description="5KM">
+                  <settings>
+                    <text-style fontLetterSpacing="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Semibold" textColor="255,255,255,255" multilineHeight="1" fontSize="7" fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="1" useSubstitutions="0" fontUnderline="0">
+                      <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                      <background shapeFillColor="145,211,55,255" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeSizeUnit="MM" shapeRadiiY="0.1" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="128" shapeBorderWidthUnit="MM" shapeDraw="1" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeSizeX="0.5" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="0" shapeRadiiX="1" shapeBorderWidth="1" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                      <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+                      <substitutions/>
+                    </text-style>
+                    <text-format multilineAlign="3" autoWrapLength="0" plussign="0" addDirectionSymbol="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+                    <placement maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="6" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorType="PointGeometry" repeatDistance="0" quadOffset="4" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="2" centroidInside="0" geometryGenerator="" placementFlags="10" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" maxCurvedCharAngleIn="20" priority="10"/>
+                    <rendering displayAll="1" upsidedownLabels="0" mergeLines="0" fontLimitPixelSize="0" maxNumLabels="2000" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="1" scaleMax="10000000" minFeatureSize="0" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="0" fontMaxPixelSize="10000" scaleMin="1" obstacleFactor="2"/>
+                    <dd_properties>
+                      <Option type="Map">
+                        <Option value="" name="name" type="QString"/>
+                        <Option name="properties" type="Map">
+                          <Option name="PositionX" type="Map">
+                            <Option value="false" name="active" type="bool"/>
+                            <Option value="1" name="type" type="int"/>
+                            <Option value="" name="val" type="QString"/>
+                          </Option>
+                          <Option name="PositionY" type="Map">
+                            <Option value="false" name="active" type="bool"/>
+                            <Option value="1" name="type" type="int"/>
+                            <Option value="" name="val" type="QString"/>
+                          </Option>
+                          <Option name="PredefinedPositionOrder" type="Map">
+                            <Option value="true" name="active" type="bool"/>
+                            <Option value="quadrant" name="field" type="QString"/>
+                            <Option value="2" name="type" type="int"/>
+                          </Option>
+                          <Option name="Rotation" type="Map">
+                            <Option value="false" name="active" type="bool"/>
+                            <Option value="rotation" name="field" type="QString"/>
+                            <Option value="2" name="type" type="int"/>
+                          </Option>
+                        </Option>
+                        <Option value="collection" name="type" type="QString"/>
+                      </Option>
+                    </dd_properties>
+                  </settings>
+                </rule>
+              </rules>
+            </labeling>
+            <customproperties>
+              <property value="COALESCE(&quot;Text&quot;, '&lt;NULL>')" key="dualview/previewExpressions"/>
+              <property value="0" key="embeddedWidgets/count"/>
+              <property key="variableNames"/>
+              <property key="variableValues"/>
+            </customproperties>
+            <blendMode>0</blendMode>
+            <featureBlendMode>0</featureBlendMode>
+            <layerOpacity>1</layerOpacity>
+            <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+              <DiagramCategory enabled="0" minScaleDenominator="100000" width="15" rotationOffset="270" penColor="#000000" penAlpha="255" height="15" penWidth="0" diagramOrientation="Up" backgroundColor="#ffffff" scaleDependency="Area" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" opacity="1" lineSizeType="MM" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeType="MM" scaleBasedVisibility="0" backgroundAlpha="255" barWidth="5">
+                <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+                <attribute color="#000000" label="" field=""/>
+              </DiagramCategory>
+            </SingleCategoryDiagramRenderer>
+            <DiagramLayerSettings priority="0" zIndex="0" showAll="1" placement="0" linePlacementFlags="2" obstacle="0" dist="0">
+              <properties>
+                <Option type="Map">
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties"/>
+                  <Option value="collection" name="type" type="QString"/>
+                </Option>
+              </properties>
+            </DiagramLayerSettings>
+            <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+              <activeChecks/>
+              <checkConfiguration/>
+            </geometryOptions>
+            <fieldConfiguration>
+              <field name="Name">
+                <editWidget type="TextEdit">
+                  <config>
+                    <Option type="Map">
+                      <Option value="0" name="IsMultiline" type="QString"/>
+                      <Option value="0" name="UseHtml" type="QString"/>
+                    </Option>
+                  </config>
+                </editWidget>
+              </field>
+              <field name="descriptio">
+                <editWidget type="TextEdit">
+                  <config>
+                    <Option type="Map">
+                      <Option value="0" name="IsMultiline" type="QString"/>
+                      <Option value="0" name="UseHtml" type="QString"/>
+                    </Option>
+                  </config>
+                </editWidget>
+              </field>
+              <field name="timestamp">
+                <editWidget type="TextEdit">
+                  <config>
+                    <Option type="Map">
+                      <Option value="0" name="IsMultiline" type="QString"/>
+                      <Option value="0" name="UseHtml" type="QString"/>
+                    </Option>
+                  </config>
+                </editWidget>
+              </field>
+              <field name="begin">
+                <editWidget type="TextEdit">
+                  <config>
+                    <Option type="Map">
+                      <Option value="0" name="IsMultiline" type="QString"/>
+                      <Option value="0" name="UseHtml" type="QString"/>
+                    </Option>
+                  </config>
+                </editWidget>
+              </field>
+              <field name="end">
+                <editWidget type="TextEdit">
+                  <config>
+                    <Option type="Map">
+                      <Option value="0" name="IsMultiline" type="QString"/>
+                      <Option value="0" name="UseHtml" type="QString"/>
+                    </Option>
+                  </config>
+                </editWidget>
+              </field>
+              <field name="Distance">
+                <editWidget type="TextEdit">
+                  <config>
+                    <Option type="Map">
+                      <Option value="0" name="IsMultiline" type="QString"/>
+                      <Option value="0" name="UseHtml" type="QString"/>
+                    </Option>
+                  </config>
+                </editWidget>
+              </field>
+              <field name="RouteLen">
+                <editWidget type="TextEdit">
+                  <config>
+                    <Option type="Map">
+                      <Option value="0" name="IsMultiline" type="QString"/>
+                      <Option value="0" name="UseHtml" type="QString"/>
+                    </Option>
+                  </config>
+                </editWidget>
+              </field>
+              <field name="Source">
+                <editWidget type="TextEdit">
+                  <config>
+                    <Option type="Map">
+                      <Option value="0" name="IsMultiline" type="QString"/>
+                      <Option value="0" name="UseHtml" type="QString"/>
+                    </Option>
+                  </config>
+                </editWidget>
+              </field>
+              <field name="length_m">
+                <editWidget type="TextEdit">
+                  <config>
+                    <Option type="Map">
+                      <Option value="0" name="IsMultiline" type="QString"/>
+                      <Option value="0" name="UseHtml" type="QString"/>
+                    </Option>
+                  </config>
+                </editWidget>
+              </field>
+              <field name="length_km">
+                <editWidget type="TextEdit">
+                  <config>
+                    <Option type="Map">
+                      <Option value="0" name="IsMultiline" type="QString"/>
+                      <Option value="0" name="UseHtml" type="QString"/>
+                    </Option>
+                  </config>
+                </editWidget>
+              </field>
+              <field name="org_fid">
+                <editWidget type="TextEdit">
+                  <config>
+                    <Option type="Map">
+                      <Option value="0" name="IsMultiline" type="QString"/>
+                      <Option value="0" name="UseHtml" type="QString"/>
+                    </Option>
+                  </config>
+                </editWidget>
+              </field>
+              <field name="distance">
+                <editWidget type="TextEdit">
+                  <config>
+                    <Option type="Map">
+                      <Option value="0" name="IsMultiline" type="QString"/>
+                      <Option value="0" name="UseHtml" type="QString"/>
+                    </Option>
+                  </config>
+                </editWidget>
+              </field>
+            </fieldConfiguration>
+            <aliases>
+              <alias index="0" field="Name" name=""/>
+              <alias index="1" field="descriptio" name=""/>
+              <alias index="2" field="timestamp" name=""/>
+              <alias index="3" field="begin" name=""/>
+              <alias index="4" field="end" name=""/>
+              <alias index="5" field="Distance" name=""/>
+              <alias index="6" field="RouteLen" name=""/>
+              <alias index="7" field="Source" name=""/>
+              <alias index="8" field="length_m" name=""/>
+              <alias index="9" field="length_km" name=""/>
+              <alias index="10" field="org_fid" name=""/>
+              <alias index="11" field="distance" name=""/>
+            </aliases>
+            <excludeAttributesWMS/>
+            <excludeAttributesWFS/>
+            <defaults>
+              <default field="Name" applyOnUpdate="0" expression=""/>
+              <default field="descriptio" applyOnUpdate="0" expression=""/>
+              <default field="timestamp" applyOnUpdate="0" expression=""/>
+              <default field="begin" applyOnUpdate="0" expression=""/>
+              <default field="end" applyOnUpdate="0" expression=""/>
+              <default field="Distance" applyOnUpdate="0" expression=""/>
+              <default field="RouteLen" applyOnUpdate="0" expression=""/>
+              <default field="Source" applyOnUpdate="0" expression=""/>
+              <default field="length_m" applyOnUpdate="0" expression=""/>
+              <default field="length_km" applyOnUpdate="0" expression=""/>
+              <default field="org_fid" applyOnUpdate="0" expression=""/>
+              <default field="distance" applyOnUpdate="0" expression=""/>
+            </defaults>
+            <constraints>
+              <constraint exp_strength="0" field="Name" constraints="0" notnull_strength="0" unique_strength="0"/>
+              <constraint exp_strength="0" field="descriptio" constraints="0" notnull_strength="0" unique_strength="0"/>
+              <constraint exp_strength="0" field="timestamp" constraints="0" notnull_strength="0" unique_strength="0"/>
+              <constraint exp_strength="0" field="begin" constraints="0" notnull_strength="0" unique_strength="0"/>
+              <constraint exp_strength="0" field="end" constraints="0" notnull_strength="0" unique_strength="0"/>
+              <constraint exp_strength="0" field="Distance" constraints="0" notnull_strength="0" unique_strength="0"/>
+              <constraint exp_strength="0" field="RouteLen" constraints="0" notnull_strength="0" unique_strength="0"/>
+              <constraint exp_strength="0" field="Source" constraints="0" notnull_strength="0" unique_strength="0"/>
+              <constraint exp_strength="0" field="length_m" constraints="0" notnull_strength="0" unique_strength="0"/>
+              <constraint exp_strength="0" field="length_km" constraints="0" notnull_strength="0" unique_strength="0"/>
+              <constraint exp_strength="0" field="org_fid" constraints="0" notnull_strength="0" unique_strength="0"/>
+              <constraint exp_strength="0" field="distance" constraints="0" notnull_strength="0" unique_strength="0"/>
+            </constraints>
+            <constraintExpressions>
+              <constraint exp="" field="Name" desc=""/>
+              <constraint exp="" field="descriptio" desc=""/>
+              <constraint exp="" field="timestamp" desc=""/>
+              <constraint exp="" field="begin" desc=""/>
+              <constraint exp="" field="end" desc=""/>
+              <constraint exp="" field="Distance" desc=""/>
+              <constraint exp="" field="RouteLen" desc=""/>
+              <constraint exp="" field="Source" desc=""/>
+              <constraint exp="" field="length_m" desc=""/>
+              <constraint exp="" field="length_km" desc=""/>
+              <constraint exp="" field="org_fid" desc=""/>
+              <constraint exp="" field="distance" desc=""/>
+            </constraintExpressions>
+            <expressionfields/>
+            <attributeactions>
+              <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+            </attributeactions>
+            <attributetableconfig sortExpression="&quot;distance&quot;" sortOrder="1" actionWidgetStyle="dropDown">
+              <columns>
+                <column hidden="1" type="actions" width="-1"/>
+                <column hidden="0" name="org_fid" type="field" width="-1"/>
+                <column hidden="0" name="distance" type="field" width="-1"/>
+                <column hidden="0" name="Name" type="field" width="-1"/>
+                <column hidden="0" name="Source" type="field" width="-1"/>
+                <column hidden="0" name="RouteLen" type="field" width="-1"/>
+                <column hidden="0" name="descriptio" type="field" width="-1"/>
+                <column hidden="0" name="timestamp" type="field" width="-1"/>
+                <column hidden="0" name="begin" type="field" width="-1"/>
+                <column hidden="0" name="end" type="field" width="-1"/>
+                <column hidden="0" name="Distance" type="field" width="-1"/>
+                <column hidden="0" name="length_km" type="field" width="-1"/>
+                <column hidden="0" name="length_m" type="field" width="-1"/>
+              </columns>
+            </attributetableconfig>
+            <conditionalstyles>
+              <rowstyles/>
+              <fieldstyles/>
+            </conditionalstyles>
+            <editform tolerant="1"/>
+            <editforminit/>
+            <editforminitcodesource>0</editforminitcodesource>
+            <editforminitfilepath>/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map</editforminitfilepath>
+            <editforminitcode><![CDATA[# -*- coding: utf-8 -*-
+"""
+QGIS forms can have a Python function that is called when the form is
+opened.
+
+Use this function to add extra logic to your forms.
+
+Enter the name of the function in the "Python Init function"
+field.
+An example follows:
+"""
+from qgis.PyQt.QtWidgets import QWidget
+
+def my_form_open(dialog, layer, feature):
+	geom = feature.geometry()
+	control = dialog.findChild(QWidget, "MyLineEdit")
+]]></editforminitcode>
+            <featformsuppress>0</featformsuppress>
+            <editorlayout>generatedlayout</editorlayout>
+            <editable>
+              <field editable="1" name="Distance"/>
+              <field editable="1" name="Name"/>
+              <field editable="1" name="RouteLen"/>
+              <field editable="1" name="Source"/>
+              <field editable="1" name="begin"/>
+              <field editable="1" name="descriptio"/>
+              <field editable="1" name="distance"/>
+              <field editable="1" name="end"/>
+              <field editable="1" name="length_km"/>
+              <field editable="1" name="length_m"/>
+              <field editable="1" name="org_fid"/>
+              <field editable="1" name="quadrant"/>
+              <field editable="1" name="timestamp"/>
+            </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="quadrant" labelOnTop="0"/>
+              <field name="timestamp" labelOnTop="0"/>
+            </labelOnTop>
+            <widgets/>
+            <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
+            <mapTip>Text</mapTip>
+            <layerGeometryType>0</layerGeometryType>
+          </qgis>
+        </map-layer-style>
       </map-layer-style-manager>
       <auxiliaryLayer/>
       <flags>
@@ -8862,18 +9306,18 @@ def my_form_open(dialog, layer, feature):
       </flags>
       <renderer-v2 type="nullSymbol"/>
       <labeling type="rule-based">
-        <rules key="{ef0a4f1c-3683-401e-af50-096e9c122ec2}">
-          <rule key="{89ce512c-f4b6-4593-abdd-e1496b39d38d}" description="Active routes" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
+        <rules key="{3608a1f2-7607-4dc9-9391-a582d9904577}">
+          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{6c8d4bc9-8e1a-4cc3-a813-97e2b0ad71f6}" description="Active routes">
             <settings>
-              <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="1" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="1" fontSizeUnit="Point" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSize="10" blendMode="0" textColor="255,255,255,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
-                <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
-                <background shapeFillColor="0,0,0,255" shapeJoinStyle="128" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="1" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="1" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="1" shapeRadiiX="1" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+              <text-style fontLetterSpacing="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Semibold" textColor="255,255,255,255" multilineHeight="1" fontSize="10" fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="1" useSubstitutions="0" fontUnderline="0">
+                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeType="0" shapeFillColor="0,0,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiY="1" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="128" shapeBorderWidthUnit="MM" shapeDraw="1" shapeOpacity="1" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="0" shapeRadiiX="1" shapeBorderWidth="1" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" placeDirectionSymbol="0" wrapChar="" decimals="0"/>
-              <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="6" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="3" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="2" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="10" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
-              <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="2" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
+              <text-format multilineAlign="3" autoWrapLength="0" plussign="0" addDirectionSymbol="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+              <placement maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="6" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" geometryGeneratorType="PointGeometry" quadOffset="3" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="2" centroidInside="0" geometryGenerator="" placementFlags="10" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" maxCurvedCharAngleIn="20" priority="10"/>
+              <rendering displayAll="1" upsidedownLabels="0" mergeLines="0" fontLimitPixelSize="0" maxNumLabels="2000" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="1" scaleMax="10000000" minFeatureSize="0" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="0" fontMaxPixelSize="10000" scaleMin="1" obstacleFactor="2"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -8914,18 +9358,18 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </settings>
           </rule>
-          <rule key="{c8fa4d70-045a-495e-8ee0-9e8348c14c1f}" description="List for legends" active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
-            <rule key="{5cc2708e-64e0-43b4-ba64-8c4ce9774fe9}" description="21KM" active="0" filter="&quot;Source&quot; = '21KM'">
+          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{762f5e6f-d30c-4752-b4fa-0f22ed862707}" active="0" description="List for legends">
+            <rule filter="&quot;Source&quot; = '21KM'" key="{cf2c18af-091f-4ce5-8f44-46bd4999f2ba}" active="0" description="21KM">
               <settings>
-                <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="1" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="1" fontSizeUnit="Point" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSize="10" blendMode="0" textColor="255,255,255,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
-                  <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
-                  <background shapeFillColor="210,32,39,255" shapeJoinStyle="128" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="1" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="210,32,39,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="1" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="1" shapeRadiiX="1" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+                <text-style fontLetterSpacing="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Semibold" textColor="255,255,255,255" multilineHeight="1" fontSize="10" fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="1" useSubstitutions="0" fontUnderline="0">
+                  <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <background shapeType="0" shapeFillColor="210,32,39,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="210,32,39,255" shapeSizeUnit="MM" shapeRadiiY="1" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="128" shapeBorderWidthUnit="MM" shapeDraw="1" shapeOpacity="1" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="0" shapeRadiiX="1" shapeBorderWidth="1" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
                   <substitutions/>
                 </text-style>
-                <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" placeDirectionSymbol="0" wrapChar="" decimals="0"/>
-                <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="6" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="3" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="2" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="10" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
-                <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="2" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
+                <text-format multilineAlign="3" autoWrapLength="0" plussign="0" addDirectionSymbol="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+                <placement maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="6" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" geometryGeneratorType="PointGeometry" quadOffset="3" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="2" centroidInside="0" geometryGenerator="" placementFlags="10" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" maxCurvedCharAngleIn="20" priority="10"/>
+                <rendering displayAll="1" upsidedownLabels="0" mergeLines="0" fontLimitPixelSize="0" maxNumLabels="2000" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="1" scaleMax="10000000" minFeatureSize="0" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="0" fontMaxPixelSize="10000" scaleMin="1" obstacleFactor="2"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -8956,17 +9400,17 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
               </settings>
             </rule>
-            <rule key="{159ba16a-95ba-44ad-b846-c28bc7694004}" description="10KM" active="0" filter="&quot;Source&quot; = '10KM'">
+            <rule filter="&quot;Source&quot; = '10KM'" key="{85ac541e-ff73-4c62-9c9c-f90872839ec6}" active="0" description="10KM">
               <settings>
-                <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="1" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="1" fontSizeUnit="Point" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSize="10" blendMode="0" textColor="255,255,255,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
-                  <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
-                  <background shapeFillColor="103,34,144,255" shapeJoinStyle="128" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="1" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="103,34,144,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="1" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="1" shapeRadiiX="1" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+                <text-style fontLetterSpacing="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Semibold" textColor="255,255,255,255" multilineHeight="1" fontSize="10" fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="1" useSubstitutions="0" fontUnderline="0">
+                  <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <background shapeType="0" shapeFillColor="103,34,144,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="103,34,144,255" shapeSizeUnit="MM" shapeRadiiY="1" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="128" shapeBorderWidthUnit="MM" shapeDraw="1" shapeOpacity="1" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="0" shapeRadiiX="1" shapeBorderWidth="1" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
                   <substitutions/>
                 </text-style>
-                <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" placeDirectionSymbol="0" wrapChar="" decimals="0"/>
-                <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="6" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="2" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="10" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
-                <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="2" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
+                <text-format multilineAlign="3" autoWrapLength="0" plussign="0" addDirectionSymbol="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+                <placement maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="6" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" geometryGeneratorType="PointGeometry" quadOffset="4" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="2" centroidInside="0" geometryGenerator="" placementFlags="10" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" maxCurvedCharAngleIn="20" priority="10"/>
+                <rendering displayAll="1" upsidedownLabels="0" mergeLines="0" fontLimitPixelSize="0" maxNumLabels="2000" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="1" scaleMax="10000000" minFeatureSize="0" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="0" fontMaxPixelSize="10000" scaleMin="1" obstacleFactor="2"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -8997,17 +9441,17 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
               </settings>
             </rule>
-            <rule key="{4b0221e3-9f99-4b44-b4ff-a02ed7189f03}" description="5KM" active="0" filter="&quot;Source&quot; = '5KM'">
+            <rule filter="&quot;Source&quot; = '5KM'" key="{648c7f2c-5087-45fa-b34c-09d50a7ddedb}" active="0" description="5KM">
               <settings>
-                <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="1" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="1" fontSizeUnit="Point" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontSize="10" blendMode="0" textColor="255,255,255,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
-                  <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
-                  <background shapeFillColor="145,211,55,255" shapeJoinStyle="128" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="1" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="145,211,55,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="1" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="1" shapeRadiiX="1" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+                <text-style fontLetterSpacing="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Semibold" textColor="255,255,255,255" multilineHeight="1" fontSize="10" fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="1" useSubstitutions="0" fontUnderline="0">
+                  <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <background shapeType="0" shapeFillColor="145,211,55,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeSizeUnit="MM" shapeRadiiY="1" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="128" shapeBorderWidthUnit="MM" shapeDraw="1" shapeOpacity="1" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="0" shapeRadiiX="1" shapeBorderWidth="1" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
                   <substitutions/>
                 </text-style>
-                <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" placeDirectionSymbol="0" wrapChar="" decimals="0"/>
-                <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="6" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="2" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="10" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
-                <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="2" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
+                <text-format multilineAlign="3" autoWrapLength="0" plussign="0" addDirectionSymbol="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+                <placement maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="6" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" geometryGeneratorType="PointGeometry" quadOffset="4" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="2" centroidInside="0" geometryGenerator="" placementFlags="10" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" maxCurvedCharAngleIn="20" priority="10"/>
+                <rendering displayAll="1" upsidedownLabels="0" mergeLines="0" fontLimitPixelSize="0" maxNumLabels="2000" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="1" scaleMax="10000000" minFeatureSize="0" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="0" fontMaxPixelSize="10000" scaleMin="1" obstacleFactor="2"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -9039,75 +9483,24 @@ def my_form_open(dialog, layer, feature):
               </settings>
             </rule>
           </rule>
-          <rule key="{8cbbbde3-7d35-4f80-89e2-32d6f85fe1dc}" description="Always Show" active="0">
-            <settings>
-              <text-style previewBkgrdColor="#ffffff" namedStyle="Regular" fontWeight="50" useSubstitutions="0" fontItalic="0" isExpression="1" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="1" fontSizeUnit="Point" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSize="7" blendMode="0" textColor="255,255,255,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
-                <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
-                <background shapeFillColor="0,0,0,255" shapeJoinStyle="128" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="1" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="1" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="0.5" shapeRadiiX="0.1" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
-                <substitutions/>
-              </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" placeDirectionSymbol="0" wrapChar="" decimals="0"/>
-              <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="6" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="3" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="3" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="4" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
-              <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="0.8" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
-              <dd_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
-                    </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
-                    </Option>
-                    <Option name="PredefinedPositionOrder" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
-                    </Option>
-                    <Option name="Rotation" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="rotation" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
-                    </Option>
-                    <Option name="ShapeBorderColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
-                    </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
-                    </Option>
-                  </Option>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </dd_properties>
-            </settings>
-          </rule>
         </rules>
       </labeling>
       <customproperties>
-        <property key="dualview/previewExpressions" value="COALESCE(&quot;Text&quot;, '&lt;NULL>')"/>
-        <property key="embeddedWidgets/count" value="0"/>
+        <property value="COALESCE(&quot;Text&quot;, '&lt;NULL>')" key="dualview/previewExpressions"/>
+        <property value="0" key="embeddedWidgets/count"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory enabled="0" minScaleDenominator="100000" width="15" rotationOffset="270" penColor="#000000" penAlpha="255" height="15" penWidth="0" diagramOrientation="Up" backgroundColor="#ffffff" scaleDependency="Area" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" opacity="1" lineSizeType="MM" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeType="MM" scaleBasedVisibility="0" backgroundAlpha="255" barWidth="5">
           <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
-          <attribute field="" color="#000000" label=""/>
+          <attribute color="#000000" label="" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" priority="0" dist="0" placement="0" obstacle="0" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" showAll="1" placement="0" linePlacementFlags="2" obstacle="0" dist="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -9116,7 +9509,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -9243,18 +9636,18 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" index="0" name=""/>
-        <alias field="descriptio" index="1" name=""/>
-        <alias field="timestamp" index="2" name=""/>
-        <alias field="begin" index="3" name=""/>
-        <alias field="end" index="4" name=""/>
-        <alias field="Distance" index="5" name=""/>
-        <alias field="RouteLen" index="6" name=""/>
-        <alias field="Source" index="7" name=""/>
-        <alias field="length_m" index="8" name=""/>
-        <alias field="length_km" index="9" name=""/>
-        <alias field="org_fid" index="10" name=""/>
-        <alias field="distance" index="11" name=""/>
+        <alias index="0" field="Name" name=""/>
+        <alias index="1" field="descriptio" name=""/>
+        <alias index="2" field="timestamp" name=""/>
+        <alias index="3" field="begin" name=""/>
+        <alias index="4" field="end" name=""/>
+        <alias index="5" field="Distance" name=""/>
+        <alias index="6" field="RouteLen" name=""/>
+        <alias index="7" field="Source" name=""/>
+        <alias index="8" field="length_m" name=""/>
+        <alias index="9" field="length_km" name=""/>
+        <alias index="10" field="org_fid" name=""/>
+        <alias index="11" field="distance" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -9273,51 +9666,52 @@ def my_form_open(dialog, layer, feature):
         <default field="distance" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="Name" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="descriptio" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="timestamp" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="begin" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="end" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="Distance" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="RouteLen" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="Source" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="length_m" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="length_km" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="org_fid" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="distance" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint exp_strength="0" field="Name" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="descriptio" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="timestamp" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="begin" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="end" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="Distance" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="RouteLen" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="Source" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="length_m" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="length_km" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="org_fid" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="distance" constraints="0" notnull_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="Name" exp="" desc=""/>
-        <constraint field="descriptio" exp="" desc=""/>
-        <constraint field="timestamp" exp="" desc=""/>
-        <constraint field="begin" exp="" desc=""/>
-        <constraint field="end" exp="" desc=""/>
-        <constraint field="Distance" exp="" desc=""/>
-        <constraint field="RouteLen" exp="" desc=""/>
-        <constraint field="Source" exp="" desc=""/>
-        <constraint field="length_m" exp="" desc=""/>
-        <constraint field="length_km" exp="" desc=""/>
-        <constraint field="org_fid" exp="" desc=""/>
-        <constraint field="distance" exp="" desc=""/>
+        <constraint exp="" field="Name" desc=""/>
+        <constraint exp="" field="descriptio" desc=""/>
+        <constraint exp="" field="timestamp" desc=""/>
+        <constraint exp="" field="begin" desc=""/>
+        <constraint exp="" field="end" desc=""/>
+        <constraint exp="" field="Distance" desc=""/>
+        <constraint exp="" field="RouteLen" desc=""/>
+        <constraint exp="" field="Source" desc=""/>
+        <constraint exp="" field="length_m" desc=""/>
+        <constraint exp="" field="length_km" desc=""/>
+        <constraint exp="" field="org_fid" desc=""/>
+        <constraint exp="" field="distance" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="1" sortExpression="&quot;distance&quot;">
+      <attributetableconfig sortExpression="&quot;distance&quot;" sortOrder="1" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="org_fid" hidden="0" type="field"/>
-          <column width="-1" name="distance" hidden="0" type="field"/>
-          <column width="-1" name="Name" hidden="0" type="field"/>
-          <column width="-1" name="Source" hidden="0" type="field"/>
-          <column width="-1" name="RouteLen" hidden="0" type="field"/>
-          <column width="-1" name="descriptio" hidden="0" type="field"/>
-          <column width="-1" name="timestamp" hidden="0" type="field"/>
-          <column width="-1" name="begin" hidden="0" type="field"/>
-          <column width="-1" name="end" hidden="0" type="field"/>
-          <column width="-1" name="Distance" hidden="0" type="field"/>
-          <column width="-1" name="length_km" hidden="0" type="field"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="org_fid" type="field" width="-1"/>
+          <column hidden="0" name="distance" type="field" width="-1"/>
+          <column hidden="0" name="Name" type="field" width="-1"/>
+          <column hidden="0" name="Source" type="field" width="-1"/>
+          <column hidden="0" name="RouteLen" type="field" width="-1"/>
+          <column hidden="0" name="descriptio" type="field" width="-1"/>
+          <column hidden="0" name="timestamp" type="field" width="-1"/>
+          <column hidden="0" name="begin" type="field" width="-1"/>
+          <column hidden="0" name="end" type="field" width="-1"/>
+          <column hidden="0" name="Distance" type="field" width="-1"/>
+          <column hidden="0" name="length_km" type="field" width="-1"/>
+          <column hidden="0" name="length_m" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9348,40 +9742,40 @@ 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="quadrant" 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="quadrant"/>
+        <field editable="1" name="timestamp"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="Distance"/>
-        <field labelOnTop="0" name="Name"/>
-        <field labelOnTop="0" name="RouteLen"/>
-        <field labelOnTop="0" name="Source"/>
-        <field labelOnTop="0" name="begin"/>
-        <field labelOnTop="0" name="descriptio"/>
-        <field labelOnTop="0" name="distance"/>
-        <field labelOnTop="0" name="end"/>
-        <field labelOnTop="0" name="length_km"/>
-        <field labelOnTop="0" name="length_m"/>
-        <field labelOnTop="0" name="org_fid"/>
-        <field labelOnTop="0" name="quadrant"/>
-        <field labelOnTop="0" name="timestamp"/>
+        <field name="Distance" labelOnTop="0"/>
+        <field name="Name" labelOnTop="0"/>
+        <field name="RouteLen" labelOnTop="0"/>
+        <field name="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="quadrant" labelOnTop="0"/>
+        <field name="timestamp" labelOnTop="0"/>
       </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
       <mapTip>Text</mapTip>
     </maplayer>
-    <maplayer maxScale="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" simplifyLocal="1" readOnly="0" geometry="Polygon" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" wkbType="MultiPolygon" simplifyDrawingTol="1">
+    <maplayer styleCategories="AllStyleCategories" refreshOnNotifyMessage="" simplifyAlgorithm="0" maxScale="0" geometry="Polygon" simplifyMaxScale="1" simplifyLocal="1" labelsEnabled="0" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" type="vector" minScale="1e+08" readOnly="0" autoRefreshTime="0" autoRefreshEnabled="0" simplifyDrawingTol="1" wkbType="MultiPolygon" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.40435736428151614</xmin>
         <ymin>-33.90613600950420903</ymin>
@@ -9445,10 +9839,10 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" type="singleSymbol" forceraster="0" enableorderby="0">
+      <renderer-v2 type="singleSymbol" enableorderby="0" forceraster="0" symbollevels="0">
         <symbols>
-          <symbol name="0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+          <symbol force_rhr="0" name="0" clip_to_extent="1" type="fill" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleFill">
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="114,155,111,255"/>
               <prop k="joinstyle" v="bevel"/>
@@ -9474,12 +9868,12 @@ def my_form_open(dialog, layer, feature):
         <sizescale/>
       </renderer-v2>
       <customproperties>
-        <property key="dualview/previewExpressions" value="&quot;id&quot;"/>
+        <property value="&quot;id&quot;" key="dualview/previewExpressions"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option value="" type="QString"/>
         </activeChecks>
@@ -9509,9 +9903,9 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="area" index="1" name=""/>
-        <alias field="rotation" index="2" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="area" name=""/>
+        <alias index="2" field="rotation" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -9521,25 +9915,25 @@ def my_form_open(dialog, layer, feature):
         <default field="rotation" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="area" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="rotation" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint exp_strength="0" field="id" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="area" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="rotation" constraints="0" notnull_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="area" exp="" desc=""/>
-        <constraint field="rotation" exp="" desc=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="area" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;rotation&quot;">
+      <attributetableconfig sortExpression="&quot;rotation&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="-1" name="area" hidden="0" type="field"/>
-          <column width="-1" name="rotation" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="0" name="area" type="field" width="-1"/>
+          <column hidden="0" name="rotation" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9559,14 +9953,14 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Point" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" wkbType="Point" simplifyDrawingTol="1">
+    <maplayer styleCategories="AllStyleCategories" refreshOnNotifyMessage="" simplifyAlgorithm="0" maxScale="0" geometry="Point" simplifyMaxScale="1" simplifyLocal="1" labelsEnabled="0" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" type="vector" minScale="1e+08" readOnly="0" autoRefreshTime="0" autoRefreshEnabled="0" simplifyDrawingTol="1" wkbType="Point" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37527697005977245</xmin>
         <ymin>-33.94584879231483399</ymin>
         <xmax>18.42008414500160995</xmax>
         <ymax>-33.89948351196304799</ymax>
       </extent>
-      <id>timelapse_1e9371ed_fd46_407b_8e2a_21ea46053bfe</id>
+      <id>timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f</id>
       <datasource>./timelapse.shp|layername=timelapse</datasource>
       <keywordList>
         <value></value>
@@ -9612,11 +10006,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
+          <spatial minz="0" minx="0" maxz="0" maxy="0" maxx="0" crs="" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -9640,13 +10034,13 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 symbollevels="0" type="RuleRenderer" forceraster="0" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" enableorderby="0" forceraster="0" symbollevels="0">
         <rules key="{01115dc1-cc6e-4980-a968-7ef94a3b9df6}">
-          <rule symbol="0" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}" label="All distances"/>
+          <rule symbol="0" label="All distances" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}"/>
         </rules>
         <symbols>
-          <symbol name="0" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-            <layer pass="0" class="SimpleMarker" locked="1" enabled="1">
+          <symbol force_rhr="0" name="0" clip_to_extent="1" type="marker" alpha="1">
+            <layer pass="0" locked="1" enabled="1" class="SimpleMarker">
               <prop k="angle" v="0"/>
               <prop k="color" v="0,0,0,255"/>
               <prop k="horizontal_anchor_point" v="1"/>
@@ -9661,7 +10055,7 @@ def my_form_open(dialog, layer, feature):
               <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="outline_width_unit" v="MM"/>
               <prop k="scale_method" v="diameter"/>
-              <prop k="size" v="0.35"/>
+              <prop k="size" v="0.5"/>
               <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="size_unit" v="MM"/>
               <prop k="vertical_anchor_point" v="1"/>
@@ -9688,71 +10082,28 @@ def my_form_open(dialog, layer, feature):
         </symbols>
       </renderer-v2>
       <labeling type="rule-based">
-        <rules key="{8209fadf-9c49-4b02-955b-00e6176ca6e7}">
-          <rule key="{19b7fab2-9e40-4733-8ee6-00027ba6a037}">
-            <settings>
-              <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="1" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.8" fontSizeUnit="Point" fieldName="IF(&quot;Distance&quot; IS attribute( @atlas_feature, 'Distance' ), display, '')" fontSize="9" blendMode="0" textColor="0,0,255,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
-                <text-buffer bufferOpacity="1" bufferNoFill="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
-                <background shapeFillColor="255,255,255,255" shapeJoinStyle="128" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0.2" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,255,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0.5" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="1" shapeRadiiX="0.5" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
-                <substitutions/>
-              </text-style>
-              <text-format formatNumbers="0" autoWrapLength="17" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="2" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
-              <placement centroidInside="0" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="0" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" geometryGenerator="" dist="0" yOffset="0" geometryGeneratorType="LineGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="10" placementFlags="10" offsetType="0" offsetUnits="MM"/>
-              <rendering labelPerPart="0" obstacleType="0" scaleMax="0" limitNumLabels="0" drawLabels="1" obstacleFactor="2" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="0" minFeatureSize="0" maxNumLabels="2" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
-              <dd_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="AlwaysShow" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
-                    </Option>
-                    <Option name="Hali" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="'Center'" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
-                    </Option>
-                    <Option name="PositionX" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
-                    </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
-                    </Option>
-                    <Option name="Vali" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="'Half'" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
-                    </Option>
-                  </Option>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </dd_properties>
-            </settings>
-          </rule>
-        </rules>
+        <rules key="{5513b950-b185-4274-87ed-f967f2c0f61b}"/>
       </labeling>
       <customproperties>
-        <property key="dualview/previewExpressions" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-        <property key="embeddedWidgets/count" value="0"/>
+        <property key="dualview/previewExpressions">
+          <value>COALESCE( "Name", '&lt;NULL>' )</value>
+          <value>COALESCE( "Name", '&lt;NULL>' )</value>
+          <value>COALESCE( "Name", '&lt;NULL>' )</value>
+        </property>
+        <property value="0" key="embeddedWidgets/count"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory enabled="0" minScaleDenominator="0" width="15" rotationOffset="270" penColor="#000000" penAlpha="255" height="15" penWidth="0" diagramOrientation="Up" backgroundColor="#ffffff" scaleDependency="Area" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" opacity="1" lineSizeType="MM" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeType="MM" scaleBasedVisibility="0" backgroundAlpha="255" barWidth="5">
           <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-          <attribute field="" color="#000000" label=""/>
+          <attribute color="#000000" label="" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" priority="0" dist="0" placement="0" obstacle="0" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" showAll="1" placement="0" linePlacementFlags="18" obstacle="0" dist="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -9761,11 +10112,32 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
       <fieldConfiguration>
+        <field name="Name">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="descriptio">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="timestamp">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="begin">
           <editWidget type="TextEdit">
             <config>
@@ -9776,6 +10148,13 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="end">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="RouteLen">
           <editWidget type="TextEdit">
             <config>
@@ -9796,21 +10175,42 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field name="distance_1">
+        <field name="length_m">
+          <editWidget type="Range">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="length_km">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="first_run">
+        <field name="org_fid">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="last_run">
+        <field name="distance">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="first_runn">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="last_runne">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -9819,66 +10219,95 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="begin" index="0" name=""/>
-        <alias field="RouteLen" index="1" name=""/>
-        <alias field="Source" index="2" name=""/>
-        <alias field="distance_1" index="3" name=""/>
-        <alias field="first_run" index="4" name=""/>
-        <alias field="last_run" index="5" name=""/>
+        <alias index="0" field="Name" name=""/>
+        <alias index="1" field="descriptio" name=""/>
+        <alias index="2" field="timestamp" name=""/>
+        <alias index="3" field="begin" name=""/>
+        <alias index="4" field="end" name=""/>
+        <alias index="5" field="RouteLen" name=""/>
+        <alias index="6" field="Source" name=""/>
+        <alias index="7" field="length_m" name=""/>
+        <alias index="8" field="length_km" name=""/>
+        <alias index="9" field="org_fid" name=""/>
+        <alias index="10" field="distance" name=""/>
+        <alias index="11" field="first_runn" name=""/>
+        <alias index="12" field="last_runne" name=""/>
       </aliases>
       <excludeAttributesWMS>
-        <attribute>Source</attribute>
-        <attribute>distance_1</attribute>
-        <attribute>first_run</attribute>
-        <attribute>last_run</attribute>
         <attribute>begin</attribute>
+        <attribute>Source</attribute>
         <attribute>RouteLen</attribute>
       </excludeAttributesWMS>
       <excludeAttributesWFS>
-        <attribute>Source</attribute>
-        <attribute>distance_1</attribute>
-        <attribute>first_run</attribute>
-        <attribute>last_run</attribute>
         <attribute>begin</attribute>
+        <attribute>Source</attribute>
         <attribute>RouteLen</attribute>
       </excludeAttributesWFS>
       <defaults>
+        <default field="Name" applyOnUpdate="0" expression=""/>
+        <default field="descriptio" applyOnUpdate="0" expression=""/>
+        <default field="timestamp" applyOnUpdate="0" expression=""/>
         <default field="begin" applyOnUpdate="0" expression=""/>
+        <default field="end" applyOnUpdate="0" expression=""/>
         <default field="RouteLen" applyOnUpdate="0" expression=""/>
         <default field="Source" applyOnUpdate="0" expression=""/>
-        <default field="distance_1" applyOnUpdate="0" expression=""/>
-        <default field="first_run" applyOnUpdate="0" expression=""/>
-        <default field="last_run" applyOnUpdate="0" expression=""/>
+        <default field="length_m" applyOnUpdate="0" expression=""/>
+        <default field="length_km" applyOnUpdate="0" expression=""/>
+        <default field="org_fid" applyOnUpdate="0" expression=""/>
+        <default field="distance" applyOnUpdate="0" expression=""/>
+        <default field="first_runn" applyOnUpdate="0" expression=""/>
+        <default field="last_runne" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="begin" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="RouteLen" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="Source" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="distance_1" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="first_run" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="last_run" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint exp_strength="0" field="Name" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="descriptio" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="timestamp" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="begin" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="end" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="RouteLen" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="Source" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="length_m" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="length_km" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="org_fid" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="distance" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="first_runn" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="last_runne" constraints="0" notnull_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="begin" exp="" desc=""/>
-        <constraint field="RouteLen" exp="" desc=""/>
-        <constraint field="Source" exp="" desc=""/>
-        <constraint field="distance_1" exp="" desc=""/>
-        <constraint field="first_run" exp="" desc=""/>
-        <constraint field="last_run" exp="" desc=""/>
+        <constraint exp="" field="Name" desc=""/>
+        <constraint exp="" field="descriptio" desc=""/>
+        <constraint exp="" field="timestamp" desc=""/>
+        <constraint exp="" field="begin" desc=""/>
+        <constraint exp="" field="end" desc=""/>
+        <constraint exp="" field="RouteLen" desc=""/>
+        <constraint exp="" field="Source" desc=""/>
+        <constraint exp="" field="length_m" desc=""/>
+        <constraint exp="" field="length_km" desc=""/>
+        <constraint exp="" field="org_fid" desc=""/>
+        <constraint exp="" field="distance" desc=""/>
+        <constraint exp="" field="first_runn" desc=""/>
+        <constraint exp="" field="last_runne" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;last_run&quot;">
+      <attributetableconfig sortExpression="&quot;first_runn&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="179" name="begin" hidden="0" type="field"/>
-          <column width="-1" name="RouteLen" hidden="0" type="field"/>
-          <column width="-1" name="Source" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="distance_1" hidden="0" type="field"/>
-          <column width="191" name="first_run" hidden="0" type="field"/>
-          <column width="174" name="last_run" hidden="0" type="field"/>
+          <column hidden="0" name="begin" type="field" width="179"/>
+          <column hidden="0" name="RouteLen" type="field" width="-1"/>
+          <column hidden="0" name="Source" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="Name" type="field" width="-1"/>
+          <column hidden="0" name="length_m" type="field" width="-1"/>
+          <column hidden="0" name="length_km" type="field" width="-1"/>
+          <column hidden="0" name="org_fid" type="field" width="-1"/>
+          <column hidden="0" name="first_runn" type="field" width="-1"/>
+          <column hidden="0" name="last_runne" type="field" width="-1"/>
+          <column hidden="0" name="descriptio" type="field" width="-1"/>
+          <column hidden="0" name="timestamp" type="field" width="-1"/>
+          <column hidden="0" name="end" type="field" width="-1"/>
+          <column hidden="0" name="distance" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9909,62 +10338,64 @@ 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="auxiliary_storage_labeling_positionx" editable="0"/>
-        <field name="auxiliary_storage_labeling_positiony" editable="0"/>
-        <field name="begin" editable="1"/>
-        <field name="descriptio" editable="1"/>
-        <field name="display" editable="1"/>
-        <field name="distance" editable="1"/>
-        <field name="distance_1" editable="1"/>
-        <field name="end" editable="1"/>
-        <field name="first_run" editable="1"/>
-        <field name="first_runn" editable="1"/>
-        <field name="first_runner" editable="1"/>
-        <field name="first_runner_s" editable="1"/>
-        <field name="last_run" editable="0"/>
-        <field name="last_runn" editable="1"/>
-        <field name="last_runner" editable="1"/>
-        <field name="last_runner_s" editable="1"/>
-        <field name="length_km" editable="1"/>
-        <field name="length_m" editable="1"/>
-        <field name="org_fid" editable="1"/>
-        <field name="timestamp" editable="1"/>
+        <field editable="1" name="Distance"/>
+        <field editable="1" name="Name"/>
+        <field editable="1" name="RouteLen"/>
+        <field editable="1" name="Source"/>
+        <field editable="0" name="auxiliary_storage_labeling_positionx"/>
+        <field editable="0" name="auxiliary_storage_labeling_positiony"/>
+        <field editable="1" name="begin"/>
+        <field editable="1" name="descriptio"/>
+        <field editable="1" name="display"/>
+        <field editable="1" name="distance"/>
+        <field editable="1" name="distance_1"/>
+        <field editable="1" name="end"/>
+        <field editable="1" name="first_run"/>
+        <field editable="1" name="first_runn"/>
+        <field editable="1" name="first_runner"/>
+        <field editable="1" name="first_runner_s"/>
+        <field editable="0" name="last_run"/>
+        <field editable="1" name="last_runn"/>
+        <field editable="1" name="last_runne"/>
+        <field editable="1" name="last_runner"/>
+        <field editable="1" name="last_runner_s"/>
+        <field editable="1" name="length_km"/>
+        <field editable="1" name="length_m"/>
+        <field editable="1" name="org_fid"/>
+        <field editable="1" name="timestamp"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="Distance"/>
-        <field labelOnTop="0" name="Name"/>
-        <field labelOnTop="0" name="RouteLen"/>
-        <field labelOnTop="0" name="Source"/>
-        <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
-        <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
-        <field labelOnTop="0" name="begin"/>
-        <field labelOnTop="0" name="descriptio"/>
-        <field labelOnTop="0" name="display"/>
-        <field labelOnTop="0" name="distance"/>
-        <field labelOnTop="0" name="distance_1"/>
-        <field labelOnTop="0" name="end"/>
-        <field labelOnTop="0" name="first_run"/>
-        <field labelOnTop="0" name="first_runn"/>
-        <field labelOnTop="0" name="first_runner"/>
-        <field labelOnTop="0" name="first_runner_s"/>
-        <field labelOnTop="0" name="last_run"/>
-        <field labelOnTop="0" name="last_runn"/>
-        <field labelOnTop="0" name="last_runner"/>
-        <field labelOnTop="0" name="last_runner_s"/>
-        <field labelOnTop="0" name="length_km"/>
-        <field labelOnTop="0" name="length_m"/>
-        <field labelOnTop="0" name="org_fid"/>
-        <field labelOnTop="0" name="timestamp"/>
+        <field name="Distance" labelOnTop="0"/>
+        <field name="Name" labelOnTop="0"/>
+        <field name="RouteLen" labelOnTop="0"/>
+        <field name="Source" labelOnTop="0"/>
+        <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
+        <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
+        <field name="begin" labelOnTop="0"/>
+        <field name="descriptio" labelOnTop="0"/>
+        <field name="display" labelOnTop="0"/>
+        <field name="distance" labelOnTop="0"/>
+        <field name="distance_1" labelOnTop="0"/>
+        <field name="end" labelOnTop="0"/>
+        <field name="first_run" labelOnTop="0"/>
+        <field name="first_runn" labelOnTop="0"/>
+        <field name="first_runner" labelOnTop="0"/>
+        <field name="first_runner_s" labelOnTop="0"/>
+        <field name="last_run" labelOnTop="0"/>
+        <field name="last_runn" labelOnTop="0"/>
+        <field name="last_runne" labelOnTop="0"/>
+        <field name="last_runner" labelOnTop="0"/>
+        <field name="last_runner_s" labelOnTop="0"/>
+        <field name="length_km" labelOnTop="0"/>
+        <field name="length_m" labelOnTop="0"/>
+        <field name="org_fid" labelOnTop="0"/>
+        <field name="timestamp" labelOnTop="0"/>
       </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Polygon" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" wkbType="MultiPolygon" simplifyDrawingTol="1">
+    <maplayer styleCategories="AllStyleCategories" refreshOnNotifyMessage="" simplifyAlgorithm="0" maxScale="0" geometry="Polygon" simplifyMaxScale="1" simplifyLocal="1" labelsEnabled="1" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" type="vector" minScale="1e+08" readOnly="0" autoRefreshTime="0" autoRefreshEnabled="0" simplifyDrawingTol="1" wkbType="MultiPolygon" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37549461152003971</xmin>
         <ymin>-33.94162201868364548</ymin>
@@ -10021,7 +10452,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
+          <spatial minz="0" minx="0" maxz="0" maxy="0" maxx="0" crs="" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -10048,17 +10479,17 @@ def my_form_open(dialog, layer, feature):
       <renderer-v2 type="nullSymbol"/>
       <labeling type="rule-based">
         <rules key="{5dc8b36b-2058-4678-ad09-9a66ad011982}">
-          <rule key="{6ef417ce-9c3a-42d0-a533-3a83b1a257ea}" description="Show water tables" filter="CASE&#xa;WHEN attribute( @atlas_feature , 'RouteLen' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'RouteLen' ) ) THEN 1&#xa;ELSE 0&#xa;END">
+          <rule filter="CASE&#xa;WHEN attribute( @atlas_feature , 'RouteLen' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'RouteLen' ) ) THEN 1&#xa;ELSE 0&#xa;END" key="{6ef417ce-9c3a-42d0-a533-3a83b1a257ea}" description="Show water tables">
             <settings>
-              <text-style previewBkgrdColor="#ffffff" namedStyle="Bold" fontWeight="75" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.9" fontSizeUnit="Point" fieldName="label" fontSize="8" blendMode="0" textColor="31,120,180,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
-                <text-buffer bufferOpacity="0.4" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="0.75"/>
-                <background shapeFillColor="255,255,255,204" shapeJoinStyle="128" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0.75" shapeOpacity="0.6" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="-0.15" shapeSizeY="0.3" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="31,120,206,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0.5" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="0.75" shapeRadiiX="0.5" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+              <text-style fontLetterSpacing="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" namedStyle="Bold" textColor="31,120,180,255" multilineHeight="1" fontSize="8" fontWeight="75" fieldName="label" fontCapitals="0" fontItalic="0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontStrikeout="0" blendMode="0" fontWordSpacing="0" textOpacity="0.9" useSubstitutions="0" fontUnderline="0">
+                <text-buffer bufferOpacity="0.4" bufferBlendMode="0" bufferSize="0.75" bufferNoFill="0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeType="0" shapeFillColor="255,255,255,204" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="31,120,206,255" shapeSizeUnit="MM" shapeRadiiY="0.5" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="128" shapeBorderWidthUnit="MM" shapeDraw="1" shapeOpacity="0.6" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.75" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="-0.15" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="0.3" shapeRadiiX="0.5" shapeBorderWidth="0.75" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="1" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
-              <placement centroidInside="0" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="0" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="1" maxCurvedCharAngleIn="25" geometryGenerator="" dist="0" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="1" priority="5" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
-              <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="0.76" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="5" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="6" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="0"/>
+              <text-format multilineAlign="1" autoWrapLength="0" plussign="0" addDirectionSymbol="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
+              <placement maxCurvedCharAngleOut="-25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" placement="0" fitInPolygonOnly="0" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="1" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" geometryGeneratorType="PointGeometry" quadOffset="1" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="0" centroidInside="0" geometryGenerator="" placementFlags="10" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="1" maxCurvedCharAngleIn="25" priority="5"/>
+              <rendering displayAll="0" upsidedownLabels="0" mergeLines="0" fontLimitPixelSize="0" maxNumLabels="6" fontMinPixelSize="3" scaleVisibility="0" drawLabels="1" obstacle="1" scaleMax="10000000" minFeatureSize="0" limitNumLabels="0" labelPerPart="0" obstacleType="0" zIndex="5" fontMaxPixelSize="10000" scaleMin="1" obstacleFactor="0.76"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -10071,21 +10502,21 @@ def my_form_open(dialog, layer, feature):
         </rules>
       </labeling>
       <customproperties>
-        <property key="dualview/previewExpressions" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
-        <property key="embeddedWidgets/count" value="0"/>
+        <property value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" key="dualview/previewExpressions"/>
+        <property value="0" key="embeddedWidgets/count"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory enabled="0" minScaleDenominator="0" width="15" rotationOffset="270" penColor="#000000" penAlpha="255" height="15" penWidth="0" diagramOrientation="Up" backgroundColor="#ffffff" scaleDependency="Area" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" opacity="1" lineSizeType="MM" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeType="MM" scaleBasedVisibility="0" backgroundAlpha="255" barWidth="5">
           <fontProperties style="" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0"/>
-          <attribute field="" color="#000000" label=""/>
+          <attribute color="#000000" label="" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" priority="0" dist="0" placement="0" obstacle="0" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" showAll="1" placement="0" linePlacementFlags="2" obstacle="0" dist="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -10094,7 +10525,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -10138,10 +10569,10 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="table_set" index="1" name=""/>
-        <alias field="label" index="2" name=""/>
-        <alias field="races" index="3" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="table_set" name=""/>
+        <alias index="2" field="label" name=""/>
+        <alias index="3" field="races" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -10152,28 +10583,28 @@ def my_form_open(dialog, layer, feature):
         <default field="races" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="table_set" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="label" constraints="0" unique_strength="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="races" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint exp_strength="0" field="id" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="table_set" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="label" constraints="0" notnull_strength="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="races" constraints="0" notnull_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="table_set" exp="" desc=""/>
-        <constraint field="label" exp="" desc=""/>
-        <constraint field="races" exp="" desc=""/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="table_set" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="races" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;table_set&quot;">
+      <attributetableconfig sortExpression="&quot;table_set&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="table_set" hidden="0" type="field"/>
-          <column width="-1" name="label" hidden="0" type="field"/>
-          <column width="130" name="races" hidden="0" type="field"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="table_set" type="field" width="-1"/>
+          <column hidden="0" name="label" type="field" width="-1"/>
+          <column hidden="0" name="races" type="field" width="130"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10204,16 +10635,16 @@ 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="races" editable="1"/>
-        <field name="table_set" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="label"/>
+        <field editable="1" name="races"/>
+        <field editable="1" name="table_set"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="label"/>
-        <field labelOnTop="0" name="races"/>
-        <field labelOnTop="0" name="table_set"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="label" labelOnTop="0"/>
+        <field name="races" labelOnTop="0"/>
+        <field name="table_set" labelOnTop="0"/>
       </labelOnTop>
       <widgets/>
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
@@ -10240,8 +10671,8 @@ def my_form_open(dialog, layer, feature):
     <layer id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8"/>
     <layer id="fence_groups_2daa8372_dd22_4979_afdf_08d74ee6b4b1"/>
     <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-    <layer id="timelapse_1e9371ed_fd46_407b_8e2a_21ea46053bfe"/>
     <layer id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83"/>
+    <layer id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f"/>
   </layerorder>
   <properties>
     <DefaultStyles>
@@ -10417,7 +10848,7 @@ def my_form_open(dialog, layer, feature):
       <disabledLayers type="QStringList"/>
     </Identify>
     <Layouts>
-      <lastLayoutExportDir type="QString">/home/tim/Documents/GunRunMaps/GIS Base Map/Fencing/20191011 - Gun Run 2019 - Fencing rev 2.3.pdf</lastLayoutExportDir>
+      <lastLayoutExportDir type="QString">/home/tim/Documents/GunRunMaps/GIS Base Map/Fencing</lastLayoutExportDir>
     </Layouts>
     <Legend>
       <filterByMap type="bool">false</filterByMap>
@@ -10478,7 +10909,7 @@ def my_form_open(dialog, layer, feature):
     <TimeManager>
       <active type="int">1</active>
       <animationFrameLength type="int">10</animationFrameLength>
-      <currentMapTimePosition type="QString">1900-01-01 07:04:19</currentMapTimePosition>
+      <currentMapTimePosition type="QString">1900-01-01 06:59:35</currentMapTimePosition>
       <digits type="int">4</digits>
       <labelBgColor type="QString">#ffffff</labelBgColor>
       <labelColor type="QString">#000000</labelColor>
@@ -10492,9 +10923,9 @@ def my_form_open(dialog, layer, feature):
       <timeFrameSize type="int">10</timeFrameSize>
       <timeFrameType type="QString">seconds</timeFrameType>
       <timeLayerList type="QStringList">
-        <value>timelapse_d047db96_b4ab_4656_8ec5_eef60d76db13;;first_run;last_run;True;%H:%M:%S.%f;0;;False;No interpolation (faster);True;False;False</value>
+        <value>timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f;;first_runn;last_runne;True;%H:%M:%S.%f;0;;False;No interpolation (faster);False;False;False</value>
       </timeLayerList>
-      <timeLayerManager type="QString">1900-01-01 06:30:00;1900-01-01 08:35:00;1900-01-01 07:04:19</timeLayerManager>
+      <timeLayerManager type="QString">1900-01-01 06:30:00;1900-01-01 10:05:43;1900-01-01 06:59:35</timeLayerManager>
     </TimeManager>
     <Variables>
       <variableNames type="QStringList"/>
@@ -10558,247 +10989,247 @@ def my_form_open(dialog, layer, feature):
   </properties>
   <visibility-presets>
     <visibility-preset has-expanded-info="1" name="Access Routes">
-      <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="0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="0"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer style="default" expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
+      <layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" style="default" expanded="1"/>
       <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Elevation"/>
-        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="All Routes">
-      <layer style="default" expanded="1" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <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="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="1"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer id="water_tables20170921142016467" style="default" expanded="1"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" expanded="1"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{bf1a10e0-59dd-4cae-9422-60e7158499cb}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Ask Me">
-      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <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="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
-      <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
-      <layer style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="1"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer style="default" expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
+      <layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" style="default" expanded="1"/>
+      <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" style="default" expanded="1"/>
       <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Ask Me"/>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Ask Me"/>
         <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Fencing">
-      <layer style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer id="water_tables20170921142016467" style="default" expanded="1"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" expanded="1"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" expanded="1"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <checked-legend-node id="{b3b38ee9-c245-4839-b078-3b966a2a5c4e}"/>
         <checked-legend-node id="{bb4463e8-e33a-4475-878c-fd2d7b636418}"/>
         <checked-legend-node id="{9da1c54c-0ca9-4db9-a722-ce3f53ccd358}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer style="default" expanded="1" id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" style="default" expanded="1"/>
       <expanded-legend-nodes id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83"/>
-      <layer style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" expanded="1"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer style="default" expanded="1" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer style="default" expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
       <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Fencing and Cones"/>
         <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-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Marshal map - inset">
-      <layer style="default" expanded="1" id="water_tables20170921142016467"/>
+      <layer id="water_tables20170921142016467" style="default" expanded="1"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <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="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" expanded="1"/>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer 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="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" expanded="1"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer id="extra_security20170921130834191" style="default" expanded="1"/>
+      <expanded-legend-nodes id="extra_security20170921130834191"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Elevation"/>
-        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Marshal map - main">
-      <layer style="default" expanded="1" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <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="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer style="default" expanded="0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="0"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer style="default" expanded="1" id="extra_security20170921130834191"/>
+      <layer id="water_tables20170921142016467" style="default" expanded="1"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" expanded="1"/>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer id="extra_security20170921130834191" style="default" expanded="1"/>
       <expanded-legend-nodes id="extra_security20170921130834191"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Elevation"/>
-        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Marshal overview">
-      <layer style="default" expanded="1" id="water_tables20170921142016467"/>
+      <layer id="water_tables20170921142016467" style="default" expanded="1"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <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="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" expanded="1"/>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer style="default" expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" expanded="1"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" expanded="1"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Proposed Routes">
-      <layer style="default" expanded="1" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <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="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="1"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer id="water_tables20170921142016467" style="default" expanded="1"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" expanded="1"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Routes">
-      <layer style="default" expanded="1" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <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="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="1"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer id="water_tables20170921142016467" style="default" expanded="1"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" expanded="1"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Start/Finish">
-      <layer style="default" expanded="1" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <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="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer style="default" expanded="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
+      <layer id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" style="default" expanded="1"/>
       <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
-      <layer style="default" expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer id="water_tables20170921142016467" style="default" expanded="1"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" expanded="1"/>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" expanded="1"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" expanded="1"/>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Marshal pages"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Marshal pages"/>
         <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
@@ -10826,12 +11257,12 @@ def my_form_open(dialog, layer, feature):
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout units="mm" printResolution="144" name="Routes" worldFileMap="">
-      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
-      <Grid offsetX="0" resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm"/>
+    <Layout printResolution="144" worldFileMap="" name="Routes" units="mm">
+      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
+      <Grid offsetUnits="mm" resolution="10" offsetX="0" offsetY="0" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+        <symbol force_rhr="0" name="" clip_to_extent="1" type="fill" alpha="1">
+          <layer pass="0" locked="0" enabled="1" class="SimpleFill">
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
             <prop k="joinstyle" v="miter"/>
@@ -10852,9 +11283,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem frame="false" size="297,210,mm" uuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" position="0,0,mm" type="65638" templateUuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" frameJoinStyle="miter" positionLock="false" background="true" outlineWidthM="0.3,mm" zValue="0" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" excludeFromExports="0" positionOnPage="0,0,mm" itemRotation="0" groupUuid="">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem size="297,210,mm" frame="false" frameJoinStyle="miter" positionLock="false" id="" background="true" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" type="65638" position="0,0,mm" positionOnPage="0,0,mm" blendMode="0" opacity="1" uuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" outlineWidthM="0.3,mm" zValue="0" templateUuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}">
+          <FrameColor green="0" blue="0" alpha="255" red="0"/>
+          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -10867,12 +11298,12 @@ def my_form_open(dialog, layer, feature):
           </LayoutObject>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide units="mm" orientation="2" page="0" position="0"/>
+          <Guide page="0" orientation="2" position="0" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem frame="false" size="14.1764,7.471,mm" uuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" marginX="1" position="9.44946,191.611,mm" type="65641" valign="64" templateUuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="9" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="[%&quot;Distance&quot;%]" excludeFromExports="0" positionOnPage="9.44946,191.611,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="14.1764,7.471,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="true" id="" labelText="[%&quot;Distance&quot;%]" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="1" valign="64" type="65641" position="9.44946,191.611,mm" marginY="1" positionOnPage="9.44946,191.611,mm" htmlState="0" blendMode="0" opacity="1" uuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" outlineWidthM="0.3,mm" zValue="9" templateUuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -10884,11 +11315,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Semibold" description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="29.2025,7.272,mm" uuid="{d9f4225c-620f-4a62-a293-599f109f5206}" marginX="0" position="24.2445,191.81,mm" type="65641" valign="64" templateUuid="{d9f4225c-620f-4a62-a293-599f109f5206}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="8" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="RACE ROUTE" excludeFromExports="0" positionOnPage="24.2445,191.81,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="29.2025,7.272,mm" frame="false" frameJoinStyle="miter" marginX="0" positionLock="true" id="" labelText="RACE ROUTE" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="1" valign="64" type="65641" position="24.2445,191.81,mm" marginY="1" positionOnPage="24.2445,191.81,mm" htmlState="0" blendMode="0" opacity="1" uuid="{d9f4225c-620f-4a62-a293-599f109f5206}" outlineWidthM="0.3,mm" zValue="8" templateUuid="{d9f4225c-620f-4a62-a293-599f109f5206}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -10900,11 +11331,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="57.4836,6.8714,mm" uuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" marginX="1" position="204.225,191.81,mm" type="65641" valign="64" templateUuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="6" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="REVISION 3.0" excludeFromExports="0" positionOnPage="204.225,191.81,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="57.4836,6.8714,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="true" id="" labelText="REVISION 3.0" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="2" valign="64" type="65641" position="204.225,191.81,mm" marginY="1" positionOnPage="204.225,191.81,mm" htmlState="0" blendMode="0" opacity="1" uuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" outlineWidthM="0.3,mm" zValue="6" templateUuid="{1915042c-b33e-434c-ba57-48f7179a5efa}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -10916,11 +11347,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="51.6706,6.60801,mm" uuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" marginX="1" position="210.038,199.082,mm" type="65641" valign="64" templateUuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="5" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="Sunday, 20 October 2019" excludeFromExports="0" positionOnPage="210.038,199.082,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="51.6706,6.60801,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="true" id="" labelText="Sunday, 20 October 2019" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="2" valign="64" type="65641" position="210.038,199.082,mm" marginY="1" positionOnPage="210.038,199.082,mm" htmlState="0" blendMode="0" opacity="1" uuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" outlineWidthM="0.3,mm" zValue="5" templateUuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -10932,11 +11363,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="29.7523,17.4718,mm" uuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" position="262.196,188.218,mm" type="65640" pictureWidth="29.7523" templateUuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" pictureRotation="0" frameJoinStyle="miter" positionLock="true" anchorPoint="4" svgFillColor="255,255,255,255" background="false" resizeMode="0" outlineWidthM="0.3,mm" zValue="4" visibility="1" northMode="0" referencePoint="0" svgBorderWidth="0.2" opacity="1" id="" blendMode="0" northOffset="0" mapUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" excludeFromExports="0" pictureHeight="17.4074" positionOnPage="262.196,188.218,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="29.7523,17.4718,mm" northMode="0" frame="false" svgBorderColor="0,0,0,255" frameJoinStyle="miter" svgBorderWidth="0.2" pictureRotation="0" positionLock="true" id="" anchorPoint="4" mapUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" background="false" groupUuid="" referencePoint="0" visibility="1" pictureHeight="17.4074" svgFillColor="255,255,255,255" excludeFromExports="0" itemRotation="0" type="65640" file="../Gun_Run_Logo.png" position="262.196,188.218,mm" northOffset="0" positionOnPage="262.196,188.218,mm" blendMode="0" opacity="1" uuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" outlineWidthM="0.3,mm" resizeMode="0" pictureWidth="29.7523" zValue="4" templateUuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -10954,9 +11385,9 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem frame="false" size="251.959,0.1,mm" uuid="{5e005555-54ea-40fd-a5a7-20254950b890}" position="9.59946,198.832,mm" type="65643" templateUuid="{5e005555-54ea-40fd-a5a7-20254950b890}" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="3" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" cornerRadiusMeasure="0,mm" excludeFromExports="0" shapeType="1" positionOnPage="9.59946,198.832,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="251.959,0.1,mm" frame="false" frameJoinStyle="miter" shapeType="1" positionLock="true" id="" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" type="65643" position="9.59946,198.832,mm" positionOnPage="9.59946,198.832,mm" blendMode="0" opacity="1" uuid="{5e005555-54ea-40fd-a5a7-20254950b890}" outlineWidthM="0.3,mm" cornerRadiusMeasure="0,mm" zValue="3" templateUuid="{5e005555-54ea-40fd-a5a7-20254950b890}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -10967,8 +11398,8 @@ def my_form_open(dialog, layer, feature):
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+        <symbol force_rhr="0" name="" clip_to_extent="1" type="fill" alpha="1">
+          <layer pass="0" locked="0" enabled="1" class="SimpleFill">
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
             <prop k="joinstyle" v="miter"/>
@@ -10990,9 +11421,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem frame="true" size="67.7828,166.874,mm" uuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" keepLayerSet="false" position="5.86559,4.09761,mm" type="65639" drawCanvasItems="false" followPresetName="Routes" templateUuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" frameJoinStyle="miter" positionLock="true" background="true" outlineWidthM="0.3,mm" zValue="2" labelMargin="0,mm" followPreset="true" visibility="1" referencePoint="0" opacity="1" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="5.86559,4.09761,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="67.7828,166.874,mm" labelMargin="0,mm" frame="true" mapFlags="0" frameJoinStyle="miter" positionLock="true" id="" background="true" groupUuid="" referencePoint="0" visibility="1" keepLayerSet="false" excludeFromExports="0" itemRotation="0" type="65639" position="5.86559,4.09761,mm" positionOnPage="5.86559,4.09761,mm" mapRotation="0" blendMode="0" drawCanvasItems="false" opacity="1" uuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" outlineWidthM="0.3,mm" followPresetName="Routes" followPreset="true" zValue="2" templateUuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -11034,7 +11465,7 @@ def my_form_open(dialog, layer, feature):
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmax="18.38563681624126289" ymin="-33.94652930000000168" ymax="-33.91513741583252539" xmin="18.37288570000000121"/>
+        <Extent ymax="-33.91513741583252539" xmax="18.38563681624126289" xmin="18.37288570000000121" ymin="-33.94652930000000168"/>
         <crs>
           <spatialrefsys>
             <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
@@ -11048,10 +11479,10 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid offsetY="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" gridFrameWidth="2" frameFillColor1="255,255,255,255" gridStyle="0" bottomFrameDivisions="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" gridFrameMargin="0" leftFrameDivisions="0" rightAnnotationPosition="1" rightAnnotationDirection="0" intervalY="0" frameFillColor2="0,0,0,255" leftAnnotationPosition="1" gridFrameSideFlags="15" topAnnotationDisplay="0" frameAnnotationDistance="1" annotationPrecision="3" offsetX="0" topAnnotationPosition="1" bottomAnnotationDirection="0" show="0" unit="0" rightAnnotationDisplay="0" intervalX="0" annotationFormat="0" gridFrameStyle="0" bottomAnnotationDisplay="0" blendMode="0" position="3" rightFrameDivisions="0" showAnnotation="0" topAnnotationDirection="0" crossLength="3" annotationFontColor="0,0,0,255" leftAnnotationDisplay="0" name="Grid 1" bottomAnnotationPosition="1" annotationExpression="" gridFramePenColor="0,0,0,255" topFrameDivisions="0">
+        <ComposerMapGrid topAnnotationDirection="0" gridFrameMargin="0" bottomAnnotationDirection="0" gridFrameSideFlags="15" annotationFontColor="0,0,0,255" crossLength="3" gridFramePenThickness="0.5" name="Grid 1" leftAnnotationDisplay="0" topFrameDivisions="0" showAnnotation="0" bottomFrameDivisions="0" topAnnotationDisplay="0" frameFillColor2="0,0,0,255" blendMode="0" gridFrameWidth="2" leftAnnotationDirection="0" annotationFormat="0" bottomAnnotationPosition="1" gridFramePenColor="0,0,0,255" annotationPrecision="3" offsetY="0" gridFrameStyle="0" topAnnotationPosition="1" frameFillColor1="255,255,255,255" rightAnnotationDirection="0" rightFrameDivisions="0" show="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" rightAnnotationDisplay="0" annotationExpression="" leftAnnotationPosition="1" unit="0" gridStyle="0" intervalY="0" offsetX="0" rightAnnotationPosition="1" intervalX="0" leftFrameDivisions="0" position="3" bottomAnnotationDisplay="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol name="" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <symbol force_rhr="0" name="" clip_to_extent="1" type="line" alpha="1">
+              <layer pass="0" locked="0" enabled="1" class="SimpleLine">
                 <prop k="capstyle" v="square"/>
                 <prop k="customdash" v="5;2"/>
                 <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -11079,8 +11510,8 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <symbol force_rhr="0" name="" clip_to_extent="1" type="marker" alpha="1">
+              <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
                 <prop k="angle" v="0"/>
                 <prop k="color" v="0,0,0,255"/>
                 <prop k="horizontal_anchor_point" v="1"/>
@@ -11111,12 +11542,12 @@ def my_form_open(dialog, layer, feature):
           </markerStyle>
           <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.05"/>
+        <AtlasMap margin="0.05" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutItem frame="true" size="282.012,175.592,mm" uuid="{b35d820c-6054-4426-a840-5216bed2ca94}" keepLayerSet="false" position="9.44946,9.08557,mm" type="65639" drawCanvasItems="false" followPresetName="Routes" templateUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" frameJoinStyle="round" positionLock="true" background="true" outlineWidthM="0.15,mm" zValue="1" labelMargin="0,mm" followPreset="true" visibility="1" referencePoint="0" opacity="1" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="9.44946,9.08557,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="282.012,175.592,mm" labelMargin="0,mm" frame="true" mapFlags="0" frameJoinStyle="round" positionLock="true" id="" background="true" groupUuid="" referencePoint="0" visibility="1" keepLayerSet="false" excludeFromExports="0" itemRotation="0" type="65639" position="9.44946,9.08557,mm" positionOnPage="9.44946,9.08557,mm" mapRotation="0" blendMode="0" drawCanvasItems="false" opacity="1" uuid="{b35d820c-6054-4426-a840-5216bed2ca94}" outlineWidthM="0.15,mm" followPresetName="Routes" followPreset="true" zValue="1" templateUuid="{b35d820c-6054-4426-a840-5216bed2ca94}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -11143,7 +11574,7 @@ def my_form_open(dialog, layer, feature):
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmax="18.42303507276714569" ymin="-33.92999999999999972" ymax="-33.89697816223931426" xmin="18.37000000000000099"/>
+        <Extent ymax="-33.89697816223931426" xmax="18.42303507276714569" xmin="18.37000000000000099" ymin="-33.92999999999999972"/>
         <crs>
           <spatialrefsys>
             <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
@@ -11157,10 +11588,10 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid offsetY="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFrameWidth="2" frameFillColor1="255,255,255,255" gridStyle="0" bottomFrameDivisions="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" gridFrameMargin="0" leftFrameDivisions="0" rightAnnotationPosition="1" rightAnnotationDirection="0" intervalY="0" frameFillColor2="0,0,0,255" leftAnnotationPosition="1" gridFrameSideFlags="15" topAnnotationDisplay="0" frameAnnotationDistance="1" annotationPrecision="3" offsetX="0" topAnnotationPosition="1" bottomAnnotationDirection="0" show="0" unit="0" rightAnnotationDisplay="0" intervalX="0" annotationFormat="0" gridFrameStyle="0" bottomAnnotationDisplay="0" blendMode="0" position="3" rightFrameDivisions="0" showAnnotation="0" topAnnotationDirection="0" crossLength="3" annotationFontColor="0,0,0,255" leftAnnotationDisplay="0" name="Grid 1" bottomAnnotationPosition="1" annotationExpression="" gridFramePenColor="0,0,0,255" topFrameDivisions="0">
+        <ComposerMapGrid topAnnotationDirection="0" gridFrameMargin="0" bottomAnnotationDirection="0" gridFrameSideFlags="15" annotationFontColor="0,0,0,255" crossLength="3" gridFramePenThickness="0.5" name="Grid 1" leftAnnotationDisplay="0" topFrameDivisions="0" showAnnotation="0" bottomFrameDivisions="0" topAnnotationDisplay="0" frameFillColor2="0,0,0,255" blendMode="0" gridFrameWidth="2" leftAnnotationDirection="0" annotationFormat="0" bottomAnnotationPosition="1" gridFramePenColor="0,0,0,255" annotationPrecision="3" offsetY="0" gridFrameStyle="0" topAnnotationPosition="1" frameFillColor1="255,255,255,255" rightAnnotationDirection="0" rightFrameDivisions="0" show="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rightAnnotationDisplay="0" annotationExpression="" leftAnnotationPosition="1" unit="0" gridStyle="0" intervalY="0" offsetX="0" rightAnnotationPosition="1" intervalX="0" leftFrameDivisions="0" position="3" bottomAnnotationDisplay="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol name="" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <symbol force_rhr="0" name="" clip_to_extent="1" type="line" alpha="1">
+              <layer pass="0" locked="0" enabled="1" class="SimpleLine">
                 <prop k="capstyle" v="square"/>
                 <prop k="customdash" v="5;2"/>
                 <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -11188,8 +11619,8 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <symbol force_rhr="0" name="" clip_to_extent="1" type="marker" alpha="1">
+              <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
                 <prop k="angle" v="0"/>
                 <prop k="color" v="0,0,0,255"/>
                 <prop k="horizontal_anchor_point" v="1"/>
@@ -11220,31 +11651,31 @@ def my_form_open(dialog, layer, feature):
           </markerStyle>
           <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
       </LayoutItem>
       <customproperties>
-        <property key="atlasRasterFormat" value="png"/>
-        <property key="forceVector" value="0"/>
-        <property key="imageAntialias" value="true"/>
-        <property key="imageCropMarginBottom" value="0"/>
-        <property key="imageCropMarginLeft" value="0"/>
-        <property key="imageCropMarginRight" value="0"/>
-        <property key="imageCropMarginTop" value="0"/>
-        <property key="imageCropToContents" value="false"/>
-        <property key="pdfDisableRasterTiles" value="0"/>
-        <property key="pdfIncludeMetadata" value="1"/>
-        <property key="pdfTextFormat" value="0"/>
-        <property key="singleFile" value="true"/>
+        <property value="png" key="atlasRasterFormat"/>
+        <property value="0" key="forceVector"/>
+        <property value="true" key="imageAntialias"/>
+        <property value="0" key="imageCropMarginBottom"/>
+        <property value="0" key="imageCropMarginLeft"/>
+        <property value="0" key="imageCropMarginRight"/>
+        <property value="0" key="imageCropMarginTop"/>
+        <property value="false" key="imageCropToContents"/>
+        <property value="0" key="pdfDisableRasterTiles"/>
+        <property value="1" key="pdfIncludeMetadata"/>
+        <property value="0" key="pdfTextFormat"/>
+        <property value="true" key="singleFile"/>
       </customproperties>
-      <Atlas pageNameExpression="&quot;Distance&quot;" sortAscending="0" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21)' )" coverageLayerProvider="ogr" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" coverageLayerSource="/home/tim/Documents/GunRunMaps/GIS Base Map/all_routes.shp|layername=all_routes" coverageLayerName="all_routes" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortKey="length_m" filterFeatures="1" enabled="1" sortFeatures="1" hideCoverage="0"/>
+      <Atlas pageNameExpression="&quot;Distance&quot;" coverageLayerProvider="ogr" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortFeatures="1" sortAscending="0" enabled="1" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21)' )" sortKey="length_m" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" coverageLayerName="all_routes" filterFeatures="1" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" hideCoverage="0"/>
     </Layout>
-    <Layout units="mm" printResolution="120" name="Marshals" worldFileMap="">
-      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
-      <Grid offsetX="0" resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm"/>
+    <Layout printResolution="120" worldFileMap="" name="Marshals" units="mm">
+      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
+      <Grid offsetUnits="mm" resolution="10" offsetX="0" offsetY="0" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+        <symbol force_rhr="0" name="" clip_to_extent="1" type="fill" alpha="1">
+          <layer pass="0" locked="0" enabled="1" class="SimpleFill">
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
             <prop k="joinstyle" v="miter"/>
@@ -11265,9 +11696,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem frame="false" size="297,210,mm" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" position="0,0,mm" type="65638" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" frameJoinStyle="miter" positionLock="false" background="true" outlineWidthM="0.3,mm" zValue="0" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" excludeFromExports="0" positionOnPage="0,0,mm" itemRotation="0" groupUuid="">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem size="297,210,mm" frame="false" frameJoinStyle="miter" positionLock="false" id="" background="true" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" type="65638" position="0,0,mm" positionOnPage="0,0,mm" blendMode="0" opacity="1" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" outlineWidthM="0.3,mm" zValue="0" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}">
+          <FrameColor green="0" blue="0" alpha="255" red="0"/>
+          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -11281,9 +11712,9 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem boxSpace="2" visibility="1" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" symbolAlignment="1" frameJoinStyle="bevel" title="" wmsLegendHeight="25" itemRotation="0" splitLayer="0" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" equalColumnWidth="1" size="19.9422,26,mm" id="" type="65642" lineSpacing="1" background="true" wrapChar="" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" positionLock="true" excludeFromExports="0" groupUuid="" zValue="5" rasterBorder="1" fontColor="#000000" position="128.239,3.58,mm" blendMode="0" rasterBorderColor="0,0,0,255" positionOnPage="128.239,3.58,mm" referencePoint="0" legendFilterByAtlas="0" opacity="1" frame="true" columnCount="1" titleAlignment="1" columnSpace="2" rasterBorderWidth="0" outlineWidthM="0.1,mm" wmsLegendWidth="50" symbolWidth="7" resizeToContents="1" symbolHeight="4">
-        <FrameColor blue="128" green="128" red="128" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem rasterBorderColor="0,0,0,255" background="true" lineSpacing="1" columnSpace="2" legendFilterByAtlas="0" symbolAlignment="1" blendMode="0" equalColumnWidth="1" symbolWidth="7" titleAlignment="1" id="" columnCount="1" type="65642" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" frameJoinStyle="bevel" visibility="1" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" rasterBorderWidth="0" excludeFromExports="0" splitLayer="0" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" title="" wrapChar="" fontColor="#000000" referencePoint="0" rasterBorder="1" itemRotation="0" wmsLegendHeight="25" size="19.9422,26,mm" wmsLegendWidth="50" resizeToContents="1" zValue="5" positionOnPage="128.239,3.58,mm" symbolHeight="4" opacity="1" positionLock="true" position="128.239,3.58,mm" groupUuid="" outlineWidthM="0.1,mm" frame="true" boxSpace="2">
+        <FrameColor green="128" blue="128" alpha="255" red="128"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -11307,7 +11738,7 @@ def my_form_open(dialog, layer, feature):
           <style marginTop="2" alignment="1" name="symbol">
             <styleFont style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style marginTop="2" alignment="1" name="symbolLabel" marginLeft="2">
+          <style marginTop="2" marginLeft="2" alignment="1" name="symbolLabel">
             <styleFont style="Semibold" description="Myriad Pro,8,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
         </styles>
@@ -11315,21 +11746,21 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
           <layer-tree-group checked="Qt::Checked" name="Routes" expanded="1">
             <customproperties/>
-            <layer-tree-layer checked="Qt::Checked" name="all_routes" expanded="1" id="all_routes20170907054841602">
+            <layer-tree-layer id="all_routes20170907054841602" checked="Qt::Checked" name="all_routes" expanded="1">
               <customproperties>
-                <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"/>
+                <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"/>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem frame="true" size="50.4055,50.7436,mm" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" keepLayerSet="false" position="102.986,142.175,mm" type="65639" drawCanvasItems="false" followPresetName="Marshal map - inset" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" frameJoinStyle="miter" positionLock="true" background="true" outlineWidthM="0.2,mm" zValue="4" labelMargin="0,mm" followPreset="true" visibility="1" referencePoint="0" opacity="1" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="102.986,142.175,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="50.4055,50.7436,mm" labelMargin="0,mm" frame="true" mapFlags="0" frameJoinStyle="miter" positionLock="true" id="" background="true" groupUuid="" referencePoint="0" visibility="1" keepLayerSet="false" excludeFromExports="0" itemRotation="0" type="65639" position="102.986,142.175,mm" positionOnPage="102.986,142.175,mm" mapRotation="0" blendMode="0" drawCanvasItems="false" opacity="1" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" outlineWidthM="0.2,mm" followPresetName="Marshal map - inset" followPreset="true" zValue="4" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -11340,12 +11771,12 @@ def my_form_open(dialog, layer, feature):
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmax="18.40867058941471512" ymin="-33.90511059368537161" ymax="-33.9047436175620831" xmin="18.40830605842002043"/>
+        <Extent ymax="-33.9047436175620831" xmax="18.40867058941471512" xmin="18.40830605842002043" ymin="-33.90511059368537161"/>
         <LayerSet/>
-        <ComposerMapGrid offsetY="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" gridFrameWidth="2" frameFillColor1="255,255,255,255" gridStyle="0" bottomFrameDivisions="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" gridFrameMargin="0" leftFrameDivisions="0" rightAnnotationPosition="1" rightAnnotationDirection="0" intervalY="0" frameFillColor2="0,0,0,255" leftAnnotationPosition="1" gridFrameSideFlags="15" topAnnotationDisplay="0" frameAnnotationDistance="1" annotationPrecision="3" offsetX="0" topAnnotationPosition="1" bottomAnnotationDirection="0" show="0" unit="0" rightAnnotationDisplay="0" intervalX="0" annotationFormat="0" gridFrameStyle="0" bottomAnnotationDisplay="0" blendMode="0" position="3" rightFrameDivisions="0" showAnnotation="0" topAnnotationDirection="0" crossLength="3" annotationFontColor="0,0,0,255" leftAnnotationDisplay="0" name="Grid 1" bottomAnnotationPosition="1" annotationExpression="" gridFramePenColor="0,0,0,255" topFrameDivisions="0">
+        <ComposerMapGrid topAnnotationDirection="0" gridFrameMargin="0" bottomAnnotationDirection="0" gridFrameSideFlags="15" annotationFontColor="0,0,0,255" crossLength="3" gridFramePenThickness="0.5" name="Grid 1" leftAnnotationDisplay="0" topFrameDivisions="0" showAnnotation="0" bottomFrameDivisions="0" topAnnotationDisplay="0" frameFillColor2="0,0,0,255" blendMode="0" gridFrameWidth="2" leftAnnotationDirection="0" annotationFormat="0" bottomAnnotationPosition="1" gridFramePenColor="0,0,0,255" annotationPrecision="3" offsetY="0" gridFrameStyle="0" topAnnotationPosition="1" frameFillColor1="255,255,255,255" rightAnnotationDirection="0" rightFrameDivisions="0" show="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" rightAnnotationDisplay="0" annotationExpression="" leftAnnotationPosition="1" unit="0" gridStyle="0" intervalY="0" offsetX="0" rightAnnotationPosition="1" intervalX="0" leftFrameDivisions="0" position="3" bottomAnnotationDisplay="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol name="" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <symbol force_rhr="0" name="" clip_to_extent="1" type="line" alpha="1">
+              <layer pass="0" locked="0" enabled="1" class="SimpleLine">
                 <prop k="capstyle" v="square"/>
                 <prop k="customdash" v="5;2"/>
                 <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -11373,8 +11804,8 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <symbol force_rhr="0" name="" clip_to_extent="1" type="marker" alpha="1">
+              <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
                 <prop k="angle" v="0"/>
                 <prop k="color" v="0,0,0,255"/>
                 <prop k="horizontal_anchor_point" v="1"/>
@@ -11405,9 +11836,9 @@ def my_form_open(dialog, layer, feature):
           </markerStyle>
           <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <ComposerMapOverview show="1" centered="1" inverted="0" name="Overview 1" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" blendMode="0" position="3">
-          <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+        <ComposerMapOverview centered="1" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" position="3" blendMode="0" name="Overview 1" inverted="0" show="1">
+          <symbol force_rhr="0" name="" clip_to_extent="1" type="fill" alpha="1">
+            <layer pass="0" locked="0" enabled="1" class="SimpleFill">
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="0,65,170,102"/>
               <prop k="joinstyle" v="bevel"/>
@@ -11429,12 +11860,12 @@ def my_form_open(dialog, layer, feature):
             </layer>
           </symbol>
         </ComposerMapOverview>
-        <AtlasMap scalingMode="0" atlasDriven="1" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="1" scalingMode="0"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutItem frame="false" size="142,181,mm" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" keepLayerSet="false" position="3.53,6.0007,mm" type="65639" drawCanvasItems="true" followPresetName="Marshal map - main" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="3" labelMargin="0,mm" followPreset="true" visibility="1" referencePoint="0" opacity="1" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="3.53,6.0007,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="142,181,mm" labelMargin="0,mm" frame="false" mapFlags="0" frameJoinStyle="miter" positionLock="true" id="" background="false" groupUuid="" referencePoint="0" visibility="1" keepLayerSet="false" excludeFromExports="0" itemRotation="0" type="65639" position="3.53,6.0007,mm" positionOnPage="3.53,6.0007,mm" mapRotation="0" blendMode="0" drawCanvasItems="true" opacity="1" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" outlineWidthM="0.3,mm" followPresetName="Marshal map - main" followPreset="true" zValue="3" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -11445,12 +11876,12 @@ def my_form_open(dialog, layer, feature):
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmax="18.41054220300782873" ymin="-33.90754507826720499" ymax="-33.90230913298024973" xmin="18.40643444482690683"/>
+        <Extent ymax="-33.90230913298024973" xmax="18.41054220300782873" xmin="18.40643444482690683" ymin="-33.90754507826720499"/>
         <LayerSet/>
-        <ComposerMapGrid offsetY="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" gridFrameWidth="2" frameFillColor1="255,255,255,255" gridStyle="0" bottomFrameDivisions="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" gridFrameMargin="0" leftFrameDivisions="0" rightAnnotationPosition="1" rightAnnotationDirection="0" intervalY="0" frameFillColor2="0,0,0,255" leftAnnotationPosition="1" gridFrameSideFlags="15" topAnnotationDisplay="0" frameAnnotationDistance="1" annotationPrecision="3" offsetX="0" topAnnotationPosition="1" bottomAnnotationDirection="0" show="0" unit="0" rightAnnotationDisplay="0" intervalX="0" annotationFormat="0" gridFrameStyle="0" bottomAnnotationDisplay="0" blendMode="0" position="3" rightFrameDivisions="0" showAnnotation="0" topAnnotationDirection="0" crossLength="3" annotationFontColor="0,0,0,255" leftAnnotationDisplay="0" name="Grid 1" bottomAnnotationPosition="1" annotationExpression="" gridFramePenColor="0,0,0,255" topFrameDivisions="0">
+        <ComposerMapGrid topAnnotationDirection="0" gridFrameMargin="0" bottomAnnotationDirection="0" gridFrameSideFlags="15" annotationFontColor="0,0,0,255" crossLength="3" gridFramePenThickness="0.5" name="Grid 1" leftAnnotationDisplay="0" topFrameDivisions="0" showAnnotation="0" bottomFrameDivisions="0" topAnnotationDisplay="0" frameFillColor2="0,0,0,255" blendMode="0" gridFrameWidth="2" leftAnnotationDirection="0" annotationFormat="0" bottomAnnotationPosition="1" gridFramePenColor="0,0,0,255" annotationPrecision="3" offsetY="0" gridFrameStyle="0" topAnnotationPosition="1" frameFillColor1="255,255,255,255" rightAnnotationDirection="0" rightFrameDivisions="0" show="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" rightAnnotationDisplay="0" annotationExpression="" leftAnnotationPosition="1" unit="0" gridStyle="0" intervalY="0" offsetX="0" rightAnnotationPosition="1" intervalX="0" leftFrameDivisions="0" position="3" bottomAnnotationDisplay="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol name="" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <symbol force_rhr="0" name="" clip_to_extent="1" type="line" alpha="1">
+              <layer pass="0" locked="0" enabled="1" class="SimpleLine">
                 <prop k="capstyle" v="square"/>
                 <prop k="customdash" v="5;2"/>
                 <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -11478,8 +11909,8 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <symbol force_rhr="0" name="" clip_to_extent="1" type="marker" alpha="1">
+              <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
                 <prop k="angle" v="0"/>
                 <prop k="color" v="0,0,0,255"/>
                 <prop k="horizontal_anchor_point" v="1"/>
@@ -11510,12 +11941,12 @@ def my_form_open(dialog, layer, feature):
           </markerStyle>
           <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="0" atlasDriven="1" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="1" scalingMode="0"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutItem frame="false" size="127.436,159.418,mm" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" sectionHeight="159.418" sectionWidth="127.436" position="277.3,6.0007,mm" hideBackgroundIfEmpty="0" type="65647" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" frameJoinStyle="round" positionLock="true" background="false" sectionX="0" outlineWidthM="0.3,mm" zValue="2" visibility="1" sectionY="0" referencePoint="2" opacity="1" id="" blendMode="0" excludeFromExports="0" positionOnPage="277.3,6.0007,mm" hidePageIfEmpty="0" itemRotation="0" groupUuid="">
-        <FrameColor blue="119" green="119" red="119" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="127.436,159.418,mm" sectionX="0" frame="false" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" frameJoinStyle="round" sectionHeight="159.418" positionLock="true" id="" sectionWidth="127.436" sectionY="0" background="false" groupUuid="" referencePoint="2" visibility="1" hideBackgroundIfEmpty="0" excludeFromExports="0" itemRotation="0" type="65647" position="277.3,6.0007,mm" positionOnPage="277.3,6.0007,mm" blendMode="0" hidePageIfEmpty="0" opacity="1" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" outlineWidthM="0.3,mm" zValue="2" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}">
+        <FrameColor green="119" blue="119" alpha="255" red="119"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -11527,9 +11958,9 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem frame="false" size="47.1065,27.6,mm" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" position="230.194,167.419,mm" type="65640" pictureWidth="27.4317" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" pictureRotation="0" frameJoinStyle="miter" positionLock="true" anchorPoint="0" svgFillColor="255,255,255,255" background="false" resizeMode="0" outlineWidthM="0.3,mm" zValue="1" visibility="1" northMode="0" referencePoint="0" svgBorderWidth="0.2" opacity="1" id="" blendMode="0" northOffset="0" mapUuid="" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo_2018.png" excludeFromExports="0" pictureHeight="27.6" positionOnPage="230.194,167.419,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="47.1065,27.6,mm" northMode="0" frame="false" svgBorderColor="0,0,0,255" frameJoinStyle="miter" svgBorderWidth="0.2" pictureRotation="0" positionLock="true" id="" anchorPoint="0" mapUuid="" background="false" groupUuid="" referencePoint="0" visibility="1" pictureHeight="27.6" svgFillColor="255,255,255,255" excludeFromExports="0" itemRotation="0" type="65640" file="../Gun_Run_Logo_2018.png" position="230.194,167.419,mm" northOffset="0" positionOnPage="230.194,167.419,mm" blendMode="0" opacity="1" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" outlineWidthM="0.3,mm" resizeMode="0" pictureWidth="27.4317" zValue="1" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -11547,7 +11978,7 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutMultiFrame useSmartBreaks="true" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" maxBreakDistance="12" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;tr>&lt;td>Name&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', &quot;csv_name&quot;, '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;/td>&lt;/tr>', '')%]&#xa;&lt;tr>&lt;td>Club&lt;/td>&lt;td>[%csv_club%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%csv_captain%]&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>&lt;b>VOC&lt;/b>&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;tr>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&amp;nbsp;&lt;/td>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain_phone&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;/td>&lt;tr>')%]&#xa;&#xa;&lt;tr>&lt;td>Roger Steward&lt;/td>&lt;td>081 037 3033&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Timothy Allen&lt;/td>&lt;td>072 703 9574&lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please return your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephen Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>" contentMode="1" url="" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" evaluateExpressions="true" type="65648" resizeMode="0" stylesheetEnabled="true">
+      <LayoutMultiFrame evaluateExpressions="true" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;tr>&lt;td>Name&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', &quot;csv_name&quot;, '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;/td>&lt;/tr>', '')%]&#xa;&lt;tr>&lt;td>Club&lt;/td>&lt;td>[%csv_club%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%csv_captain%]&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>&lt;b>VOC&lt;/b>&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;tr>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&amp;nbsp;&lt;/td>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain_phone&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;/td>&lt;tr>')%]&#xa;&#xa;&lt;tr>&lt;td>Roger Steward&lt;/td>&lt;td>081 037 3033&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Timothy Allen&lt;/td>&lt;td>072 703 9574&lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please return your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephen Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>" maxBreakDistance="12" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" useSmartBreaks="true" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" stylesheetEnabled="true" resizeMode="0" type="65648" contentMode="1" url="" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}">
         <childFrame templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}"/>
         <LayoutObject>
           <dataDefinedProperties>
@@ -11561,30 +11992,30 @@ def my_form_open(dialog, layer, feature):
         </LayoutObject>
       </LayoutMultiFrame>
       <customproperties>
-        <property key="atlasRasterFormat" value="jpg"/>
-        <property key="forceVector" value="false"/>
-        <property key="imageAntialias" value="true"/>
-        <property key="imageCropMarginBottom" value="0"/>
-        <property key="imageCropMarginLeft" value="0"/>
-        <property key="imageCropMarginRight" value="0"/>
-        <property key="imageCropMarginTop" value="0"/>
-        <property key="imageCropMarginUnit" value="0"/>
-        <property key="imageCropToContents" value="false"/>
-        <property key="rasterize" value="false"/>
-        <property key="resizeToContentsBottomMargin" value="3.53"/>
-        <property key="resizeToContentsLeftMargin" value="3.53"/>
-        <property key="resizeToContentsRightMargin" value="3.53"/>
-        <property key="resizeToContentsTopMargin" value="3.53"/>
-        <property key="singleFile" value="false"/>
+        <property value="jpg" key="atlasRasterFormat"/>
+        <property value="false" key="forceVector"/>
+        <property value="true" key="imageAntialias"/>
+        <property value="0" key="imageCropMarginBottom"/>
+        <property value="0" key="imageCropMarginLeft"/>
+        <property value="0" key="imageCropMarginRight"/>
+        <property value="0" key="imageCropMarginTop"/>
+        <property value="0" key="imageCropMarginUnit"/>
+        <property value="false" key="imageCropToContents"/>
+        <property value="false" key="rasterize"/>
+        <property value="3.53" key="resizeToContentsBottomMargin"/>
+        <property value="3.53" key="resizeToContentsLeftMargin"/>
+        <property value="3.53" key="resizeToContentsRightMargin"/>
+        <property value="3.53" key="resizeToContentsTopMargin"/>
+        <property value="false" key="singleFile"/>
       </customproperties>
-      <Atlas pageNameExpression="&quot;position&quot;" sortAscending="1" coverageLayer="" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" sortKey="position" filterFeatures="0" enabled="0" sortFeatures="1" hideCoverage="0"/>
+      <Atlas pageNameExpression="&quot;position&quot;" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" sortFeatures="1" sortAscending="1" enabled="0" sortKey="position" coverageLayer="" filterFeatures="0" hideCoverage="0"/>
     </Layout>
-    <Layout units="mm" printResolution="120" name="Marshal Plan" worldFileMap="">
-      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
-      <Grid offsetX="0" resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm"/>
+    <Layout printResolution="120" worldFileMap="" name="Marshal Plan" units="mm">
+      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
+      <Grid offsetUnits="mm" resolution="10" offsetX="0" offsetY="0" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+        <symbol force_rhr="0" name="" clip_to_extent="1" type="fill" alpha="1">
+          <layer pass="0" locked="0" enabled="1" class="SimpleFill">
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
             <prop k="joinstyle" v="miter"/>
@@ -11605,9 +12036,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem frame="false" size="297,420,mm" uuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" position="0,0,mm" type="65638" templateUuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" frameJoinStyle="miter" positionLock="false" background="true" outlineWidthM="0.3,mm" zValue="0" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" excludeFromExports="0" positionOnPage="0,0,mm" itemRotation="0" groupUuid="">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem size="297,420,mm" frame="false" frameJoinStyle="miter" positionLock="false" id="" background="true" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" type="65638" position="0,0,mm" positionOnPage="0,0,mm" blendMode="0" opacity="1" uuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" outlineWidthM="0.3,mm" zValue="0" templateUuid="{b7b60575-1082-47a2-887f-9e62272e9c18}">
+          <FrameColor green="0" blue="0" alpha="255" red="0"/>
+          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -11621,9 +12052,9 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem boxSpace="2" visibility="1" uuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" symbolAlignment="1" frameJoinStyle="miter" title="" wmsLegendHeight="25" itemRotation="0" splitLayer="0" templateUuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" equalColumnWidth="1" size="18.6109,9,mm" id="" type="65642" lineSpacing="1" background="true" wrapChar="" map_uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" positionLock="true" excludeFromExports="0" groupUuid="" zValue="8" rasterBorder="1" fontColor="#000000" position="15.6525,12.5708,mm" blendMode="0" rasterBorderColor="0,0,0,255" positionOnPage="15.6525,12.5708,mm" referencePoint="0" legendFilterByAtlas="0" opacity="1" frame="false" columnCount="1" titleAlignment="1" columnSpace="2" rasterBorderWidth="0" outlineWidthM="0.3,mm" wmsLegendWidth="50" symbolWidth="7" resizeToContents="1" symbolHeight="4">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem rasterBorderColor="0,0,0,255" background="true" lineSpacing="1" columnSpace="2" legendFilterByAtlas="0" symbolAlignment="1" blendMode="0" equalColumnWidth="1" symbolWidth="7" titleAlignment="1" id="" columnCount="1" type="65642" templateUuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" frameJoinStyle="miter" visibility="1" map_uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" rasterBorderWidth="0" excludeFromExports="0" splitLayer="0" uuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" title="" wrapChar="" fontColor="#000000" referencePoint="0" rasterBorder="1" itemRotation="0" wmsLegendHeight="25" size="18.6109,9,mm" wmsLegendWidth="50" resizeToContents="1" zValue="8" positionOnPage="15.6525,12.5708,mm" symbolHeight="4" opacity="1" positionLock="true" position="15.6525,12.5708,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" boxSpace="2">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -11647,7 +12078,7 @@ def my_form_open(dialog, layer, feature):
           <style marginTop="2" alignment="1" name="symbol">
             <styleFont style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style marginTop="2" alignment="1" name="symbolLabel" marginLeft="2">
+          <style marginTop="2" marginLeft="2" alignment="1" name="symbolLabel">
             <styleFont style="Semibold" description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
         </styles>
@@ -11655,21 +12086,21 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
           <layer-tree-group checked="Qt::Checked" name="Routes" expanded="1">
             <customproperties/>
-            <layer-tree-layer checked="Qt::Checked" name="all_routes" expanded="1" id="all_routes20170907054841602">
+            <layer-tree-layer id="all_routes20170907054841602" checked="Qt::Checked" name="all_routes" expanded="1">
               <customproperties>
-                <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"/>
+                <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"/>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem frame="false" size="45.1194,7.36972,mm" uuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" marginX="1" position="5.69321,399.106,mm" type="65641" valign="64" templateUuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="7" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="MARSHAL POSITIONS" excludeFromExports="0" positionOnPage="5.69321,399.106,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="45.1194,7.36972,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="true" id="" labelText="MARSHAL POSITIONS" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="1" valign="64" type="65641" position="5.69321,399.106,mm" marginY="1" positionOnPage="5.69321,399.106,mm" htmlState="0" blendMode="0" opacity="1" uuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" outlineWidthM="0.3,mm" zValue="7" templateUuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -11681,11 +12112,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Semibold" description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="16.2476,7.80192,mm" uuid="{619c5aac-2a47-4730-9726-57b172205ef7}" marginX="1" position="5.69321,406.988,mm" type="65641" valign="32" templateUuid="{619c5aac-2a47-4730-9726-57b172205ef7}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="6" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="Page [% &quot;page&quot; %]" excludeFromExports="0" positionOnPage="5.69321,406.988,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="16.2476,7.80192,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="true" id="" labelText="Page [% &quot;page&quot; %]" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="1" valign="32" type="65641" position="5.69321,406.988,mm" marginY="1" positionOnPage="5.69321,406.988,mm" htmlState="0" blendMode="0" opacity="1" uuid="{619c5aac-2a47-4730-9726-57b172205ef7}" outlineWidthM="0.3,mm" zValue="6" templateUuid="{619c5aac-2a47-4730-9726-57b172205ef7}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -11697,11 +12128,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="27.7839,7.51682,mm" uuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" marginX="1" position="214.292,406.988,mm" type="65641" valign="32" templateUuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="5" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="REVISION 1.1" excludeFromExports="0" positionOnPage="214.292,406.988,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="27.7839,7.51682,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="true" id="" labelText="REVISION 1.1" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="2" valign="32" type="65641" position="214.292,406.988,mm" marginY="1" positionOnPage="214.292,406.988,mm" htmlState="0" blendMode="0" opacity="1" uuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" outlineWidthM="0.3,mm" zValue="5" templateUuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -11713,11 +12144,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="56.3557,7.36902,mm" uuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" marginX="1" position="185.72,399.107,mm" type="65641" valign="64" templateUuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="4" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="Sunday, 20 October 2019" excludeFromExports="0" positionOnPage="185.72,399.107,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="56.3557,7.36902,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="true" id="" labelText="Sunday, 20 October 2019" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="2" valign="64" type="65641" position="185.72,399.107,mm" marginY="1" positionOnPage="185.72,399.107,mm" htmlState="0" blendMode="0" opacity="1" uuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" outlineWidthM="0.3,mm" zValue="4" templateUuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -11729,11 +12160,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="49.3143,31.2967,mm" uuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" position="243.319,382.696,mm" type="65640" pictureWidth="49.3143" templateUuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" pictureRotation="0" frameJoinStyle="miter" positionLock="true" anchorPoint="8" svgFillColor="255,255,255,255" background="false" resizeMode="0" outlineWidthM="0.3,mm" zValue="3" visibility="1" northMode="0" referencePoint="0" svgBorderWidth="0.2" opacity="1" id="" blendMode="0" northOffset="0" mapUuid="" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" excludeFromExports="0" pictureHeight="28.8527" positionOnPage="243.319,382.696,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="49.3143,31.2967,mm" northMode="0" frame="false" svgBorderColor="0,0,0,255" frameJoinStyle="miter" svgBorderWidth="0.2" pictureRotation="0" positionLock="true" id="" anchorPoint="8" mapUuid="" background="false" groupUuid="" referencePoint="0" visibility="1" pictureHeight="28.8527" svgFillColor="255,255,255,255" excludeFromExports="0" itemRotation="0" type="65640" file="../Gun_Run_Logo.png" position="243.319,382.696,mm" northOffset="0" positionOnPage="243.319,382.696,mm" blendMode="0" opacity="1" uuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" outlineWidthM="0.3,mm" resizeMode="0" pictureWidth="49.3143" zValue="3" templateUuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -11751,9 +12182,9 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem frame="false" size="236.083,0.14328,mm" uuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" position="5.84321,406.626,mm" type="65643" templateUuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="2" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" cornerRadiusMeasure="0,mm" excludeFromExports="0" shapeType="1" positionOnPage="5.84321,406.626,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="236.083,0.14328,mm" frame="false" frameJoinStyle="miter" shapeType="1" positionLock="true" id="" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" type="65643" position="5.84321,406.626,mm" positionOnPage="5.84321,406.626,mm" blendMode="0" opacity="1" uuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" outlineWidthM="0.3,mm" cornerRadiusMeasure="0,mm" zValue="2" templateUuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -11764,8 +12195,8 @@ def my_form_open(dialog, layer, feature):
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+        <symbol force_rhr="0" name="" clip_to_extent="1" type="fill" alpha="1">
+          <layer pass="0" locked="0" enabled="1" class="SimpleFill">
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
             <prop k="joinstyle" v="miter"/>
@@ -11787,9 +12218,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem frame="false" size="286.94,392.396,mm" uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" keepLayerSet="false" position="5.03,5.9483,mm" type="65639" drawCanvasItems="false" followPresetName="Marshal overview" templateUuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" frameJoinStyle="miter" positionLock="true" background="true" outlineWidthM="0.3,mm" zValue="1" labelMargin="0,mm" followPreset="true" visibility="1" referencePoint="0" opacity="1" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="5.03,5.9483,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="286.94,392.396,mm" labelMargin="0,mm" frame="false" mapFlags="0" frameJoinStyle="miter" positionLock="true" id="" background="true" groupUuid="" referencePoint="0" visibility="1" keepLayerSet="false" excludeFromExports="0" itemRotation="0" type="65639" position="5.03,5.9483,mm" positionOnPage="5.03,5.9483,mm" mapRotation="0" blendMode="0" drawCanvasItems="false" opacity="1" uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" outlineWidthM="0.3,mm" followPresetName="Marshal overview" followPreset="true" zValue="1" templateUuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -11816,26 +12247,26 @@ def my_form_open(dialog, layer, feature):
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmax="18.42124635930919041" ymin="-33.91857233280978789" ymax="-33.89547273009495854" xmin="18.4043547521658617"/>
+        <Extent ymax="-33.89547273009495854" xmax="18.42124635930919041" xmin="18.4043547521658617" ymin="-33.91857233280978789"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" atlasDriven="1" margin="0"/>
+        <AtlasMap margin="0" atlasDriven="1" scalingMode="2"/>
         <labelBlockingItems/>
       </LayoutItem>
       <customproperties>
-        <property key="atlasRasterFormat" value="png"/>
-        <property key="forceVector" value="0"/>
-        <property key="pdfDisableRasterTiles" value="0"/>
-        <property key="pdfIncludeMetadata" value="1"/>
-        <property key="pdfTextFormat" value="0"/>
+        <property value="png" key="atlasRasterFormat"/>
+        <property value="0" key="forceVector"/>
+        <property value="0" key="pdfDisableRasterTiles"/>
+        <property value="1" key="pdfIncludeMetadata"/>
+        <property value="0" key="pdfTextFormat"/>
       </customproperties>
-      <Atlas pageNameExpression="&quot;page&quot;" sortAscending="1" coverageLayerProvider="ogr" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" coverageLayerSource="/home/tim/Documents/GunRunMaps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" coverageLayerName="marshal_overviews" filenamePattern="'output_'||@atlas_featurenumber" sortKey="page" filterFeatures="0" enabled="1" sortFeatures="1" hideCoverage="1"/>
+      <Atlas pageNameExpression="&quot;page&quot;" coverageLayerProvider="ogr" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1" sortAscending="1" enabled="1" sortKey="page" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" coverageLayerName="marshal_overviews" filterFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" hideCoverage="1"/>
     </Layout>
-    <Layout units="mm" printResolution="300" name="Start &amp; Finish Backgrounds" worldFileMap="">
-      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
-      <Grid offsetX="0" resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm"/>
+    <Layout printResolution="300" worldFileMap="" name="Start &amp; Finish Backgrounds" units="mm">
+      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
+      <Grid offsetUnits="mm" resolution="10" offsetX="0" offsetY="0" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+        <symbol force_rhr="0" name="" clip_to_extent="1" type="fill" alpha="1">
+          <layer pass="0" locked="0" enabled="1" class="SimpleFill">
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
             <prop k="joinstyle" v="miter"/>
@@ -11856,9 +12287,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem frame="false" size="297,210,mm" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" position="0,0,mm" type="65638" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" frameJoinStyle="miter" positionLock="false" background="true" outlineWidthM="0.3,mm" zValue="0" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" excludeFromExports="0" positionOnPage="0,0,mm" itemRotation="0" groupUuid="">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem size="297,210,mm" frame="false" frameJoinStyle="miter" positionLock="false" id="" background="true" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" type="65638" position="0,0,mm" positionOnPage="0,0,mm" blendMode="0" opacity="1" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" outlineWidthM="0.3,mm" zValue="0" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}">
+          <FrameColor green="0" blue="0" alpha="255" red="0"/>
+          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -11872,9 +12303,9 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem frame="false" size="9.45865,11,mm" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" position="286.027,2,mm" type="65640" pictureWidth="6.31767" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" pictureRotation="330" frameJoinStyle="miter" positionLock="true" anchorPoint="0" svgFillColor="255,255,255,255" background="false" resizeMode="0" outlineWidthM="0.3,mm" zValue="4" visibility="1" northMode="0" referencePoint="0" svgBorderWidth="0.2" opacity="1" id="" blendMode="0" northOffset="0" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" svgBorderColor="0,0,0,255" file="arrows/NorthArrow_11.svg" excludeFromExports="0" pictureHeight="7.97477" positionOnPage="286.027,2,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="9.45865,11,mm" northMode="0" frame="false" svgBorderColor="0,0,0,255" frameJoinStyle="miter" svgBorderWidth="0.2" pictureRotation="330" positionLock="true" id="" anchorPoint="0" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" background="false" groupUuid="" referencePoint="0" visibility="1" pictureHeight="7.97477" svgFillColor="255,255,255,255" excludeFromExports="0" itemRotation="0" type="65640" file="arrows/NorthArrow_11.svg" position="286.027,2,mm" northOffset="0" positionOnPage="286.027,2,mm" blendMode="0" opacity="1" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" outlineWidthM="0.3,mm" resizeMode="0" pictureWidth="6.31767" zValue="4" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -11892,9 +12323,9 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem frame="false" size="142.543,10.3185,mm" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" marginX="1" position="285.027,205.886,mm" type="65641" valign="64" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="3" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="[%upper( &quot;area&quot; )%]" excludeFromExports="0" positionOnPage="285.027,205.886,mm" itemRotation="270" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="142.543,10.3185,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="true" id="" labelText="[%upper( &quot;area&quot; )%]" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="270" halign="1" valign="64" type="65641" position="285.027,205.886,mm" marginY="1" positionOnPage="285.027,205.886,mm" htmlState="0" blendMode="0" opacity="1" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" outlineWidthM="0.3,mm" zValue="3" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -11906,11 +12337,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem lineJoinStyle="miter" visibility="1" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" height="3" style="Single Box" frameJoinStyle="miter" numUnitsPerSegment="90" segmentSizeMode="1" itemRotation="0" outlineWidth="0.3" lineCapStyle="square" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" boxContentSpace="1" size="155.102,16.2165,mm" id="" type="65646" background="false" segmentMillimeters="28.5458" labelBarSpace="3" numSegments="4" positionLock="true" excludeFromExports="0" groupUuid="" maxBarWidth="150" numMapUnitsPerScaleBarUnit="1" zValue="2" alignment="0" unitType="meters" unitLabel="m" position="7,189.669,mm" blendMode="0" positionOnPage="7,189.669,mm" referencePoint="0" opacity="1" frame="false" numSegmentsLeft="2" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" outlineWidthM="0.3,mm" minBarWidth="50">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem background="false" segmentMillimeters="28.5458" unitType="meters" numMapUnitsPerScaleBarUnit="1" alignment="0" labelBarSpace="3" outlineWidth="0.3" blendMode="0" numSegments="4" id="" minBarWidth="50" type="65646" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" lineCapStyle="square" frameJoinStyle="miter" visibility="1" excludeFromExports="0" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" referencePoint="0" segmentSizeMode="1" itemRotation="0" size="155.102,16.2165,mm" lineJoinStyle="miter" maxBarWidth="150" zValue="2" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" unitLabel="m" boxContentSpace="1" positionOnPage="7,189.669,mm" opacity="1" positionLock="true" numSegmentsLeft="2" style="Single Box" position="7,189.669,mm" groupUuid="" outlineWidthM="0.3,mm" numUnitsPerSegment="90" frame="false" height="3">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -11921,18 +12352,18 @@ def my_form_open(dialog, layer, feature):
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontItalic="0" fontStrikeout="0" fontFamily="Myriad Pro" textOpacity="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" fontSizeUnit="Point" fontWeight="50" namedStyle="" fontCapitals="0" fontSize="12" fontUnderline="0" fontLetterSpacing="0" blendMode="0" multilineHeight="1">
-          <text-buffer bufferOpacity="1" bufferNoFill="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="0" shapeRotationType="0" shapeSizeX="0" shapeRadiiX="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-          <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+        <text-style fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" textOpacity="1" fontFamily="Myriad Pro" namedStyle="" fontSizeUnit="Point" textColor="0,0,0,255" blendMode="0" fontWordSpacing="0" fontCapitals="0" fontLetterSpacing="0" multilineHeight="1" fontSize="12" fontWeight="50">
+          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiY="0" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeDraw="0" shapeOpacity="1" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="0" shapeRadiiX="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
         </text-style>
-        <fillColor blue="0" green="0" red="0" alpha="255"/>
-        <fillColor2 blue="255" green="255" red="255" alpha="255"/>
-        <strokeColor blue="0" green="0" red="0" alpha="255"/>
+        <fillColor green="0" blue="0" alpha="255" red="0"/>
+        <fillColor2 green="255" blue="255" alpha="255" red="255"/>
+        <strokeColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="278.027,180.318,mm" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" keepLayerSet="false" position="7,5.5,mm" type="65639" drawCanvasItems="false" followPresetName="Start/Finish" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="1" labelMargin="0,mm" followPreset="true" visibility="1" referencePoint="0" opacity="1" mapRotation="330" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="7,5.5,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="278.027,180.318,mm" labelMargin="0,mm" frame="false" mapFlags="0" frameJoinStyle="miter" positionLock="true" id="" background="false" groupUuid="" referencePoint="0" visibility="1" keepLayerSet="false" excludeFromExports="0" itemRotation="0" type="65639" position="7,5.5,mm" positionOnPage="7,5.5,mm" mapRotation="330" blendMode="0" drawCanvasItems="false" opacity="1" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" outlineWidthM="0.3,mm" followPresetName="Start/Finish" followPreset="true" zValue="1" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -11959,12 +12390,12 @@ def my_form_open(dialog, layer, feature):
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmax="18.41790915398017958" ymin="-33.90494830469008747" ymax="-33.89880140828828559" xmin="18.40843143571575169"/>
+        <Extent ymax="-33.89880140828828559" xmax="18.41790915398017958" xmin="18.40843143571575169" ymin="-33.90494830469008747"/>
         <LayerSet/>
-        <ComposerMapGrid offsetY="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" gridFrameWidth="2" frameFillColor1="255,255,255,255" gridStyle="0" bottomFrameDivisions="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" gridFrameMargin="0" leftFrameDivisions="0" rightAnnotationPosition="1" rightAnnotationDirection="0" intervalY="5" frameFillColor2="0,0,0,255" leftAnnotationPosition="1" gridFrameSideFlags="15" topAnnotationDisplay="3" frameAnnotationDistance="1" annotationPrecision="3" offsetX="0" topAnnotationPosition="1" bottomAnnotationDirection="0" show="0" unit="1" rightAnnotationDisplay="3" intervalX="5" annotationFormat="4" gridFrameStyle="0" bottomAnnotationDisplay="3" blendMode="0" position="3" rightFrameDivisions="0" showAnnotation="0" topAnnotationDirection="0" crossLength="3" annotationFontColor="0,0,0,255" leftAnnotationDisplay="3" name="Grid 1" bottomAnnotationPosition="1" annotationExpression="" gridFramePenColor="0,0,0,255" topFrameDivisions="0">
+        <ComposerMapGrid topAnnotationDirection="0" gridFrameMargin="0" bottomAnnotationDirection="0" gridFrameSideFlags="15" annotationFontColor="0,0,0,255" crossLength="3" gridFramePenThickness="0.5" name="Grid 1" leftAnnotationDisplay="3" topFrameDivisions="0" showAnnotation="0" bottomFrameDivisions="0" topAnnotationDisplay="3" frameFillColor2="0,0,0,255" blendMode="0" gridFrameWidth="2" leftAnnotationDirection="0" annotationFormat="4" bottomAnnotationPosition="1" gridFramePenColor="0,0,0,255" annotationPrecision="3" offsetY="0" gridFrameStyle="0" topAnnotationPosition="1" frameFillColor1="255,255,255,255" rightAnnotationDirection="0" rightFrameDivisions="0" show="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" rightAnnotationDisplay="3" annotationExpression="" leftAnnotationPosition="1" unit="1" gridStyle="0" intervalY="5" offsetX="0" rightAnnotationPosition="1" intervalX="5" leftFrameDivisions="0" position="3" bottomAnnotationDisplay="3" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol name="" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <symbol force_rhr="0" name="" clip_to_extent="1" type="line" alpha="1">
+              <layer pass="0" locked="0" enabled="1" class="SimpleLine">
                 <prop k="capstyle" v="square"/>
                 <prop k="customdash" v="5;2"/>
                 <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -11992,8 +12423,8 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <symbol force_rhr="0" name="" clip_to_extent="1" type="marker" alpha="1">
+              <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
                 <prop k="angle" v="0"/>
                 <prop k="color" v="0,0,0,255"/>
                 <prop k="horizontal_anchor_point" v="1"/>
@@ -12034,40 +12465,40 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
           <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" atlasDriven="1" margin="0.05"/>
+        <AtlasMap margin="0.05" atlasDriven="1" scalingMode="2"/>
         <labelBlockingItems/>
       </LayoutItem>
       <customproperties>
-        <property key="atlasRasterFormat" value="png"/>
-        <property key="forceVector" value="0"/>
-        <property key="imageAntialias" value="true"/>
-        <property key="imageCropMarginBottom" value="0"/>
-        <property key="imageCropMarginLeft" value="0"/>
-        <property key="imageCropMarginRight" value="0"/>
-        <property key="imageCropMarginTop" value="0"/>
-        <property key="imageCropToContents" value="false"/>
-        <property key="pdfDisableRasterTiles" value="0"/>
-        <property key="pdfIncludeMetadata" value="1"/>
-        <property key="pdfTextFormat" value="0"/>
-        <property key="singleFile" value="true"/>
-        <property key="svgCropMarginBottom" value="0"/>
-        <property key="svgCropMarginLeft" value="0"/>
-        <property key="svgCropMarginRight" value="0"/>
-        <property key="svgCropMarginTop" value="0"/>
-        <property key="svgCropToContents" value="true"/>
-        <property key="svgDisableRasterTiles" value="0"/>
-        <property key="svgGroupLayers" value="false"/>
-        <property key="svgIncludeMetadata" value="1"/>
-        <property key="svgTextFormat" value="0"/>
+        <property value="png" key="atlasRasterFormat"/>
+        <property value="0" key="forceVector"/>
+        <property value="true" key="imageAntialias"/>
+        <property value="0" key="imageCropMarginBottom"/>
+        <property value="0" key="imageCropMarginLeft"/>
+        <property value="0" key="imageCropMarginRight"/>
+        <property value="0" key="imageCropMarginTop"/>
+        <property value="false" key="imageCropToContents"/>
+        <property value="0" key="pdfDisableRasterTiles"/>
+        <property value="1" key="pdfIncludeMetadata"/>
+        <property value="0" key="pdfTextFormat"/>
+        <property value="true" key="singleFile"/>
+        <property value="0" key="svgCropMarginBottom"/>
+        <property value="0" key="svgCropMarginLeft"/>
+        <property value="0" key="svgCropMarginRight"/>
+        <property value="0" key="svgCropMarginTop"/>
+        <property value="true" key="svgCropToContents"/>
+        <property value="0" key="svgDisableRasterTiles"/>
+        <property value="false" key="svgGroupLayers"/>
+        <property value="1" key="svgIncludeMetadata"/>
+        <property value="0" key="svgTextFormat"/>
       </customproperties>
-      <Atlas pageNameExpression="&quot;area&quot;" sortAscending="1" coverageLayerProvider="ogr" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" coverageLayerSource="/home/tim/Documents/GunRunMaps/GIS Base Map/start_finish_area.shp" coverageLayerName="start_finish_area" filenamePattern="'output_'||@atlas_featurenumber" sortKey="area" filterFeatures="0" enabled="1" sortFeatures="1" hideCoverage="1"/>
+      <Atlas pageNameExpression="&quot;area&quot;" coverageLayerProvider="ogr" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1" sortAscending="1" enabled="1" sortKey="area" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" coverageLayerName="start_finish_area" filterFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/start_finish_area.shp" hideCoverage="1"/>
     </Layout>
-    <Layout units="mm" printResolution="300" name="Fencing" worldFileMap="">
-      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
-      <Grid offsetX="0" resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm"/>
+    <Layout printResolution="300" worldFileMap="" name="Fencing" units="mm">
+      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
+      <Grid offsetUnits="mm" resolution="10" offsetX="0" offsetY="0" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+        <symbol force_rhr="0" name="" clip_to_extent="1" type="fill" alpha="1">
+          <layer pass="0" locked="0" enabled="1" class="SimpleFill">
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
             <prop k="joinstyle" v="miter"/>
@@ -12088,9 +12519,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem frame="false" size="297,210,mm" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" position="0,0,mm" type="65638" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" frameJoinStyle="miter" positionLock="false" background="true" outlineWidthM="0.3,mm" zValue="0" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" excludeFromExports="0" positionOnPage="0,0,mm" itemRotation="0" groupUuid="">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem size="297,210,mm" frame="false" frameJoinStyle="miter" positionLock="false" id="" background="true" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" type="65638" position="0,0,mm" positionOnPage="0,0,mm" blendMode="0" opacity="1" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" outlineWidthM="0.3,mm" zValue="0" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}">
+          <FrameColor green="0" blue="0" alpha="255" red="0"/>
+          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -12104,9 +12535,9 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem frame="false" size="148.46,7.36972,mm" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" marginX="1" position="6.76779,190.27,mm" type="65641" valign="64" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="11" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="FENCING: [% &quot;name&quot; %]" excludeFromExports="0" positionOnPage="6.76779,190.27,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="148.46,7.36972,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="true" id="" labelText="FENCING: [% &quot;name&quot; %]" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="1" valign="64" type="65641" position="6.76779,190.27,mm" marginY="1" positionOnPage="6.76779,190.27,mm" htmlState="0" blendMode="0" opacity="1" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" outlineWidthM="0.3,mm" zValue="11" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12118,11 +12549,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Semibold" description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="27.7839,7.51682,mm" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" marginX="1" position="211.295,197.64,mm" type="65641" valign="32" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="10" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="REVISION 2.3" excludeFromExports="0" positionOnPage="211.295,197.64,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="27.7839,7.51682,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="true" id="" labelText="REVISION 2.3" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="2" valign="32" type="65641" position="211.295,197.64,mm" marginY="1" positionOnPage="211.295,197.64,mm" htmlState="0" blendMode="0" opacity="1" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" outlineWidthM="0.3,mm" zValue="10" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12134,11 +12565,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="67.0856,7.80192,mm" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" marginX="1" position="115.637,198.083,mm" type="65641" valign="32" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="9" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="Total cones: [% &quot;cone_length&quot; %]m" excludeFromExports="0" positionOnPage="115.637,198.083,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="67.0856,7.80192,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="true" id="" labelText="Total cones: [% &quot;cone_length&quot; %]m" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="1" valign="32" type="65641" position="115.637,198.083,mm" marginY="1" positionOnPage="115.637,198.083,mm" htmlState="0" blendMode="0" opacity="1" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" outlineWidthM="0.3,mm" zValue="9" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12150,11 +12581,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="53.0017,7.80192,mm" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" marginX="1" position="59.5581,198.083,mm" type="65641" valign="32" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="8" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="Total fencing: [% &quot;fence_length&quot; %]m" excludeFromExports="0" positionOnPage="59.5581,198.083,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="53.0017,7.80192,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="true" id="" labelText="Total fencing: [% &quot;fence_length&quot; %]m" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="1" valign="32" type="65641" position="59.5581,198.083,mm" marginY="1" positionOnPage="59.5581,198.083,mm" htmlState="0" blendMode="0" opacity="1" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" outlineWidthM="0.3,mm" zValue="8" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12166,11 +12597,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="52.7903,7.80192,mm" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" marginX="1" position="6.76779,198.083,mm" type="65641" valign="32" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="7" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="Page [% @atlas_featurenumber %]" excludeFromExports="0" positionOnPage="6.76779,198.083,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="52.7903,7.80192,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="true" id="" labelText="Page [% @atlas_featurenumber %]" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="1" valign="32" type="65641" position="6.76779,198.083,mm" marginY="1" positionOnPage="6.76779,198.083,mm" htmlState="0" blendMode="0" opacity="1" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" outlineWidthM="0.3,mm" zValue="7" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12182,11 +12613,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="49.3143,29.8354,mm" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" position="243.098,175.353,mm" type="65640" pictureWidth="49.3143" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" pictureRotation="0" frameJoinStyle="miter" positionLock="true" anchorPoint="8" svgFillColor="255,255,255,255" background="false" resizeMode="0" outlineWidthM="0.3,mm" zValue="6" visibility="1" northMode="0" referencePoint="0" svgBorderWidth="0.2" opacity="1" id="" blendMode="0" northOffset="0" mapUuid="" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" excludeFromExports="0" pictureHeight="28.8527" positionOnPage="243.098,175.353,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="49.3143,29.8354,mm" northMode="0" frame="false" svgBorderColor="0,0,0,255" frameJoinStyle="miter" svgBorderWidth="0.2" pictureRotation="0" positionLock="true" id="" anchorPoint="8" mapUuid="" background="false" groupUuid="" referencePoint="0" visibility="1" pictureHeight="28.8527" svgFillColor="255,255,255,255" excludeFromExports="0" itemRotation="0" type="65640" file="../Gun_Run_Logo.png" position="243.098,175.353,mm" northOffset="0" positionOnPage="243.098,175.353,mm" blendMode="0" opacity="1" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" outlineWidthM="0.3,mm" resizeMode="0" pictureWidth="49.3143" zValue="6" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12204,9 +12635,9 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem frame="false" size="56.3557,7.36902,mm" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" marginX="1" position="182.723,190.271,mm" type="65641" valign="64" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="5" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="Sunday, 20 October 2019" excludeFromExports="0" positionOnPage="182.723,190.271,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="56.3557,7.36902,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="true" id="" labelText="Sunday, 20 October 2019" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="2" valign="64" type="65641" position="182.723,190.271,mm" marginY="1" positionOnPage="182.723,190.271,mm" htmlState="0" blendMode="0" opacity="1" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" outlineWidthM="0.3,mm" zValue="5" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12218,11 +12649,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="232.01,0.14328,mm" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" position="6.91779,197.79,mm" type="65643" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="4" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" cornerRadiusMeasure="0,mm" excludeFromExports="0" shapeType="1" positionOnPage="6.91779,197.79,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="232.01,0.14328,mm" frame="false" frameJoinStyle="miter" shapeType="1" positionLock="true" id="" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" type="65643" position="6.91779,197.79,mm" positionOnPage="6.91779,197.79,mm" blendMode="0" opacity="1" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" outlineWidthM="0.3,mm" cornerRadiusMeasure="0,mm" zValue="4" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12233,8 +12664,8 @@ def my_form_open(dialog, layer, feature):
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+        <symbol force_rhr="0" name="" clip_to_extent="1" type="fill" alpha="1">
+          <layer pass="0" locked="0" enabled="1" class="SimpleFill">
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
             <prop k="joinstyle" v="miter"/>
@@ -12256,9 +12687,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem lineJoinStyle="round" visibility="1" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" height="2" style="Double Box" frameJoinStyle="miter" numUnitsPerSegment="50" segmentSizeMode="1" itemRotation="0" outlineWidth="0.2" lineCapStyle="square" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" boxContentSpace="0.2" size="109.429,15.8378,mm" id="" type="65646" background="false" segmentMillimeters="32.9517" labelBarSpace="1" numSegments="2" positionLock="true" excludeFromExports="0" groupUuid="" maxBarWidth="100" numMapUnitsPerScaleBarUnit="1" zValue="3" alignment="0" unitType="meters" unitLabel="m" position="6.76779,2.8482,mm" blendMode="0" positionOnPage="6.76779,2.8482,mm" referencePoint="0" opacity="1" frame="false" numSegmentsLeft="2" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" outlineWidthM="0.3,mm" minBarWidth="25">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem background="false" segmentMillimeters="28.6552" unitType="meters" numMapUnitsPerScaleBarUnit="1" alignment="0" labelBarSpace="1" outlineWidth="0.2" blendMode="0" numSegments="2" id="" minBarWidth="25" type="65646" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" lineCapStyle="square" frameJoinStyle="miter" visibility="1" excludeFromExports="0" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" referencePoint="0" segmentSizeMode="1" itemRotation="0" size="97.6157,15.8378,mm" lineJoinStyle="round" maxBarWidth="100" zValue="3" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" unitLabel="m" boxContentSpace="0.2" positionOnPage="6.76779,2.8482,mm" opacity="1" positionLock="true" numSegmentsLeft="2" style="Double Box" position="6.76779,2.8482,mm" groupUuid="" outlineWidthM="0.3,mm" numUnitsPerSegment="400" frame="false" height="2">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12269,18 +12700,18 @@ def my_form_open(dialog, layer, feature):
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontItalic="0" fontStrikeout="0" fontFamily="Myriad Pro" textOpacity="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" fontSizeUnit="Point" fontWeight="50" namedStyle="" fontCapitals="0" fontSize="12" fontUnderline="0" fontLetterSpacing="0" blendMode="0" multilineHeight="1">
-          <text-buffer bufferOpacity="1" bufferNoFill="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="0" shapeRotationType="0" shapeSizeX="0" shapeRadiiX="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-          <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+        <text-style fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" textOpacity="1" fontFamily="Myriad Pro" namedStyle="" fontSizeUnit="Point" textColor="0,0,0,255" blendMode="0" fontWordSpacing="0" fontCapitals="0" fontLetterSpacing="0" multilineHeight="1" fontSize="12" fontWeight="50">
+          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiY="0" shapeSVGFile="" shapeSizeType="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeDraw="0" shapeOpacity="1" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetX="0" shapeBlendMode="0" shapeSizeY="0" shapeRadiiX="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
         </text-style>
-        <fillColor blue="0" green="0" red="0" alpha="255"/>
-        <fillColor2 blue="255" green="255" red="255" alpha="255"/>
-        <strokeColor blue="0" green="0" red="0" alpha="255"/>
+        <fillColor green="0" blue="0" alpha="255" red="0"/>
+        <fillColor2 green="255" blue="255" alpha="255" red="255"/>
+        <strokeColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem boxSpace="2" visibility="1" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" symbolAlignment="1" frameJoinStyle="miter" title="" wmsLegendHeight="25" itemRotation="0" splitLayer="0" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" equalColumnWidth="1" size="38.1563,54.9504,mm" id="" type="65642" lineSpacing="1" background="true" wrapChar="" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" positionLock="true" excludeFromExports="0" groupUuid="" zValue="2" rasterBorder="1" fontColor="#000000" position="256.808,2.9982,mm" blendMode="0" rasterBorderColor="0,0,0,255" positionOnPage="256.808,2.9982,mm" referencePoint="0" legendFilterByAtlas="0" opacity="1" frame="true" columnCount="1" titleAlignment="1" columnSpace="2" rasterBorderWidth="0" outlineWidthM="0.3,mm" wmsLegendWidth="50" symbolWidth="7" resizeToContents="0" symbolHeight="4">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem rasterBorderColor="0,0,0,255" background="true" lineSpacing="1" columnSpace="2" legendFilterByAtlas="0" symbolAlignment="1" blendMode="0" equalColumnWidth="1" symbolWidth="7" titleAlignment="1" id="" columnCount="1" type="65642" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" frameJoinStyle="miter" visibility="1" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" rasterBorderWidth="0" excludeFromExports="0" splitLayer="0" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" title="" wrapChar="" fontColor="#000000" referencePoint="0" rasterBorder="1" itemRotation="0" wmsLegendHeight="25" size="38.1563,54.9504,mm" wmsLegendWidth="50" resizeToContents="0" zValue="2" positionOnPage="256.808,2.9982,mm" symbolHeight="4" opacity="1" positionLock="true" position="256.808,2.9982,mm" groupUuid="" outlineWidthM="0.3,mm" frame="true" boxSpace="2">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12304,7 +12735,7 @@ def my_form_open(dialog, layer, feature):
           <style marginTop="2.5" alignment="1" name="symbol">
             <styleFont style="" description="Myriad Pro,9,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style marginTop="2" alignment="1" name="symbolLabel" marginLeft="2">
+          <style marginTop="2" marginLeft="2" alignment="1" name="symbolLabel">
             <styleFont style="Regular" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular"/>
           </style>
         </styles>
@@ -12312,28 +12743,28 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
           <layer-tree-group checked="Qt::Checked" name="Fencing and Cones" expanded="1">
             <customproperties/>
-            <layer-tree-layer source="./fencing.shp|layername=fencing" checked="Qt::Checked" name="fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr">
+            <layer-tree-layer source="./fencing.shp|layername=fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" checked="Qt::Checked" name="fencing" expanded="1">
               <customproperties>
-                <property key="legend/node-order" value="0,1,2"/>
-                <property key="legend/title-style" value="hidden"/>
+                <property value="0,1,2" key="legend/node-order"/>
+                <property value="hidden" key="legend/title-style"/>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
           <layer-tree-group checked="Qt::Checked" name="Routes" expanded="1">
             <customproperties/>
-            <layer-tree-layer source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" name="all_routes" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr">
+            <layer-tree-layer source="./all_routes.shp|layername=all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" checked="Qt::Checked" name="all_routes" expanded="1">
               <customproperties>
-                <property key="legend/node-order" value="1,2,3"/>
-                <property key="legend/title-style" value="hidden"/>
+                <property value="1,2,3" key="legend/node-order"/>
+                <property value="hidden" key="legend/title-style"/>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem frame="false" size="283.418,180.92,mm" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" keepLayerSet="false" position="6.76779,9.35102,mm" type="65639" drawCanvasItems="false" followPresetName="Fencing" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="1" labelMargin="0,mm" followPreset="true" visibility="1" referencePoint="0" opacity="0.9" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="6.76779,9.35102,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="283.418,180.92,mm" labelMargin="0,mm" frame="false" mapFlags="0" frameJoinStyle="miter" positionLock="true" id="" background="false" groupUuid="" referencePoint="0" visibility="1" keepLayerSet="false" excludeFromExports="0" itemRotation="0" type="65639" position="6.76779,9.35102,mm" positionOnPage="6.76779,9.35102,mm" mapRotation="0" blendMode="0" drawCanvasItems="false" opacity="0.9" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" outlineWidthM="0.3,mm" followPresetName="Fencing" followPreset="true" zValue="1" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12366,7 +12797,7 @@ def my_form_open(dialog, layer, feature):
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmax="18.41630052358666347" ymin="-33.90341671356931386" ymax="-33.9004485589241682" xmin="18.41165079013320849"/>
+        <Extent ymax="-33.92240721182624696" xmax="18.4006299553904995" xmin="18.35783154382292537" ymin="-33.94972755295310662"/>
         <crs>
           <spatialrefsys>
             <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
@@ -12380,10 +12811,10 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid offsetY="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" gridFrameWidth="2" frameFillColor1="255,255,255,255" gridStyle="0" bottomFrameDivisions="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" gridFrameMargin="0" leftFrameDivisions="0" rightAnnotationPosition="1" rightAnnotationDirection="0" intervalY="5" frameFillColor2="0,0,0,255" leftAnnotationPosition="1" gridFrameSideFlags="15" topAnnotationDisplay="3" frameAnnotationDistance="1" annotationPrecision="3" offsetX="0" topAnnotationPosition="1" bottomAnnotationDirection="0" show="0" unit="1" rightAnnotationDisplay="3" intervalX="5" annotationFormat="4" gridFrameStyle="0" bottomAnnotationDisplay="3" blendMode="0" position="3" rightFrameDivisions="0" showAnnotation="0" topAnnotationDirection="0" crossLength="3" annotationFontColor="0,0,0,255" leftAnnotationDisplay="3" name="Grid 1" bottomAnnotationPosition="1" annotationExpression="" gridFramePenColor="0,0,0,255" topFrameDivisions="0">
+        <ComposerMapGrid topAnnotationDirection="0" gridFrameMargin="0" bottomAnnotationDirection="0" gridFrameSideFlags="15" annotationFontColor="0,0,0,255" crossLength="3" gridFramePenThickness="0.5" name="Grid 1" leftAnnotationDisplay="3" topFrameDivisions="0" showAnnotation="0" bottomFrameDivisions="0" topAnnotationDisplay="3" frameFillColor2="0,0,0,255" blendMode="0" gridFrameWidth="2" leftAnnotationDirection="0" annotationFormat="4" bottomAnnotationPosition="1" gridFramePenColor="0,0,0,255" annotationPrecision="3" offsetY="0" gridFrameStyle="0" topAnnotationPosition="1" frameFillColor1="255,255,255,255" rightAnnotationDirection="0" rightFrameDivisions="0" show="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" rightAnnotationDisplay="3" annotationExpression="" leftAnnotationPosition="1" unit="1" gridStyle="0" intervalY="5" offsetX="0" rightAnnotationPosition="1" intervalX="5" leftFrameDivisions="0" position="3" bottomAnnotationDisplay="3" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol name="" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <symbol force_rhr="0" name="" clip_to_extent="1" type="line" alpha="1">
+              <layer pass="0" locked="0" enabled="1" class="SimpleLine">
                 <prop k="capstyle" v="square"/>
                 <prop k="customdash" v="5;2"/>
                 <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -12411,8 +12842,8 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <symbol force_rhr="0" name="" clip_to_extent="1" type="marker" alpha="1">
+              <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
                 <prop k="angle" v="0"/>
                 <prop k="color" v="0,0,0,255"/>
                 <prop k="horizontal_anchor_point" v="1"/>
@@ -12453,25 +12884,25 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
           <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" atlasDriven="1" margin="0.40000000000000002"/>
+        <AtlasMap margin="0.40000000000000002" atlasDriven="1" scalingMode="2"/>
         <labelBlockingItems/>
       </LayoutItem>
       <customproperties>
-        <property key="atlasRasterFormat" value="png"/>
-        <property key="forceVector" value="0"/>
-        <property key="pdfDisableRasterTiles" value="0"/>
-        <property key="pdfIncludeMetadata" value="1"/>
-        <property key="pdfTextFormat" value="0"/>
-        <property key="rasterize" value="true"/>
+        <property value="png" key="atlasRasterFormat"/>
+        <property value="0" key="forceVector"/>
+        <property value="0" key="pdfDisableRasterTiles"/>
+        <property value="1" key="pdfIncludeMetadata"/>
+        <property value="0" key="pdfTextFormat"/>
+        <property value="true" key="rasterize"/>
       </customproperties>
-      <Atlas pageNameExpression="&quot;name&quot;" sortAscending="1" coverageLayerProvider="virtual" coverageLayer="fence_groups_2daa8372_dd22_4979_afdf_08d74ee6b4b1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20[name],%20[group]%20FROM%20fencing%20GROUP%20BY%20%22group%22" coverageLayerName="fence_groups" filenamePattern="'output_'||@atlas_featurenumber" sortKey="group" filterFeatures="0" enabled="1" sortFeatures="1" hideCoverage="1"/>
+      <Atlas pageNameExpression="&quot;name&quot;" coverageLayerProvider="virtual" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1" sortAscending="1" enabled="1" sortKey="group" coverageLayer="fence_groups_2daa8372_dd22_4979_afdf_08d74ee6b4b1" coverageLayerName="fence_groups" filterFeatures="0" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20[name],%20[group]%20FROM%20fencing%20GROUP%20BY%20%22group%22" hideCoverage="1"/>
     </Layout>
-    <Layout units="mm" printResolution="144" name="Ask Me" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
-      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
-      <Grid offsetX="0" resolution="9" resUnits="mm" offsetY="0" offsetUnits="mm"/>
+    <Layout printResolution="144" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" name="Ask Me" units="mm">
+      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
+      <Grid offsetUnits="mm" resolution="9" offsetX="0" offsetY="0" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+        <symbol force_rhr="0" name="" clip_to_extent="1" type="fill" alpha="1">
+          <layer pass="0" locked="0" enabled="1" class="SimpleFill">
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
             <prop k="joinstyle" v="miter"/>
@@ -12492,9 +12923,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem frame="false" size="297,210,mm" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" position="0,0,mm" type="65638" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" frameJoinStyle="miter" positionLock="false" background="true" outlineWidthM="0.3,mm" zValue="0" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" excludeFromExports="0" positionOnPage="0,0,mm" itemRotation="0" groupUuid="">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem size="297,210,mm" frame="false" frameJoinStyle="miter" positionLock="false" id="" background="true" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" type="65638" position="0,0,mm" positionOnPage="0,0,mm" blendMode="0" opacity="1" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" outlineWidthM="0.3,mm" zValue="0" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}">
+          <FrameColor green="0" blue="0" alpha="255" red="0"/>
+          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -12507,12 +12938,12 @@ def my_form_open(dialog, layer, feature):
           </LayoutObject>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide units="mm" orientation="2" page="0" position="0"/>
+          <Guide page="0" orientation="2" position="0" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem frame="false" size="83.9998,10.4638,mm" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" marginX="1" position="4.43449,186.634,mm" type="65641" valign="64" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" htmlState="0" frameJoinStyle="miter" positionLock="false" background="false" outlineWidthM="0.3,mm" zValue="8" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="Directions to Start of Race" excludeFromExports="0" positionOnPage="4.43449,186.634,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="83.9998,10.4638,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="false" id="" labelText="Directions to Start of Race" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="1" valign="64" type="65641" position="4.43449,186.634,mm" marginY="1" positionOnPage="4.43449,186.634,mm" htmlState="0" blendMode="0" opacity="1" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" outlineWidthM="0.3,mm" zValue="8" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12524,11 +12955,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="48.2923,9.511,mm" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" marginX="1" position="4.43449,197.498,mm" type="65641" valign="32" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" htmlState="0" frameJoinStyle="miter" positionLock="false" background="false" outlineWidthM="0.3,mm" zValue="7" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="Gun Run" excludeFromExports="0" positionOnPage="4.43449,197.498,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="48.2923,9.511,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="false" id="" labelText="Gun Run" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="1" valign="32" type="65641" position="4.43449,197.498,mm" marginY="1" positionOnPage="4.43449,197.498,mm" htmlState="0" blendMode="0" opacity="1" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" outlineWidthM="0.3,mm" zValue="7" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12540,11 +12971,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem boxSpace="2" visibility="1" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" symbolAlignment="1" frameJoinStyle="round" title="" wmsLegendHeight="25" itemRotation="0" splitLayer="0" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" equalColumnWidth="0" size="59.0766,76,mm" id="" type="65642" lineSpacing="2" background="true" wrapChar="" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" positionLock="false" legendFilterByMap="1" excludeFromExports="0" groupUuid="" zValue="6" rasterBorder="1" fontColor="#000000" position="10.096,10.8563,mm" blendMode="0" rasterBorderColor="0,0,0,255" positionOnPage="10.096,10.8563,mm" referencePoint="0" legendFilterByAtlas="0" opacity="1" frame="true" columnCount="1" titleAlignment="1" columnSpace="0" rasterBorderWidth="0" outlineWidthM="0.3,mm" wmsLegendWidth="50" symbolWidth="9" resizeToContents="1" symbolHeight="5">
-        <FrameColor blue="139" green="139" red="139" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem rasterBorderColor="0,0,0,255" background="true" lineSpacing="2" columnSpace="0" legendFilterByAtlas="0" legendFilterByMap="1" symbolAlignment="1" blendMode="0" equalColumnWidth="0" symbolWidth="9" titleAlignment="1" id="" columnCount="1" type="65642" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" frameJoinStyle="round" visibility="1" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" rasterBorderWidth="0" excludeFromExports="0" splitLayer="0" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" title="" wrapChar="" fontColor="#000000" referencePoint="0" rasterBorder="1" itemRotation="0" wmsLegendHeight="25" size="59.0766,76,mm" wmsLegendWidth="50" resizeToContents="1" zValue="6" positionOnPage="10.096,10.8563,mm" symbolHeight="5" opacity="1" positionLock="false" position="10.096,10.8563,mm" groupUuid="" outlineWidthM="0.3,mm" frame="true" boxSpace="2">
+        <FrameColor green="139" blue="139" alpha="255" red="139"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12568,7 +12999,7 @@ def my_form_open(dialog, layer, feature):
           <style marginTop="2.5" alignment="1" name="symbol">
             <styleFont style="" description="Myriad Pro,12,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style marginTop="2.5" alignment="1" name="symbolLabel" marginLeft="3">
+          <style marginTop="2.5" marginLeft="3" alignment="1" name="symbolLabel">
             <styleFont style="Regular" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular"/>
           </style>
         </styles>
@@ -12576,34 +13007,34 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
           <layer-tree-group checked="Qt::Checked" name="Ask Me" expanded="1">
             <customproperties>
-              <property key="legend/title-style" value="hidden"/>
+              <property value="hidden" key="legend/title-style"/>
             </customproperties>
-            <layer-tree-layer source="./poi_labels.shp|layername=poi_labels" checked="Qt::Checked" name="poi_labels" expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" providerKey="ogr">
+            <layer-tree-layer source="./poi_labels.shp|layername=poi_labels" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" providerKey="ogr" checked="Qt::Checked" name="poi_labels" expanded="1">
               <customproperties>
-                <property key="legend/label-0" value="Start/Finish"/>
-                <property key="legend/label-1" value="Toilets"/>
-                <property key="legend/label-2" value="Tog Bag Drop-off"/>
-                <property key="legend/label-3" value="Road Closed to Cars"/>
-                <property key="legend/label-4" value="MyCiti Drop-off"/>
-                <property key="legend/label-5" value="Parking"/>
-                <property key="legend/title-style" value="hidden"/>
+                <property value="Start/Finish" key="legend/label-0"/>
+                <property value="Toilets" key="legend/label-1"/>
+                <property value="Tog Bag Drop-off" key="legend/label-2"/>
+                <property value="Road Closed to Cars" key="legend/label-3"/>
+                <property value="MyCiti Drop-off" key="legend/label-4"/>
+                <property value="Parking" key="legend/label-5"/>
+                <property value="hidden" key="legend/title-style"/>
               </customproperties>
             </layer-tree-layer>
-            <layer-tree-layer source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Checked" name="directions_to_start" expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" providerKey="ogr">
+            <layer-tree-layer source="./directions_to_start.shp|layername=directions_to_start" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" providerKey="ogr" checked="Qt::Checked" name="directions_to_start" expanded="1">
               <customproperties>
-                <property key="legend/label-0" value="To 21KM Start (06:30)"/>
-                <property key="legend/label-1" value="To 10KM Start (07:30)"/>
-                <property key="legend/label-2" value="To 5KM Start (08:30)"/>
-                <property key="legend/title-style" value="hidden"/>
+                <property value="To 21KM Start (06:30)" key="legend/label-0"/>
+                <property value="To 10KM Start (07:30)" key="legend/label-1"/>
+                <property value="To 5KM Start (08:30)" key="legend/label-2"/>
+                <property value="hidden" key="legend/title-style"/>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem frame="false" size="27.7839,6.871,mm" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" marginX="1" position="221.862,190.027,mm" type="65641" valign="32" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" htmlState="0" frameJoinStyle="miter" positionLock="false" background="false" outlineWidthM="0.3,mm" zValue="5" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="REVISION 1.0" excludeFromExports="0" positionOnPage="221.862,190.027,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="27.7839,6.871,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="false" id="" labelText="REVISION 1.0" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="2" valign="32" type="65641" position="221.862,190.027,mm" marginY="1" positionOnPage="221.862,190.027,mm" htmlState="0" blendMode="0" opacity="1" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" outlineWidthM="0.3,mm" zValue="5" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12615,11 +13046,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="51.6706,6.60801,mm" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" marginX="1" position="197.975,197.498,mm" type="65641" valign="64" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" htmlState="0" frameJoinStyle="miter" positionLock="false" background="false" outlineWidthM="0.3,mm" zValue="4" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="Sunday, 20 October 2019" excludeFromExports="0" positionOnPage="197.975,197.498,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="51.6706,6.60801,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="false" id="" labelText="Sunday, 20 October 2019" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="2" valign="64" type="65641" position="197.975,197.498,mm" marginY="1" positionOnPage="197.975,197.498,mm" htmlState="0" blendMode="0" opacity="1" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" outlineWidthM="0.3,mm" zValue="4" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12631,11 +13062,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="42.9838,24.3824,mm" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" position="249.646,179.724,mm" type="65640" pictureWidth="41.6737" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" pictureRotation="0" frameJoinStyle="miter" positionLock="false" anchorPoint="4" svgFillColor="255,255,255,255" background="false" resizeMode="0" outlineWidthM="0.3,mm" zValue="3" visibility="1" northMode="0" referencePoint="0" svgBorderWidth="0.2" opacity="1" id="" blendMode="0" northOffset="0" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" excludeFromExports="0" pictureHeight="24.3824" positionOnPage="249.646,179.724,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="42.9838,24.3824,mm" northMode="0" frame="false" svgBorderColor="0,0,0,255" frameJoinStyle="miter" svgBorderWidth="0.2" pictureRotation="0" positionLock="false" id="" anchorPoint="4" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" background="false" groupUuid="" referencePoint="0" visibility="1" pictureHeight="24.3824" svgFillColor="255,255,255,255" excludeFromExports="0" itemRotation="0" type="65640" file="../Gun_Run_Logo.png" position="249.646,179.724,mm" northOffset="0" positionOnPage="249.646,179.724,mm" blendMode="0" opacity="1" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" outlineWidthM="0.3,mm" resizeMode="0" pictureWidth="41.6737" zValue="3" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12653,9 +13084,9 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem frame="false" size="244.912,0.1,mm" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" position="4.58449,197.248,mm" type="65643" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" frameJoinStyle="miter" positionLock="false" background="false" outlineWidthM="0.3,mm" zValue="2" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" cornerRadiusMeasure="0,mm" excludeFromExports="0" shapeType="1" positionOnPage="4.58449,197.248,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="244.912,0.1,mm" frame="false" frameJoinStyle="miter" shapeType="1" positionLock="false" id="" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" type="65643" position="4.58449,197.248,mm" positionOnPage="4.58449,197.248,mm" blendMode="0" opacity="1" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" outlineWidthM="0.3,mm" cornerRadiusMeasure="0,mm" zValue="2" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12666,8 +13097,8 @@ def my_form_open(dialog, layer, feature):
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+        <symbol force_rhr="0" name="" clip_to_extent="1" type="fill" alpha="1">
+          <layer pass="0" locked="0" enabled="1" class="SimpleFill">
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
             <prop k="joinstyle" v="miter"/>
@@ -12689,9 +13120,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem frame="false" size="288.007,183.616,mm" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" keepLayerSet="false" position="4.43449,6.411,mm" type="65639" drawCanvasItems="false" followPresetName="Ask Me" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" frameJoinStyle="miter" positionLock="false" background="true" outlineWidthM="0.3,mm" zValue="1" labelMargin="0,mm" followPreset="true" visibility="1" referencePoint="0" opacity="1" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="4.43449,6.411,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="288.007,183.616,mm" labelMargin="0,mm" frame="false" mapFlags="0" frameJoinStyle="miter" positionLock="false" id="" background="true" groupUuid="" referencePoint="0" visibility="1" keepLayerSet="false" excludeFromExports="0" itemRotation="0" type="65639" position="4.43449,6.411,mm" positionOnPage="4.43449,6.411,mm" mapRotation="0" blendMode="0" drawCanvasItems="false" opacity="1" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" outlineWidthM="0.3,mm" followPresetName="Ask Me" followPreset="true" zValue="1" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12718,7 +13149,7 @@ def my_form_open(dialog, layer, feature):
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmax="18.41789384089274151" ymin="-33.90994364588821952" ymax="-33.8970204297764468" xmin="18.39762336729721071"/>
+        <Extent ymax="-33.8970204297764468" xmax="18.41789384089274151" xmin="18.39762336729721071" ymin="-33.90994364588821952"/>
         <crs>
           <spatialrefsys>
             <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
@@ -12732,10 +13163,10 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid offsetY="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFrameWidth="2" frameFillColor1="255,255,255,255" gridStyle="0" bottomFrameDivisions="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" gridFrameMargin="0" leftFrameDivisions="0" rightAnnotationPosition="1" rightAnnotationDirection="0" intervalY="0" frameFillColor2="0,0,0,255" leftAnnotationPosition="1" gridFrameSideFlags="15" topAnnotationDisplay="0" frameAnnotationDistance="1" annotationPrecision="3" offsetX="0" topAnnotationPosition="1" bottomAnnotationDirection="0" show="0" unit="0" rightAnnotationDisplay="0" intervalX="0" annotationFormat="0" gridFrameStyle="0" bottomAnnotationDisplay="0" blendMode="0" position="3" rightFrameDivisions="0" showAnnotation="0" topAnnotationDirection="0" crossLength="3" annotationFontColor="0,0,0,255" leftAnnotationDisplay="0" name="Grid 1" bottomAnnotationPosition="1" annotationExpression="" gridFramePenColor="0,0,0,255" topFrameDivisions="0">
+        <ComposerMapGrid topAnnotationDirection="0" gridFrameMargin="0" bottomAnnotationDirection="0" gridFrameSideFlags="15" annotationFontColor="0,0,0,255" crossLength="3" gridFramePenThickness="0.5" name="Grid 1" leftAnnotationDisplay="0" topFrameDivisions="0" showAnnotation="0" bottomFrameDivisions="0" topAnnotationDisplay="0" frameFillColor2="0,0,0,255" blendMode="0" gridFrameWidth="2" leftAnnotationDirection="0" annotationFormat="0" bottomAnnotationPosition="1" gridFramePenColor="0,0,0,255" annotationPrecision="3" offsetY="0" gridFrameStyle="0" topAnnotationPosition="1" frameFillColor1="255,255,255,255" rightAnnotationDirection="0" rightFrameDivisions="0" show="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rightAnnotationDisplay="0" annotationExpression="" leftAnnotationPosition="1" unit="0" gridStyle="0" intervalY="0" offsetX="0" rightAnnotationPosition="1" intervalX="0" leftFrameDivisions="0" position="3" bottomAnnotationDisplay="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol name="" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <symbol force_rhr="0" name="" clip_to_extent="1" type="line" alpha="1">
+              <layer pass="0" locked="0" enabled="1" class="SimpleLine">
                 <prop k="capstyle" v="square"/>
                 <prop k="customdash" v="5;2"/>
                 <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -12763,8 +13194,8 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <symbol force_rhr="0" name="" clip_to_extent="1" type="marker" alpha="1">
+              <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
                 <prop k="angle" v="0"/>
                 <prop k="color" v="0,0,0,255"/>
                 <prop k="horizontal_anchor_point" v="1"/>
@@ -12795,31 +13226,31 @@ def my_form_open(dialog, layer, feature):
           </markerStyle>
           <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
       </LayoutItem>
       <customproperties>
-        <property key="atlasRasterFormat" value="png"/>
-        <property key="forceVector" value="0"/>
-        <property key="imageAntialias" value="true"/>
-        <property key="imageCropMarginBottom" value="0"/>
-        <property key="imageCropMarginLeft" value="0"/>
-        <property key="imageCropMarginRight" value="0"/>
-        <property key="imageCropMarginTop" value="0"/>
-        <property key="imageCropToContents" value="false"/>
-        <property key="pdfDisableRasterTiles" value="0"/>
-        <property key="pdfIncludeMetadata" value="1"/>
-        <property key="pdfTextFormat" value="0"/>
-        <property key="singleFile" value="true"/>
+        <property value="png" key="atlasRasterFormat"/>
+        <property value="0" key="forceVector"/>
+        <property value="true" key="imageAntialias"/>
+        <property value="0" key="imageCropMarginBottom"/>
+        <property value="0" key="imageCropMarginLeft"/>
+        <property value="0" key="imageCropMarginRight"/>
+        <property value="0" key="imageCropMarginTop"/>
+        <property value="false" key="imageCropToContents"/>
+        <property value="0" key="pdfDisableRasterTiles"/>
+        <property value="1" key="pdfIncludeMetadata"/>
+        <property value="0" key="pdfTextFormat"/>
+        <property value="true" key="singleFile"/>
       </customproperties>
-      <Atlas pageNameExpression="" coverageLayer="" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" filterFeatures="0" enabled="0" sortFeatures="0" hideCoverage="0"/>
+      <Atlas pageNameExpression="" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" sortFeatures="0" enabled="0" coverageLayer="" filterFeatures="0" hideCoverage="0"/>
     </Layout>
-    <Layout units="mm" printResolution="144" name="All Routes" worldFileMap="">
-      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
-      <Grid offsetX="0" resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm"/>
+    <Layout printResolution="144" worldFileMap="" name="All Routes" units="mm">
+      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
+      <Grid offsetUnits="mm" resolution="10" offsetX="0" offsetY="0" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+        <symbol force_rhr="0" name="" clip_to_extent="1" type="fill" alpha="1">
+          <layer pass="0" locked="0" enabled="1" class="SimpleFill">
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
             <prop k="joinstyle" v="miter"/>
@@ -12840,9 +13271,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem frame="false" size="297,210,mm" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" position="0,0,mm" type="65638" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" frameJoinStyle="miter" positionLock="false" background="true" outlineWidthM="0.3,mm" zValue="0" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" excludeFromExports="0" positionOnPage="0,0,mm" itemRotation="0" groupUuid="">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem size="297,210,mm" frame="false" frameJoinStyle="miter" positionLock="false" id="" background="true" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" type="65638" position="0,0,mm" positionOnPage="0,0,mm" blendMode="0" opacity="1" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" outlineWidthM="0.3,mm" zValue="0" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}">
+          <FrameColor green="0" blue="0" alpha="255" red="0"/>
+          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -12855,12 +13286,12 @@ def my_form_open(dialog, layer, feature):
           </LayoutObject>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide units="mm" orientation="2" page="0" position="0"/>
+          <Guide page="0" orientation="2" position="0" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem frame="false" size="57.4836,6.8714,mm" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" marginX="1" position="204.225,191.81,mm" type="65641" valign="64" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="6" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="REVISION 1.6" excludeFromExports="0" positionOnPage="204.225,191.81,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="57.4836,6.8714,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="true" id="" labelText="REVISION 1.6" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="2" valign="64" type="65641" position="204.225,191.81,mm" marginY="1" positionOnPage="204.225,191.81,mm" htmlState="0" blendMode="0" opacity="1" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" outlineWidthM="0.3,mm" zValue="6" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12872,11 +13303,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="51.6706,6.60801,mm" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" marginX="1" position="210.038,199.082,mm" type="65641" valign="64" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="5" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="Sunday, 20 October 2019" excludeFromExports="0" positionOnPage="210.038,199.082,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="51.6706,6.60801,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="true" id="" labelText="Sunday, 20 October 2019" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="2" valign="64" type="65641" position="210.038,199.082,mm" marginY="1" positionOnPage="210.038,199.082,mm" htmlState="0" blendMode="0" opacity="1" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" outlineWidthM="0.3,mm" zValue="5" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12888,11 +13319,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="29.7523,17.4718,mm" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" position="262.196,188.218,mm" type="65640" pictureWidth="29.7523" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" pictureRotation="0" frameJoinStyle="miter" positionLock="true" anchorPoint="4" svgFillColor="255,255,255,255" background="false" resizeMode="0" outlineWidthM="0.3,mm" zValue="4" visibility="1" northMode="0" referencePoint="0" svgBorderWidth="0.2" opacity="1" id="" blendMode="0" northOffset="0" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" excludeFromExports="0" pictureHeight="17.4074" positionOnPage="262.196,188.218,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="29.7523,17.4718,mm" northMode="0" frame="false" svgBorderColor="0,0,0,255" frameJoinStyle="miter" svgBorderWidth="0.2" pictureRotation="0" positionLock="true" id="" anchorPoint="4" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" background="false" groupUuid="" referencePoint="0" visibility="1" pictureHeight="17.4074" svgFillColor="255,255,255,255" excludeFromExports="0" itemRotation="0" type="65640" file="../Gun_Run_Logo.png" position="262.196,188.218,mm" northOffset="0" positionOnPage="262.196,188.218,mm" blendMode="0" opacity="1" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" outlineWidthM="0.3,mm" resizeMode="0" pictureWidth="29.7523" zValue="4" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12910,9 +13341,9 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem frame="false" size="251.959,0.1,mm" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" position="9.59946,198.832,mm" type="65643" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="3" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" cornerRadiusMeasure="0,mm" excludeFromExports="0" shapeType="1" positionOnPage="9.59946,198.832,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="251.959,0.1,mm" frame="false" frameJoinStyle="miter" shapeType="1" positionLock="true" id="" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" type="65643" position="9.59946,198.832,mm" positionOnPage="9.59946,198.832,mm" blendMode="0" opacity="1" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" outlineWidthM="0.3,mm" cornerRadiusMeasure="0,mm" zValue="3" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12923,8 +13354,8 @@ def my_form_open(dialog, layer, feature):
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+        <symbol force_rhr="0" name="" clip_to_extent="1" type="fill" alpha="1">
+          <layer pass="0" locked="0" enabled="1" class="SimpleFill">
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
             <prop k="joinstyle" v="miter"/>
@@ -12946,9 +13377,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem frame="true" size="67.7828,166.874,mm" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" keepLayerSet="false" position="5.86559,4.09761,mm" type="65639" drawCanvasItems="false" followPresetName="Routes" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" frameJoinStyle="miter" positionLock="true" background="true" outlineWidthM="0.3,mm" zValue="2" labelMargin="0,mm" followPreset="false" visibility="1" referencePoint="0" opacity="1" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="5.86559,4.09761,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="67.7828,166.874,mm" labelMargin="0,mm" frame="true" mapFlags="0" frameJoinStyle="miter" positionLock="true" id="" background="true" groupUuid="" referencePoint="0" visibility="1" keepLayerSet="false" excludeFromExports="0" itemRotation="0" type="65639" position="5.86559,4.09761,mm" positionOnPage="5.86559,4.09761,mm" mapRotation="0" blendMode="0" drawCanvasItems="false" opacity="1" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" outlineWidthM="0.3,mm" followPresetName="Routes" followPreset="false" zValue="2" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -12990,12 +13421,12 @@ def my_form_open(dialog, layer, feature):
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmax="18.38563681624126289" ymin="-33.94652930000000168" ymax="-33.91513741583252539" xmin="18.37288570000000121"/>
+        <Extent ymax="-33.91513741583252539" xmax="18.38563681624126289" xmin="18.37288570000000121" ymin="-33.94652930000000168"/>
         <LayerSet/>
-        <ComposerMapGrid offsetY="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" gridFrameWidth="2" frameFillColor1="255,255,255,255" gridStyle="0" bottomFrameDivisions="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" gridFrameMargin="0" leftFrameDivisions="0" rightAnnotationPosition="1" rightAnnotationDirection="0" intervalY="0" frameFillColor2="0,0,0,255" leftAnnotationPosition="1" gridFrameSideFlags="15" topAnnotationDisplay="0" frameAnnotationDistance="1" annotationPrecision="3" offsetX="0" topAnnotationPosition="1" bottomAnnotationDirection="0" show="0" unit="0" rightAnnotationDisplay="0" intervalX="0" annotationFormat="0" gridFrameStyle="0" bottomAnnotationDisplay="0" blendMode="0" position="3" rightFrameDivisions="0" showAnnotation="0" topAnnotationDirection="0" crossLength="3" annotationFontColor="0,0,0,255" leftAnnotationDisplay="0" name="Grid 1" bottomAnnotationPosition="1" annotationExpression="" gridFramePenColor="0,0,0,255" topFrameDivisions="0">
+        <ComposerMapGrid topAnnotationDirection="0" gridFrameMargin="0" bottomAnnotationDirection="0" gridFrameSideFlags="15" annotationFontColor="0,0,0,255" crossLength="3" gridFramePenThickness="0.5" name="Grid 1" leftAnnotationDisplay="0" topFrameDivisions="0" showAnnotation="0" bottomFrameDivisions="0" topAnnotationDisplay="0" frameFillColor2="0,0,0,255" blendMode="0" gridFrameWidth="2" leftAnnotationDirection="0" annotationFormat="0" bottomAnnotationPosition="1" gridFramePenColor="0,0,0,255" annotationPrecision="3" offsetY="0" gridFrameStyle="0" topAnnotationPosition="1" frameFillColor1="255,255,255,255" rightAnnotationDirection="0" rightFrameDivisions="0" show="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" rightAnnotationDisplay="0" annotationExpression="" leftAnnotationPosition="1" unit="0" gridStyle="0" intervalY="0" offsetX="0" rightAnnotationPosition="1" intervalX="0" leftFrameDivisions="0" position="3" bottomAnnotationDisplay="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol name="" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <symbol force_rhr="0" name="" clip_to_extent="1" type="line" alpha="1">
+              <layer pass="0" locked="0" enabled="1" class="SimpleLine">
                 <prop k="capstyle" v="square"/>
                 <prop k="customdash" v="5;2"/>
                 <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -13023,8 +13454,8 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <symbol force_rhr="0" name="" clip_to_extent="1" type="marker" alpha="1">
+              <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
                 <prop k="angle" v="0"/>
                 <prop k="color" v="0,0,0,255"/>
                 <prop k="horizontal_anchor_point" v="1"/>
@@ -13055,12 +13486,12 @@ def my_form_open(dialog, layer, feature):
           </markerStyle>
           <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.05"/>
+        <AtlasMap margin="0.05" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutItem frame="true" size="282.012,182.649,mm" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" keepLayerSet="false" position="9.44946,9.08557,mm" type="65639" drawCanvasItems="false" followPresetName="Routes" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" frameJoinStyle="round" positionLock="true" background="true" outlineWidthM="0.15,mm" zValue="1" labelMargin="0,mm" followPreset="false" visibility="1" referencePoint="0" opacity="1" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="9.44946,9.08557,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="282.012,182.649,mm" labelMargin="0,mm" frame="true" mapFlags="0" frameJoinStyle="round" positionLock="true" id="" background="true" groupUuid="" referencePoint="0" visibility="1" keepLayerSet="false" excludeFromExports="0" itemRotation="0" type="65639" position="9.44946,9.08557,mm" positionOnPage="9.44946,9.08557,mm" mapRotation="0" blendMode="0" drawCanvasItems="false" opacity="1" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" outlineWidthM="0.15,mm" followPresetName="Routes" followPreset="false" zValue="1" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -13087,12 +13518,12 @@ def my_form_open(dialog, layer, feature):
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmax="18.42103445111282056" ymin="-33.92999999999999972" ymax="-33.89565141814492932" xmin="18.36799999999999855"/>
+        <Extent ymax="-33.89565141814492932" xmax="18.42103445111282056" xmin="18.36799999999999855" ymin="-33.92999999999999972"/>
         <LayerSet/>
-        <ComposerMapGrid offsetY="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFrameWidth="2" frameFillColor1="255,255,255,255" gridStyle="0" bottomFrameDivisions="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" gridFrameMargin="0" leftFrameDivisions="0" rightAnnotationPosition="1" rightAnnotationDirection="0" intervalY="0" frameFillColor2="0,0,0,255" leftAnnotationPosition="1" gridFrameSideFlags="15" topAnnotationDisplay="0" frameAnnotationDistance="1" annotationPrecision="3" offsetX="0" topAnnotationPosition="1" bottomAnnotationDirection="0" show="0" unit="0" rightAnnotationDisplay="0" intervalX="0" annotationFormat="0" gridFrameStyle="0" bottomAnnotationDisplay="0" blendMode="0" position="3" rightFrameDivisions="0" showAnnotation="0" topAnnotationDirection="0" crossLength="3" annotationFontColor="0,0,0,255" leftAnnotationDisplay="0" name="Grid 1" bottomAnnotationPosition="1" annotationExpression="" gridFramePenColor="0,0,0,255" topFrameDivisions="0">
+        <ComposerMapGrid topAnnotationDirection="0" gridFrameMargin="0" bottomAnnotationDirection="0" gridFrameSideFlags="15" annotationFontColor="0,0,0,255" crossLength="3" gridFramePenThickness="0.5" name="Grid 1" leftAnnotationDisplay="0" topFrameDivisions="0" showAnnotation="0" bottomFrameDivisions="0" topAnnotationDisplay="0" frameFillColor2="0,0,0,255" blendMode="0" gridFrameWidth="2" leftAnnotationDirection="0" annotationFormat="0" bottomAnnotationPosition="1" gridFramePenColor="0,0,0,255" annotationPrecision="3" offsetY="0" gridFrameStyle="0" topAnnotationPosition="1" frameFillColor1="255,255,255,255" rightAnnotationDirection="0" rightFrameDivisions="0" show="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rightAnnotationDisplay="0" annotationExpression="" leftAnnotationPosition="1" unit="0" gridStyle="0" intervalY="0" offsetX="0" rightAnnotationPosition="1" intervalX="0" leftFrameDivisions="0" position="3" bottomAnnotationDisplay="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol name="" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <symbol force_rhr="0" name="" clip_to_extent="1" type="line" alpha="1">
+              <layer pass="0" locked="0" enabled="1" class="SimpleLine">
                 <prop k="capstyle" v="square"/>
                 <prop k="customdash" v="5;2"/>
                 <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -13120,8 +13551,8 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <symbol force_rhr="0" name="" clip_to_extent="1" type="marker" alpha="1">
+              <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
                 <prop k="angle" v="0"/>
                 <prop k="color" v="0,0,0,255"/>
                 <prop k="horizontal_anchor_point" v="1"/>
@@ -13152,31 +13583,31 @@ def my_form_open(dialog, layer, feature):
           </markerStyle>
           <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
       </LayoutItem>
       <customproperties>
-        <property key="atlasRasterFormat" value="png"/>
-        <property key="forceVector" value="0"/>
-        <property key="imageAntialias" value="true"/>
-        <property key="imageCropMarginBottom" value="0"/>
-        <property key="imageCropMarginLeft" value="0"/>
-        <property key="imageCropMarginRight" value="0"/>
-        <property key="imageCropMarginTop" value="0"/>
-        <property key="imageCropToContents" value="false"/>
-        <property key="pdfDisableRasterTiles" value="0"/>
-        <property key="pdfIncludeMetadata" value="1"/>
-        <property key="pdfTextFormat" value="0"/>
-        <property key="singleFile" value="true"/>
+        <property value="png" key="atlasRasterFormat"/>
+        <property value="0" key="forceVector"/>
+        <property value="true" key="imageAntialias"/>
+        <property value="0" key="imageCropMarginBottom"/>
+        <property value="0" key="imageCropMarginLeft"/>
+        <property value="0" key="imageCropMarginRight"/>
+        <property value="0" key="imageCropMarginTop"/>
+        <property value="false" key="imageCropToContents"/>
+        <property value="0" key="pdfDisableRasterTiles"/>
+        <property value="1" key="pdfIncludeMetadata"/>
+        <property value="0" key="pdfTextFormat"/>
+        <property value="true" key="singleFile"/>
       </customproperties>
-      <Atlas pageNameExpression="&quot;Distance&quot;" sortAscending="0" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21)' )" coverageLayer="" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortKey="length_m" filterFeatures="1" enabled="0" sortFeatures="1" hideCoverage="0"/>
+      <Atlas pageNameExpression="&quot;Distance&quot;" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortFeatures="1" sortAscending="0" enabled="0" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21)' )" sortKey="length_m" coverageLayer="" filterFeatures="1" hideCoverage="0"/>
     </Layout>
-    <Layout units="mm" printResolution="120" name="Marshal Plan A1" worldFileMap="">
-      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
-      <Grid offsetX="0" resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm"/>
+    <Layout printResolution="120" worldFileMap="" name="Marshal Plan A1" units="mm">
+      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
+      <Grid offsetUnits="mm" resolution="10" offsetX="0" offsetY="0" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+        <symbol force_rhr="0" name="" clip_to_extent="1" type="fill" alpha="1">
+          <layer pass="0" locked="0" enabled="1" class="SimpleFill">
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
             <prop k="joinstyle" v="miter"/>
@@ -13197,9 +13628,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem frame="false" size="594,841,mm" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" position="0,0,mm" type="65638" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" frameJoinStyle="miter" positionLock="false" background="true" outlineWidthM="0.3,mm" zValue="0" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" excludeFromExports="0" positionOnPage="0,0,mm" itemRotation="0" groupUuid="">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem size="594,841,mm" frame="false" frameJoinStyle="miter" positionLock="false" id="" background="true" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" type="65638" position="0,0,mm" positionOnPage="0,0,mm" blendMode="0" opacity="1" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" outlineWidthM="0.3,mm" zValue="0" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}">
+          <FrameColor green="0" blue="0" alpha="255" red="0"/>
+          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -13213,9 +13644,9 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem boxSpace="2" visibility="1" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" symbolAlignment="1" frameJoinStyle="miter" title="" wmsLegendHeight="25" itemRotation="0" splitLayer="0" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" equalColumnWidth="1" size="18.6109,9,mm" id="" type="65642" lineSpacing="1" background="true" wrapChar="" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" positionLock="true" excludeFromExports="0" groupUuid="" zValue="8" rasterBorder="1" fontColor="#000000" position="25.5925,18.7971,mm" blendMode="0" rasterBorderColor="0,0,0,255" positionOnPage="25.5925,18.7971,mm" referencePoint="0" legendFilterByAtlas="0" opacity="1" frame="false" columnCount="1" titleAlignment="1" columnSpace="2" rasterBorderWidth="0" outlineWidthM="0.3,mm" wmsLegendWidth="50" symbolWidth="7" resizeToContents="1" symbolHeight="4">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem rasterBorderColor="0,0,0,255" background="true" lineSpacing="1" columnSpace="2" legendFilterByAtlas="0" symbolAlignment="1" blendMode="0" equalColumnWidth="1" symbolWidth="7" titleAlignment="1" id="" columnCount="1" type="65642" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" frameJoinStyle="miter" visibility="1" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" rasterBorderWidth="0" excludeFromExports="0" splitLayer="0" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" title="" wrapChar="" fontColor="#000000" referencePoint="0" rasterBorder="1" itemRotation="0" wmsLegendHeight="25" size="18.6109,9,mm" wmsLegendWidth="50" resizeToContents="1" zValue="8" positionOnPage="25.5925,18.7971,mm" symbolHeight="4" opacity="1" positionLock="true" position="25.5925,18.7971,mm" groupUuid="" outlineWidthM="0.3,mm" frame="false" boxSpace="2">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -13239,7 +13670,7 @@ def my_form_open(dialog, layer, feature):
           <style marginTop="2" alignment="1" name="symbol">
             <styleFont style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style marginTop="2" alignment="1" name="symbolLabel" marginLeft="2">
+          <style marginTop="2" marginLeft="2" alignment="1" name="symbolLabel">
             <styleFont style="Semibold" description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
         </styles>
@@ -13247,21 +13678,21 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
           <layer-tree-group checked="Qt::Checked" name="Routes" expanded="1">
             <customproperties/>
-            <layer-tree-layer checked="Qt::Checked" name="all_routes" expanded="1" id="all_routes20170907054841602">
+            <layer-tree-layer id="all_routes20170907054841602" checked="Qt::Checked" name="all_routes" expanded="1">
               <customproperties>
-                <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"/>
+                <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"/>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem frame="false" size="91.9494,15.0649,mm" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" marginX="1" position="5.2963,808.939,mm" type="65641" valign="64" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="7" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="MARSHAL POSITIONS" excludeFromExports="0" positionOnPage="5.2963,808.939,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="91.9494,15.0649,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="true" id="" labelText="MARSHAL POSITIONS" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="1" valign="64" type="65641" position="5.2963,808.939,mm" marginY="1" positionOnPage="5.2963,808.939,mm" htmlState="0" blendMode="0" opacity="1" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" outlineWidthM="0.3,mm" zValue="7" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -13273,11 +13704,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Semibold" description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="56.6212,15.3656,mm" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" marginX="1" position="430.403,825.052,mm" type="65641" valign="32" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="5" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="REVISION 0.91" excludeFromExports="0" positionOnPage="430.403,825.052,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="56.6212,15.3656,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="true" id="" labelText="REVISION 0.91" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="2" valign="32" type="65641" position="430.403,825.052,mm" marginY="1" positionOnPage="430.403,825.052,mm" htmlState="0" blendMode="0" opacity="1" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" outlineWidthM="0.3,mm" zValue="5" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -13289,11 +13720,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="114.848,15.0635,mm" uuid="{d177957c-7ab6-40ae-8769-347428500538}" marginX="1" position="372.175,808.942,mm" type="65641" valign="64" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="4" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="Sunday, 20 October 2019" excludeFromExports="0" positionOnPage="372.175,808.942,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="114.848,15.0635,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="true" id="" labelText="Sunday, 20 October 2019" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="2" valign="64" type="65641" position="372.175,808.942,mm" marginY="1" positionOnPage="372.175,808.942,mm" htmlState="0" blendMode="0" opacity="1" uuid="{d177957c-7ab6-40ae-8769-347428500538}" outlineWidthM="0.3,mm" zValue="4" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -13305,11 +13736,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="100.498,63.9757,mm" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" position="489.557,775.395,mm" type="65640" pictureWidth="100.498" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" pictureRotation="0" frameJoinStyle="miter" positionLock="true" anchorPoint="8" svgFillColor="255,255,255,255" background="false" resizeMode="0" outlineWidthM="0.3,mm" zValue="3" visibility="1" northMode="0" referencePoint="0" svgBorderWidth="0.2" opacity="1" id="" blendMode="0" northOffset="0" mapUuid="" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" excludeFromExports="0" pictureHeight="58.7992" positionOnPage="489.557,775.395,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="100.498,63.9757,mm" northMode="0" frame="false" svgBorderColor="0,0,0,255" frameJoinStyle="miter" svgBorderWidth="0.2" pictureRotation="0" positionLock="true" id="" anchorPoint="8" mapUuid="" background="false" groupUuid="" referencePoint="0" visibility="1" pictureHeight="58.7992" svgFillColor="255,255,255,255" excludeFromExports="0" itemRotation="0" type="65640" file="../Gun_Run_Logo.png" position="489.557,775.395,mm" northOffset="0" positionOnPage="489.557,775.395,mm" blendMode="0" opacity="1" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" outlineWidthM="0.3,mm" resizeMode="0" pictureWidth="100.498" zValue="3" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -13327,9 +13758,9 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem frame="false" size="481.428,0.606138,mm" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" position="5.4463,824.155,mm" type="65643" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="2" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" cornerRadiusMeasure="0,mm" excludeFromExports="0" shapeType="1" positionOnPage="5.4463,824.155,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="481.428,0.606138,mm" frame="false" frameJoinStyle="miter" shapeType="1" positionLock="true" id="" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" type="65643" position="5.4463,824.155,mm" positionOnPage="5.4463,824.155,mm" blendMode="0" opacity="1" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" outlineWidthM="0.3,mm" cornerRadiusMeasure="0,mm" zValue="2" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -13340,8 +13771,8 @@ def my_form_open(dialog, layer, feature):
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+        <symbol force_rhr="0" name="" clip_to_extent="1" type="fill" alpha="1">
+          <layer pass="0" locked="0" enabled="1" class="SimpleFill">
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
             <prop k="joinstyle" v="miter"/>
@@ -13363,9 +13794,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem frame="true" size="584.759,811.213,mm" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" keepLayerSet="false" position="3.94474,5.25965,mm" type="65639" drawCanvasItems="false" followPresetName="Marshal overview" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" frameJoinStyle="miter" positionLock="true" background="true" outlineWidthM="0.3,mm" zValue="1" labelMargin="0,mm" followPreset="true" visibility="1" referencePoint="0" opacity="1" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="3.94474,5.25965,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="584.759,811.213,mm" labelMargin="0,mm" frame="true" mapFlags="0" frameJoinStyle="miter" positionLock="true" id="" background="true" groupUuid="" referencePoint="0" visibility="1" keepLayerSet="false" excludeFromExports="0" itemRotation="0" type="65639" position="3.94474,5.25965,mm" positionOnPage="3.94474,5.25965,mm" mapRotation="0" blendMode="0" drawCanvasItems="false" opacity="1" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" outlineWidthM="0.3,mm" followPresetName="Marshal overview" followPreset="true" zValue="1" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -13392,26 +13823,26 @@ def my_form_open(dialog, layer, feature):
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmax="18.42299397558693741" ymin="-33.95821655848814657" ymax="-33.89072661913806428" xmin="18.37434415142052657"/>
+        <Extent ymax="-33.89072661913806428" xmax="18.42299397558693741" xmin="18.37434415142052657" ymin="-33.95821655848814657"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" atlasDriven="0" margin="0"/>
+        <AtlasMap margin="0" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
       </LayoutItem>
       <customproperties>
-        <property key="atlasRasterFormat" value="png"/>
-        <property key="forceVector" value="0"/>
-        <property key="pdfDisableRasterTiles" value="0"/>
-        <property key="pdfIncludeMetadata" value="1"/>
-        <property key="pdfTextFormat" value="0"/>
+        <property value="png" key="atlasRasterFormat"/>
+        <property value="0" key="forceVector"/>
+        <property value="0" key="pdfDisableRasterTiles"/>
+        <property value="1" key="pdfIncludeMetadata"/>
+        <property value="0" key="pdfTextFormat"/>
       </customproperties>
-      <Atlas pageNameExpression="&quot;page&quot;" sortAscending="1" coverageLayerProvider="virtual" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" coverageLayerName="complete_marshal_overview" filenamePattern="'output_'||@atlas_featurenumber" sortKey="page" filterFeatures="0" enabled="1" sortFeatures="1" hideCoverage="1"/>
+      <Atlas pageNameExpression="&quot;page&quot;" coverageLayerProvider="virtual" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1" sortAscending="1" enabled="1" sortKey="page" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" coverageLayerName="complete_marshal_overview" filterFeatures="0" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" hideCoverage="1"/>
     </Layout>
-    <Layout units="mm" printResolution="144" name="Access Roads" worldFileMap="">
-      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
-      <Grid offsetX="0" resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm"/>
+    <Layout printResolution="144" worldFileMap="" name="Access Roads" units="mm">
+      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
+      <Grid offsetUnits="mm" resolution="10" offsetX="0" offsetY="0" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+        <symbol force_rhr="0" name="" clip_to_extent="1" type="fill" alpha="1">
+          <layer pass="0" locked="0" enabled="1" class="SimpleFill">
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
             <prop k="joinstyle" v="miter"/>
@@ -13432,9 +13863,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem frame="false" size="297,210,mm" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" position="0,0,mm" type="65638" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" frameJoinStyle="miter" positionLock="false" background="true" outlineWidthM="0.3,mm" zValue="0" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" excludeFromExports="0" positionOnPage="0,0,mm" itemRotation="0" groupUuid="">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem size="297,210,mm" frame="false" frameJoinStyle="miter" positionLock="false" id="" background="true" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" type="65638" position="0,0,mm" positionOnPage="0,0,mm" blendMode="0" opacity="1" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" outlineWidthM="0.3,mm" zValue="0" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}">
+          <FrameColor green="0" blue="0" alpha="255" red="0"/>
+          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -13447,12 +13878,12 @@ def my_form_open(dialog, layer, feature):
           </LayoutObject>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide units="mm" orientation="2" page="0" position="0"/>
+          <Guide page="0" orientation="2" position="0" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem boxSpace="2" visibility="1" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" symbolAlignment="1" frameJoinStyle="miter" title="" wmsLegendHeight="25" itemRotation="0" splitLayer="0" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" equalColumnWidth="0" size="34.45,40.8,mm" id="" type="65642" lineSpacing="1" background="true" wrapChar="" positionLock="true" excludeFromExports="0" groupUuid="" zValue="15" rasterBorder="1" fontColor="#000000" position="244.484,130.172,mm" blendMode="0" rasterBorderColor="0,0,0,255" positionOnPage="244.484,130.172,mm" referencePoint="0" legendFilterByAtlas="0" opacity="1" frame="true" columnCount="1" titleAlignment="1" columnSpace="2" rasterBorderWidth="0" outlineWidthM="0.3,mm" wmsLegendWidth="50" symbolWidth="7" resizeToContents="1" symbolHeight="4">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="185"/>
+      <LayoutItem rasterBorderColor="0,0,0,255" background="true" lineSpacing="1" columnSpace="2" legendFilterByAtlas="0" symbolAlignment="1" blendMode="0" equalColumnWidth="0" symbolWidth="7" titleAlignment="1" id="" columnCount="1" type="65642" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" frameJoinStyle="miter" visibility="1" rasterBorderWidth="0" excludeFromExports="0" splitLayer="0" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" title="" wrapChar="" fontColor="#000000" referencePoint="0" rasterBorder="1" itemRotation="0" wmsLegendHeight="25" size="34.45,40.8,mm" wmsLegendWidth="50" resizeToContents="1" zValue="15" positionOnPage="244.484,130.172,mm" symbolHeight="4" opacity="1" positionLock="true" position="244.484,130.172,mm" groupUuid="" outlineWidthM="0.3,mm" frame="true" boxSpace="2">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="185" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -13476,7 +13907,7 @@ def my_form_open(dialog, layer, feature):
           <style marginTop="2.5" alignment="1" name="symbol">
             <styleFont style="" description="Myriad Pro,9,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style marginTop="2" alignment="1" name="symbolLabel" marginLeft="2">
+          <style marginTop="2" marginLeft="2" alignment="1" name="symbolLabel">
             <styleFont style="Regular" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular"/>
           </style>
         </styles>
@@ -13484,19 +13915,19 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
           <layer-tree-group checked="Qt::Checked" name="Residents Access" expanded="1">
             <customproperties/>
-            <layer-tree-layer source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Checked" name="residents_access_roads" expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" providerKey="ogr">
+            <layer-tree-layer source="./residents_access_roads.shp|layername=residents_access_roads" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" providerKey="ogr" checked="Qt::Checked" name="residents_access_roads" expanded="1">
               <customproperties>
                 <property key="expandedLegendNodes"/>
-                <property key="legend/title-style" value="hidden"/>
+                <property value="hidden" key="legend/title-style"/>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem frame="false" size="194.851,7.272,mm" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" marginX="0" position="9.37446,191.81,mm" type="65641" valign="64" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="8" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="ACCESS ROUTES FOR RESIDENTS" excludeFromExports="0" positionOnPage="9.37446,191.81,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="194.851,7.272,mm" frame="false" frameJoinStyle="miter" marginX="0" positionLock="true" id="" labelText="ACCESS ROUTES FOR RESIDENTS" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="1" valign="64" type="65641" position="9.37446,191.81,mm" marginY="1" positionOnPage="9.37446,191.81,mm" htmlState="0" blendMode="0" opacity="1" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" outlineWidthM="0.3,mm" zValue="8" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -13508,11 +13939,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="57.4836,6.8714,mm" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" marginX="1" position="204.225,191.81,mm" type="65641" valign="64" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="6" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="REVISION 1.1" excludeFromExports="0" positionOnPage="204.225,191.81,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="57.4836,6.8714,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="true" id="" labelText="REVISION 1.1" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="2" valign="64" type="65641" position="204.225,191.81,mm" marginY="1" positionOnPage="204.225,191.81,mm" htmlState="0" blendMode="0" opacity="1" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" outlineWidthM="0.3,mm" zValue="6" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -13524,11 +13955,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="51.6706,6.60801,mm" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" marginX="1" position="210.038,199.082,mm" type="65641" valign="64" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="5" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="Sunday, 20 October 2019" excludeFromExports="0" positionOnPage="210.038,199.082,mm" itemRotation="0" groupUuid="" marginY="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="51.6706,6.60801,mm" frame="false" frameJoinStyle="miter" marginX="1" positionLock="true" id="" labelText="Sunday, 20 October 2019" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" halign="2" valign="64" type="65641" position="210.038,199.082,mm" marginY="1" positionOnPage="210.038,199.082,mm" htmlState="0" blendMode="0" opacity="1" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" outlineWidthM="0.3,mm" zValue="5" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -13540,11 +13971,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
         <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
-        <FontColor blue="0" green="0" red="0" alpha="255"/>
+        <FontColor green="0" blue="0" alpha="255" red="0"/>
       </LayoutItem>
-      <LayoutItem frame="false" size="29.7523,17.4718,mm" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" position="262.196,188.218,mm" type="65640" pictureWidth="29.7523" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" pictureRotation="0" frameJoinStyle="miter" positionLock="true" anchorPoint="4" svgFillColor="255,255,255,255" background="false" resizeMode="0" outlineWidthM="0.3,mm" zValue="4" visibility="1" northMode="0" referencePoint="0" svgBorderWidth="0.2" opacity="1" id="" blendMode="0" northOffset="0" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" excludeFromExports="0" pictureHeight="17.4074" positionOnPage="262.196,188.218,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="29.7523,17.4718,mm" northMode="0" frame="false" svgBorderColor="0,0,0,255" frameJoinStyle="miter" svgBorderWidth="0.2" pictureRotation="0" positionLock="true" id="" anchorPoint="4" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" background="false" groupUuid="" referencePoint="0" visibility="1" pictureHeight="17.4074" svgFillColor="255,255,255,255" excludeFromExports="0" itemRotation="0" type="65640" file="../Gun_Run_Logo.png" position="262.196,188.218,mm" northOffset="0" positionOnPage="262.196,188.218,mm" blendMode="0" opacity="1" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" outlineWidthM="0.3,mm" resizeMode="0" pictureWidth="29.7523" zValue="4" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -13562,9 +13993,9 @@ def my_form_open(dialog, layer, feature):
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem frame="false" size="251.959,0.1,mm" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" position="9.59946,198.832,mm" type="65643" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="3" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" cornerRadiusMeasure="0,mm" excludeFromExports="0" shapeType="1" positionOnPage="9.59946,198.832,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="251.959,0.1,mm" frame="false" frameJoinStyle="miter" shapeType="1" positionLock="true" id="" background="false" groupUuid="" referencePoint="0" visibility="1" excludeFromExports="0" itemRotation="0" type="65643" position="9.59946,198.832,mm" positionOnPage="9.59946,198.832,mm" blendMode="0" opacity="1" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" outlineWidthM="0.3,mm" cornerRadiusMeasure="0,mm" zValue="3" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -13575,8 +14006,8 @@ def my_form_open(dialog, layer, feature):
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+        <symbol force_rhr="0" name="" clip_to_extent="1" type="fill" alpha="1">
+          <layer pass="0" locked="0" enabled="1" class="SimpleFill">
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
             <prop k="joinstyle" v="miter"/>
@@ -13598,9 +14029,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem frame="true" size="67.7828,166.874,mm" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" keepLayerSet="false" position="5.86559,4.09761,mm" type="65639" drawCanvasItems="false" followPresetName="Access Routes" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" frameJoinStyle="miter" positionLock="true" background="true" outlineWidthM="0.3,mm" zValue="2" labelMargin="0,mm" followPreset="true" visibility="1" referencePoint="0" opacity="1" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="5.86559,4.09761,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="67.7828,166.874,mm" labelMargin="0,mm" frame="true" mapFlags="0" frameJoinStyle="miter" positionLock="true" id="" background="true" groupUuid="" referencePoint="0" visibility="1" keepLayerSet="false" excludeFromExports="0" itemRotation="0" type="65639" position="5.86559,4.09761,mm" positionOnPage="5.86559,4.09761,mm" mapRotation="0" blendMode="0" drawCanvasItems="false" opacity="1" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" outlineWidthM="0.3,mm" followPresetName="Access Routes" followPreset="true" zValue="2" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -13642,7 +14073,7 @@ def my_form_open(dialog, layer, feature):
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmax="18.38563681624126289" ymin="-33.94652930000000168" ymax="-33.91513741583252539" xmin="18.37288570000000121"/>
+        <Extent ymax="-33.91513741583252539" xmax="18.38563681624126289" xmin="18.37288570000000121" ymin="-33.94652930000000168"/>
         <crs>
           <spatialrefsys>
             <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
@@ -13656,10 +14087,10 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid offsetY="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" gridFrameWidth="2" frameFillColor1="255,255,255,255" gridStyle="0" bottomFrameDivisions="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" gridFrameMargin="0" leftFrameDivisions="0" rightAnnotationPosition="1" rightAnnotationDirection="0" intervalY="0" frameFillColor2="0,0,0,255" leftAnnotationPosition="1" gridFrameSideFlags="15" topAnnotationDisplay="0" frameAnnotationDistance="1" annotationPrecision="3" offsetX="0" topAnnotationPosition="1" bottomAnnotationDirection="0" show="0" unit="0" rightAnnotationDisplay="0" intervalX="0" annotationFormat="0" gridFrameStyle="0" bottomAnnotationDisplay="0" blendMode="0" position="3" rightFrameDivisions="0" showAnnotation="0" topAnnotationDirection="0" crossLength="3" annotationFontColor="0,0,0,255" leftAnnotationDisplay="0" name="Grid 1" bottomAnnotationPosition="1" annotationExpression="" gridFramePenColor="0,0,0,255" topFrameDivisions="0">
+        <ComposerMapGrid topAnnotationDirection="0" gridFrameMargin="0" bottomAnnotationDirection="0" gridFrameSideFlags="15" annotationFontColor="0,0,0,255" crossLength="3" gridFramePenThickness="0.5" name="Grid 1" leftAnnotationDisplay="0" topFrameDivisions="0" showAnnotation="0" bottomFrameDivisions="0" topAnnotationDisplay="0" frameFillColor2="0,0,0,255" blendMode="0" gridFrameWidth="2" leftAnnotationDirection="0" annotationFormat="0" bottomAnnotationPosition="1" gridFramePenColor="0,0,0,255" annotationPrecision="3" offsetY="0" gridFrameStyle="0" topAnnotationPosition="1" frameFillColor1="255,255,255,255" rightAnnotationDirection="0" rightFrameDivisions="0" show="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" rightAnnotationDisplay="0" annotationExpression="" leftAnnotationPosition="1" unit="0" gridStyle="0" intervalY="0" offsetX="0" rightAnnotationPosition="1" intervalX="0" leftFrameDivisions="0" position="3" bottomAnnotationDisplay="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol name="" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <symbol force_rhr="0" name="" clip_to_extent="1" type="line" alpha="1">
+              <layer pass="0" locked="0" enabled="1" class="SimpleLine">
                 <prop k="capstyle" v="square"/>
                 <prop k="customdash" v="5;2"/>
                 <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -13687,8 +14118,8 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <symbol force_rhr="0" name="" clip_to_extent="1" type="marker" alpha="1">
+              <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
                 <prop k="angle" v="0"/>
                 <prop k="color" v="0,0,0,255"/>
                 <prop k="horizontal_anchor_point" v="1"/>
@@ -13719,12 +14150,12 @@ def my_form_open(dialog, layer, feature):
           </markerStyle>
           <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.05"/>
+        <AtlasMap margin="0.05" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutItem frame="true" size="282.012,175.592,mm" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" keepLayerSet="false" position="9.44946,9.08557,mm" type="65639" drawCanvasItems="false" followPresetName="Access Routes" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" frameJoinStyle="round" positionLock="true" background="true" outlineWidthM="0.15,mm" zValue="1" labelMargin="0,mm" followPreset="true" visibility="1" referencePoint="0" opacity="1" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="9.44946,9.08557,mm" itemRotation="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="282.012,175.592,mm" labelMargin="0,mm" frame="true" mapFlags="0" frameJoinStyle="round" positionLock="true" id="" background="true" groupUuid="" referencePoint="0" visibility="1" keepLayerSet="false" excludeFromExports="0" itemRotation="0" type="65639" position="9.44946,9.08557,mm" positionOnPage="9.44946,9.08557,mm" mapRotation="0" blendMode="0" drawCanvasItems="false" opacity="1" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" outlineWidthM="0.15,mm" followPresetName="Access Routes" followPreset="true" zValue="1" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -13751,7 +14182,7 @@ def my_form_open(dialog, layer, feature):
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmax="18.42303507276415431" ymin="-33.92999999999999972" ymax="-33.89697816224119009" xmin="18.37000000000000099"/>
+        <Extent ymax="-33.89697816224119009" xmax="18.42303507276415431" xmin="18.37000000000000099" ymin="-33.92999999999999972"/>
         <crs>
           <spatialrefsys>
             <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
@@ -13765,10 +14196,10 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid offsetY="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFrameWidth="2" frameFillColor1="255,255,255,255" gridStyle="0" bottomFrameDivisions="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" gridFrameMargin="0" leftFrameDivisions="0" rightAnnotationPosition="1" rightAnnotationDirection="0" intervalY="0" frameFillColor2="0,0,0,255" leftAnnotationPosition="1" gridFrameSideFlags="15" topAnnotationDisplay="0" frameAnnotationDistance="1" annotationPrecision="3" offsetX="0" topAnnotationPosition="1" bottomAnnotationDirection="0" show="0" unit="0" rightAnnotationDisplay="0" intervalX="0" annotationFormat="0" gridFrameStyle="0" bottomAnnotationDisplay="0" blendMode="0" position="3" rightFrameDivisions="0" showAnnotation="0" topAnnotationDirection="0" crossLength="3" annotationFontColor="0,0,0,255" leftAnnotationDisplay="0" name="Grid 1" bottomAnnotationPosition="1" annotationExpression="" gridFramePenColor="0,0,0,255" topFrameDivisions="0">
+        <ComposerMapGrid topAnnotationDirection="0" gridFrameMargin="0" bottomAnnotationDirection="0" gridFrameSideFlags="15" annotationFontColor="0,0,0,255" crossLength="3" gridFramePenThickness="0.5" name="Grid 1" leftAnnotationDisplay="0" topFrameDivisions="0" showAnnotation="0" bottomFrameDivisions="0" topAnnotationDisplay="0" frameFillColor2="0,0,0,255" blendMode="0" gridFrameWidth="2" leftAnnotationDirection="0" annotationFormat="0" bottomAnnotationPosition="1" gridFramePenColor="0,0,0,255" annotationPrecision="3" offsetY="0" gridFrameStyle="0" topAnnotationPosition="1" frameFillColor1="255,255,255,255" rightAnnotationDirection="0" rightFrameDivisions="0" show="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rightAnnotationDisplay="0" annotationExpression="" leftAnnotationPosition="1" unit="0" gridStyle="0" intervalY="0" offsetX="0" rightAnnotationPosition="1" intervalX="0" leftFrameDivisions="0" position="3" bottomAnnotationDisplay="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol name="" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <symbol force_rhr="0" name="" clip_to_extent="1" type="line" alpha="1">
+              <layer pass="0" locked="0" enabled="1" class="SimpleLine">
                 <prop k="capstyle" v="square"/>
                 <prop k="customdash" v="5;2"/>
                 <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -13796,8 +14227,8 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol name="" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
-              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <symbol force_rhr="0" name="" clip_to_extent="1" type="marker" alpha="1">
+              <layer pass="0" locked="0" enabled="1" class="SimpleMarker">
                 <prop k="angle" v="0"/>
                 <prop k="color" v="0,0,0,255"/>
                 <prop k="horizontal_anchor_point" v="1"/>
@@ -13828,24 +14259,24 @@ def my_form_open(dialog, layer, feature):
           </markerStyle>
           <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
       </LayoutItem>
       <customproperties>
-        <property key="atlasRasterFormat" value="png"/>
-        <property key="forceVector" value="0"/>
-        <property key="imageAntialias" value="true"/>
-        <property key="imageCropMarginBottom" value="0"/>
-        <property key="imageCropMarginLeft" value="0"/>
-        <property key="imageCropMarginRight" value="0"/>
-        <property key="imageCropMarginTop" value="0"/>
-        <property key="imageCropToContents" value="false"/>
-        <property key="pdfDisableRasterTiles" value="0"/>
-        <property key="pdfIncludeMetadata" value="1"/>
-        <property key="pdfTextFormat" value="0"/>
-        <property key="singleFile" value="false"/>
+        <property value="png" key="atlasRasterFormat"/>
+        <property value="0" key="forceVector"/>
+        <property value="true" key="imageAntialias"/>
+        <property value="0" key="imageCropMarginBottom"/>
+        <property value="0" key="imageCropMarginLeft"/>
+        <property value="0" key="imageCropMarginRight"/>
+        <property value="0" key="imageCropMarginTop"/>
+        <property value="false" key="imageCropToContents"/>
+        <property value="0" key="pdfDisableRasterTiles"/>
+        <property value="1" key="pdfIncludeMetadata"/>
+        <property value="0" key="pdfTextFormat"/>
+        <property value="false" key="singleFile"/>
       </customproperties>
-      <Atlas pageNameExpression="&quot;FID&quot;" coverageLayerProvider="ogr" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" coverageLayerSource="/home/tim/Documents/GunRunMaps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayerName="residents_access" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" filterFeatures="0" enabled="1" sortFeatures="0" hideCoverage="1"/>
+      <Atlas pageNameExpression="&quot;FID&quot;" coverageLayerProvider="ogr" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" sortFeatures="0" enabled="1" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" coverageLayerName="residents_access" filterFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" hideCoverage="1"/>
     </Layout>
   </Layouts>
 </qgis>
diff --git a/GIS Base Map/Time Lapse/20191010 - Gun Run 2019 - Time Lapse rev 3.0.mp4 b/GIS Base Map/Time Lapse/20191010 - Gun Run 2019 - Time Lapse rev 3.0.mp4
new file mode 100644
index 0000000..dfcca42
Binary files /dev/null and b/GIS Base Map/Time Lapse/20191010 - Gun Run 2019 - Time Lapse rev 3.0.mp4 differ
diff --git a/GIS Base Map/fencing.dbf b/GIS Base Map/fencing.dbf
index d6ee18c..5dd6cca 100644
Binary files a/GIS Base Map/fencing.dbf and b/GIS Base Map/fencing.dbf differ
diff --git a/GIS Base Map/fencing.shp b/GIS Base Map/fencing.shp
index b8ea1f7..80d4c02 100644
Binary files a/GIS Base Map/fencing.shp and b/GIS Base Map/fencing.shp differ
diff --git a/GIS Base Map/fencing.shx b/GIS Base Map/fencing.shx
index 44b2b1e..9d9b9a9 100644
Binary files a/GIS Base Map/fencing.shx and b/GIS Base Map/fencing.shx differ
diff --git a/GIS Base Map/timelapse.dbf b/GIS Base Map/timelapse.dbf
index 2877eb3..ef151e2 100644
Binary files a/GIS Base Map/timelapse.dbf and b/GIS Base Map/timelapse.dbf differ
diff --git a/GIS Base Map/timelapse.md b/GIS Base Map/timelapse.md
index dbe3add..28c27f1 100644
--- a/GIS Base Map/timelapse.md	
+++ b/GIS Base Map/timelapse.md	
@@ -1,13 +1,13 @@
 = To Create a Timelapse =
 
-Set begin on each route to the start time of each race.
+Set the field "begin" on each route in ```all_routes``` to the start time of each race.
 
 Use Locate Points on Line to create a layer that has one point every ten meters (about 3500 total). On a EPSG:4326 projection, this means intervals of 0,0001. Turn on "Keep Attributes" as well. 
 
-Each point will have a "distance" field, which calculates the distance of that point along the route. This may well be in hundreds of kilometers; check out the maximum value of the field, and if necessary, convert the distance to meters with the field calculator:
+Each point in the resulting virtual layer will have a "distance" field, which calculates the distance of that point along the route. This may well be in hundreds of kilometers; check out the maximum value of the field, and if necessary, convert the distance to meters with the field calculator:
 Update distance:
 ```
-"distance_1" * 100000
+round("distance" * 100000, 0)
 ```
 (The longest `distance` element should be around 21000).
 
@@ -19,12 +19,13 @@ Generate a second-based offset for the first and last runner past each meter, an
 Then, calculate 
 first_time (String of length 20):
 ```
-to_datetime( "begin" ) + (((3*60/1000*"distance_1")+0.01) || ' seconds')
+to_time(to_datetime( "begin" ) + (((3*60/1000*"distance")+0.01) || ' seconds'))
 ```
 last_time (String of length 20):
 ```
-to_datetime( "begin" ) + (((5*60)+(10*60*"distance_1")/1000) || ' seconds')
+to_time(to_datetime( "begin" ) + (((5*60)+(10*60*"distance")/1000) || ' seconds'))
 ```
+Make certain all these values are saved, and set the layer to read-only (disable editing).
 
 Then use this layer as your starting point for Time Manager. Remember to save and mark the layer as read-only before starting.
 
diff --git a/GIS Base Map/timelapse.qix b/GIS Base Map/timelapse.qix
new file mode 100644
index 0000000..abfb3ec
Binary files /dev/null and b/GIS Base Map/timelapse.qix differ
diff --git a/create_index.py b/create_index.py
index efaae84..a5acb90 100755
--- a/create_index.py
+++ b/create_index.py
@@ -10,7 +10,7 @@ webfile_dir = os.path.expanduser(webfile_dir)
 for root, dirs, files in os.walk(webfile_dir):
     documents=[]
     for file in files:
-        if re.search('.(pdf|png|jpg|jpeg|htm|html|mp4)$', file) and not re.search('index.html', file):
+        if re.search('.(pdf|png|jpg|jpeg|htm|html|mp4|pptx)$', file) and not re.search('index.html', file):
             try:
             	documents.append(os.path.join(file))
             except OSError: