From 9e68c64444bd7f6bba98a61fddb8fe1e154b84db Mon Sep 17 00:00:00 2001
From: tim <tim@treehouse.org.za>
Date: Sun, 20 Oct 2019 21:50:51 +0200
Subject: [PATCH] Final updates to fencing, routes, and some additional maps
 for the mayor and VIPs.

---
 ...2019 - Finish Layout rev 1.6 (branded).pdf |     3 +
 ...- Gun Run 2019 - Finish Layout rev 1.6.pdf |     3 +
 Finish vector map/output_15.svg               |   107 +-
 ...n Run 2019 - Start Directions rev 1.0.png} |     0
 ...de Road to Three Anchor Bay Boulevard).png |     3 -
 ... - Main Road (York Road to Clyde Road).png |     3 -
 GIS Base Map/Gun Run.qgs                      | 11452 +++++++-------
 GIS Base Map/Gun Run.qgs~                     | 12568 ++++++++--------
 GIS Base Map/Marshals/AAC_marshal_map_101.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_102.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_103.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_104.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_105.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_106.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_107.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_108.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_109.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_110.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_111.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_112.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_113.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_114.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_115.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_116.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_117.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_118.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_119.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_120.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_121.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_122.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_123.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_124.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_125.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_126.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_127.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_128.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_129.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_130.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_131.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_132.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_133.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_134.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_135.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_136.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_137.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_138.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_139.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_140.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_141.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_142.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_143.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_144.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_145.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_146.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_147.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_148.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_149.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_150.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_151.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_152.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_201.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_202.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_203.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_204.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_205.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_206.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_207.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_208.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_209.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_210.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_211.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_212.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_213.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_214.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_215.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_216.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_217.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_218.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_219.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_220.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_221.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_222.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_223.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_224.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_225.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_226.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_227.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_228.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_229.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_230.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_231.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_232.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_233.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_234.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_235.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_236.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_237.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_238.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_239.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_240.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_249.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_250.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_251.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_252.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_253.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_254.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_255.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_256.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_268.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_269.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_270.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_271.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_272.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_273.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_274.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_275.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_276.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_277.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_278.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_279.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_280.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_281.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_282.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_283.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_284.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_285.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_286.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_287.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_288.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_290.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_291.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_292.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_293.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_294.jpg |     4 +-
 GIS Base Map/Marshals/AAC_marshal_map_295.jpg |     4 +-
 .../Edgemead Runners_marshal_map_241.jpg      |     4 +-
 .../Edgemead Runners_marshal_map_242.jpg      |     4 +-
 .../Edgemead Runners_marshal_map_243.jpg      |     4 +-
 .../Edgemead Runners_marshal_map_244.jpg      |     4 +-
 .../Edgemead Runners_marshal_map_245.jpg      |     4 +-
 .../Edgemead Runners_marshal_map_246.jpg      |     4 +-
 .../Edgemead Runners_marshal_map_247.jpg      |     4 +-
 .../Edgemead Runners_marshal_map_248.jpg      |     4 +-
 .../Edgemead Runners_marshal_map_257.jpg      |     4 +-
 .../Edgemead Runners_marshal_map_258.jpg      |     4 +-
 .../Edgemead Runners_marshal_map_259.jpg      |     4 +-
 .../Edgemead Runners_marshal_map_260.jpg      |     4 +-
 .../Edgemead Runners_marshal_map_261.jpg      |     4 +-
 .../Edgemead Runners_marshal_map_262.jpg      |     4 +-
 .../Edgemead Runners_marshal_map_263.jpg      |     4 +-
 .../Edgemead Runners_marshal_map_264.jpg      |     4 +-
 .../Edgemead Runners_marshal_map_265.jpg      |     4 +-
 .../Edgemead Runners_marshal_map_266.jpg      |     4 +-
 .../Edgemead Runners_marshal_map_267.jpg      |     4 +-
 .../Edgemead Runners_marshal_map_289.jpg      |     4 +-
 .../Marshals/Eerste River_marshal_map_301.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_302.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_303.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_304.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_305.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_306.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_307.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_308.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_309.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_310.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_311.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_312.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_313.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_314.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_315.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_316.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_317.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_318.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_319.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_320.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_321.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_322.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_323.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_324.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_325.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_326.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_327.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_328.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_329.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_330.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_331.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_332.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_333.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_334.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_335.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_336.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_337.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_338.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_339.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_340.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_341.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_342.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_343.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_344.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_345.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_346.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_347.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_348.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_349.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_350.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_351.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_352.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_353.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_354.jpg |     4 +-
 .../Marshals/Eerste River_marshal_map_355.jpg |     4 +-
 .../Midas Spartans_marshal_map_520.jpg        |     4 +-
 .../Midas Spartans_marshal_map_521.jpg        |     4 +-
 .../Midas Spartans_marshal_map_522.jpg        |     4 +-
 .../Midas Spartans_marshal_map_523.jpg        |     4 +-
 .../Midas Spartans_marshal_map_524.jpg        |     4 +-
 .../Midas Spartans_marshal_map_525.jpg        |     4 +-
 .../Midas Spartans_marshal_map_526.jpg        |     4 +-
 .../Midas Spartans_marshal_map_527.jpg        |     4 +-
 .../Midas Spartans_marshal_map_528.jpg        |     4 +-
 .../Midas Spartans_marshal_map_529.jpg        |     4 +-
 .../Midas Spartans_marshal_map_530.jpg        |     4 +-
 .../Midas Spartans_marshal_map_531.jpg        |     4 +-
 .../Midas Spartans_marshal_map_532.jpg        |     4 +-
 .../Midas Spartans_marshal_map_533.jpg        |     4 +-
 .../Midas Spartans_marshal_map_534.jpg        |     4 +-
 .../Midas Spartans_marshal_map_535.jpg        |     4 +-
 .../Midas Spartans_marshal_map_536.jpg        |     4 +-
 .../Midas Spartans_marshal_map_537.jpg        |     4 +-
 .../Midas Spartans_marshal_map_538.jpg        |     4 +-
 .../Midas Spartans_marshal_map_539.jpg        |     4 +-
 .../Midas Spartans_marshal_map_540.jpg        |     4 +-
 .../Midas Spartans_marshal_map_541.jpg        |     4 +-
 .../Midas Spartans_marshal_map_542.jpg        |     4 +-
 .../Midas Spartans_marshal_map_543.jpg        |     4 +-
 .../Midas Spartans_marshal_map_544.jpg        |     4 +-
 .../Midas Spartans_marshal_map_545.jpg        |     4 +-
 .../Midas Spartans_marshal_map_546.jpg        |     4 +-
 .../Midas Spartans_marshal_map_547.jpg        |     4 +-
 .../Midas Spartans_marshal_map_548.jpg        |     4 +-
 .../Midas Spartans_marshal_map_549.jpg        |     4 +-
 .../Midas Spartans_marshal_map_550.jpg        |     4 +-
 .../Midas Spartans_marshal_map_551.jpg        |     4 +-
 .../Midas Spartans_marshal_map_552.jpg        |     4 +-
 .../Midas Spartans_marshal_map_553.jpg        |     4 +-
 .../Midas Spartans_marshal_map_554.jpg        |     4 +-
 .../Midas Spartans_marshal_map_555.jpg        |     4 +-
 .../Midas Spartans_marshal_map_556.jpg        |     4 +-
 .../Midas Spartans_marshal_map_557.jpg        |     4 +-
 .../Midas Spartans_marshal_map_558.jpg        |     4 +-
 .../Midas Spartans_marshal_map_559.jpg        |     4 +-
 .../Midas Spartans_marshal_map_560.jpg        |     4 +-
 .../Midas Spartans_marshal_map_561.jpg        |     4 +-
 .../Midas Spartans_marshal_map_562.jpg        |     4 +-
 .../Midas Spartans_marshal_map_563.jpg        |     4 +-
 .../Midas Spartans_marshal_map_564.jpg        |     4 +-
 .../Midas Spartans_marshal_map_565.jpg        |     4 +-
 .../Midas Spartans_marshal_map_566.jpg        |     4 +-
 .../Midas Spartans_marshal_map_567.jpg        |     4 +-
 .../Midas Spartans_marshal_map_568.jpg        |     4 +-
 .../Midas Spartans_marshal_map_569.jpg        |     4 +-
 .../Midas Spartans_marshal_map_570.jpg        |     4 +-
 .../Midas Spartans_marshal_map_571.jpg        |     4 +-
 .../Midas Spartans_marshal_map_572.jpg        |     4 +-
 .../Midas Spartans_marshal_map_573.jpg        |     4 +-
 .../Midas Spartans_marshal_map_574.jpg        |     4 +-
 .../Midas Spartans_marshal_map_575.jpg        |     4 +-
 .../Midas Spartans_marshal_map_576.jpg        |     4 +-
 .../Midas Spartans_marshal_map_577.jpg        |     4 +-
 .../Marshals/Nantes_marshal_map_401.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_402.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_403.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_404.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_405.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_406.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_407.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_408.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_409.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_410.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_411.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_412.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_413.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_414.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_415.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_416.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_417.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_418.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_419.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_420.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_421.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_422.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_423.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_424.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_425.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_426.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_427.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_428.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_429.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_430.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_431.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_432.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_433.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_434.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_435.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_436.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_437.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_438.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_439.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_440.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_441.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_442.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_443.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_444.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_445.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_446.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_447.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_448.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_449.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_450.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_451.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_452.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_453.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_454.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_455.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_456.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_457.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_458.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_459.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_460.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_461.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_462.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_463.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_464.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_465.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_466.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_467.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_468.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_469.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_470.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_471.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_472.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_473.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_474.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_475.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_476.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_477.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_478.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_479.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_480.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_481.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_482.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_483.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_484.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_485.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_486.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_487.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_488.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_490.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_491.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_501.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_502.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_503.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_504.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_505.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_506.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_507.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_508.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_509.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_510.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_511.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_512.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_513.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_514.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_515.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_516.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_517.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_518.jpg       |     4 +-
 .../Marshals/Nantes_marshal_map_519.jpg       |     4 +-
 .../Marshals/Walmer AC_marshal_map_356.jpg    |     4 +-
 .../Marshals/Walmer AC_marshal_map_357.jpg    |     4 +-
 .../Marshals/Walmer AC_marshal_map_358.jpg    |     4 +-
 .../Marshals/Walmer AC_marshal_map_359.jpg    |     4 +-
 .../Marshals/Walmer AC_marshal_map_360.jpg    |     4 +-
 .../Marshals/Walmer AC_marshal_map_361.jpg    |     4 +-
 .../Marshals/Walmer AC_marshal_map_362.jpg    |     4 +-
 .../Marshals/Walmer AC_marshal_map_363.jpg    |     4 +-
 .../Marshals/Walmer AC_marshal_map_364.jpg    |     4 +-
 .../Marshals/Walmer AC_marshal_map_365.jpg    |     4 +-
 .../Marshals/Walmer AC_marshal_map_366.jpg    |     4 +-
 .../Marshals/Walmer AC_marshal_map_367.jpg    |     4 +-
 .../Marshals/Walmer AC_marshal_map_368.jpg    |     4 +-
 .../Marshals/Walmer AC_marshal_map_369.jpg    |     4 +-
 .../Marshals/Walmer AC_marshal_map_370.jpg    |     4 +-
 .../Marshals/Walmer AC_marshal_map_371.jpg    |     4 +-
 .../Marshals/Walmer AC_marshal_map_372.jpg    |     4 +-
 .../Marshals/Walmer AC_marshal_map_373.jpg    |     4 +-
 .../Marshals/Walmer AC_marshal_map_374.jpg    |     4 +-
 .../Marshals/Walmer AC_marshal_map_375.jpg    |     4 +-
 .../Marshals/Walmer AC_marshal_map_376.jpg    |     4 +-
 .../Marshals/Walmer AC_marshal_map_377.jpg    |     4 +-
 .../Marshals/Walmer AC_marshal_map_378.jpg    |     4 +-
 .../Marshals/Walmer AC_marshal_map_379.jpg    |     4 +-
 .../Marshals/Walmer AC_marshal_map_380.jpg    |     4 +-
 .../Marshals/Walmer AC_marshal_map_381.jpg    |     4 +-
 .../Marshals/Walmer AC_marshal_map_382.jpg    |     4 +-
 .../Marshals/Walmer AC_marshal_map_383.jpg    |     4 +-
 .../Marshals/Walmer AC_marshal_map_384.jpg    |     4 +-
 .../Marshals/Walmer AC_marshal_map_385.jpg    |     4 +-
 GIS Base Map/all_routes.dbf                   |   Bin 2153 -> 2153 bytes
 GIS Base Map/all_routes.shp                   |   Bin 12524 -> 12556 bytes
 GIS Base Map/all_routes.shx                   |   Bin 124 -> 124 bytes
 GIS Base Map/fencing.dbf                      |   Bin 52098 -> 52458 bytes
 GIS Base Map/fencing.shp                      |   Bin 17980 -> 18068 bytes
 GIS Base Map/fencing.shx                      |   Bin 1252 -> 1260 bytes
 GIS Base Map/marshals_by_position.csv         |    22 +-
 GIS Base Map/mayor.cpg                        |     1 +
 GIS Base Map/mayor.dbf                        |   Bin 0 -> 4284 bytes
 GIS Base Map/mayor.prj                        |     1 +
 GIS Base Map/mayor.qpj                        |     1 +
 GIS Base Map/mayor.shp                        |   Bin 0 -> 4600 bytes
 GIS Base Map/mayor.shx                        |   Bin 0 -> 468 bytes
 ... - Gun Run 2019 - Start Layout rev 1.3.pdf |     3 +
 .../GR_start_pens_fencing_final_191015.pdf    |     3 +
 Start vector maps/output_3.svg                |   849 +-
 423 files changed, 13665 insertions(+), 12950 deletions(-)
 create mode 100644 Finish vector map/20191017 - Gun Run 2019 - Finish Layout rev 1.6 (branded).pdf
 create mode 100644 Finish vector map/20191017 - Gun Run 2019 - Finish Layout rev 1.6.pdf
 rename GIS Base Map/Ask Me/{20191010 - Gun Run 2019 - Start Directions rev 1.1.png => 20191010 - Gun Run 2019 - Start Directions rev 1.0.png} (100%)
 delete mode 100644 GIS Base Map/Fencing/20191015 - Main Road (Clyde Road to Three Anchor Bay Boulevard).png
 delete mode 100644 GIS Base Map/Fencing/20191015 - Main Road (York Road to Clyde Road).png
 create mode 100644 GIS Base Map/mayor.cpg
 create mode 100644 GIS Base Map/mayor.dbf
 create mode 100644 GIS Base Map/mayor.prj
 create mode 100644 GIS Base Map/mayor.qpj
 create mode 100644 GIS Base Map/mayor.shp
 create mode 100644 GIS Base Map/mayor.shx
 create mode 100644 Start vector maps/20191017 - Gun Run 2019 - Start Layout rev 1.3.pdf
 create mode 100644 Start vector maps/GR_start_pens_fencing_final_191015.pdf

diff --git a/Finish vector map/20191017 - Gun Run 2019 - Finish Layout rev 1.6 (branded).pdf b/Finish vector map/20191017 - Gun Run 2019 - Finish Layout rev 1.6 (branded).pdf
new file mode 100644
index 0000000..414a02d
--- /dev/null
+++ b/Finish vector map/20191017 - Gun Run 2019 - Finish Layout rev 1.6 (branded).pdf	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3c2b619c28009c022e9df6027aa3f44a13ebb6d0a74e2bb75e5ad30528cec309
+size 624806
diff --git a/Finish vector map/20191017 - Gun Run 2019 - Finish Layout rev 1.6.pdf b/Finish vector map/20191017 - Gun Run 2019 - Finish Layout rev 1.6.pdf
new file mode 100644
index 0000000..17dbcac
--- /dev/null
+++ b/Finish vector map/20191017 - Gun Run 2019 - Finish Layout rev 1.6.pdf	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1275d558175d1dbb9515f2a3f2c6ba55567393f8c4c752549b974cce4374fdf5
+size 555738
diff --git a/Finish vector map/output_15.svg b/Finish vector map/output_15.svg
index a221f02..8bc9f62 100644
--- a/Finish vector map/output_15.svg	
+++ b/Finish vector map/output_15.svg	
@@ -27,15 +27,15 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
+     inkscape:window-width="3840"
+     inkscape:window-height="2032"
      id="namedview464"
      showgrid="false"
-     inkscape:zoom="1.0388403"
-     inkscape:cx="511.6095"
-     inkscape:cy="408.0969"
+     inkscape:zoom="2.0776806"
+     inkscape:cx="559.94459"
+     inkscape:cy="443.88447"
      inkscape:window-x="0"
-     inkscape:window-y="27"
+     inkscape:window-y="54"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg2"
      inkscape:snap-page="true"
@@ -537,7 +537,7 @@
          sodipodi:role="line"
          id="tspan6135-7"
          x="-732.98328"
-         y="3329.0564">REVISION 1.5</tspan></text>
+         y="3329.0564">REVISION 1.6</tspan></text>
     <text
        xml:space="preserve"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Myriad Pro';-inkscape-font-specification:'Myriad Pro';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
@@ -2591,8 +2591,7 @@
     </g>
   </g>
   <g
-     id="medical"
-     sodipodi:insensitive="true">
+     id="medical">
     <g
        id="g1580">
       <text
@@ -2617,7 +2616,7 @@
          style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.0000031;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </g>
     <g
-       transform="translate(-12.50002,-106.25017)"
+       transform="translate(-18.75003,237.50038)"
        id="g1659">
       <text
          transform="scale(1.0002403,0.99975976)"
@@ -2869,26 +2868,25 @@
     </g>
   </g>
   <g
-     id="vendorgazebos"
-     sodipodi:insensitive="true">
+     id="vendors">
     <g
        id="g1822">
       <path
-         inkscape:connector-curvature="0"
-         id="path13299-4-8-2-6-3-3-3"
+         d="m 2068.2816,1500.1644 v 19.383 h 41.0198 v -19.383 z"
          style="fill:none;stroke:#000000;stroke-width:2.00004888;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-         d="m 2068.2816,1500.1644 v 19.383 h 41.0198 v -19.383 z" />
+         id="path13299-4-8-2-6-3-3-3"
+         inkscape:connector-curvature="0" />
       <text
-         id="text5627-4"
-         y="1520.6975"
-         x="2118.1492"
+         xml:space="preserve"
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Myriad Pro';-inkscape-font-specification:'Myriad Pro, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         xml:space="preserve"><tspan
-           y="1520.6975"
-           x="2118.1492"
-           sodipodi:role="line"
+         x="2118.1492"
+         y="1520.6975"
+         id="text5627-4"><tspan
+           id="tspan2050"
            style="font-size:33.33338547px;line-height:1.25"
-           id="tspan2050">broadcast truck</tspan></text>
+           sodipodi:role="line"
+           x="2118.1492"
+           y="1520.6975">broadcast truck</tspan></text>
     </g>
     <g
        id="g1657">
@@ -2918,6 +2916,7 @@
            y="1336.7697">Area</tspan></text>
     </g>
     <g
+       transform="translate(0,-456.25073)"
        id="g1607">
       <path
          d="m 1776.414,1313.0643 v 19.383 h 18.6465 v -19.383 z"
@@ -2938,7 +2937,7 @@
            y="1331.7266">Engravers</tspan></text>
     </g>
     <g
-       transform="translate(0,-43.75007)"
+       transform="translate(0,43.75007)"
        id="g2800">
       <text
          id="text5627"
@@ -2958,28 +2957,7 @@
          inkscape:connector-curvature="0" />
     </g>
     <g
-       id="g1607-3"
-       transform="translate(0,-32.812356)">
-      <path
-         d="m 1776.414,1313.0643 v 19.383 h 18.6465 v -19.383 z"
-         style="fill:none;stroke:#000000;stroke-width:2.00004888;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-         id="path13299-4-8-2-6-3-6"
-         inkscape:connector-curvature="0" />
-      <text
-         xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.82420158px;line-height:0%;font-family:'Myriad Pro';-inkscape-font-specification:'Myriad Pro, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         x="1803.8966"
-         y="1331.7266"
-         id="text5547-6-0-7"
-         transform="scale(1.0000024,0.9999976)"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.08337593px;line-height:1.25;font-family:'Myriad Pro';-inkscape-font-specification:'Myriad Pro, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994px"
-           sodipodi:role="line"
-           id="tspan5549-1-0-5"
-           x="1803.8966"
-           y="1331.7266">Medal hangers</tspan></text>
-    </g>
-    <g
-       transform="translate(0,6.2500098)"
+       transform="translate(0,-593.75095)"
        id="g1990">
       <rect
          style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:3.3333385;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
@@ -3050,7 +3028,7 @@
     </g>
   </g>
   <g
-     id="vip-info"
+     id="vip"
      sodipodi:insensitive="true">
     <text
        transform="rotate(-90)"
@@ -3111,30 +3089,9 @@
        id="path9733-6-0-2"
        style="fill:none;stroke:#000000;stroke-width:2.00004911;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
        d="m 1462.3972,1143.0319 0.01,-24.5158 -24.5157,0.01 -0.01,24.5158 z" />
-    <rect
-       rx="0"
-       ry="0"
-       y="1188.4707"
-       x="1424.7092"
-       height="16.572842"
-       width="72.920502"
-       id="rect1890"
-       style="opacity:0.9;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000002;stroke-width:3.12500501;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers fill stroke" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.61398315px;line-height:0%;font-family:'Myriad Pro';-inkscape-font-specification:'Myriad Pro, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="1437.4283"
-       y="1229.8137"
-       id="text13485-4"><tspan
-         sodipodi:role="line"
-         id="tspan13487-7"
-         x="1437.4283"
-         y="1229.8137"
-         style="font-size:27.10765457px;line-height:1.25;stroke-width:0.99999994px">info</tspan></text>
   </g>
   <g
-     id="g3573"
-     style="display:none">
+     id="g3573">
     <g
        id="banners"
        sodipodi:insensitive="true">
@@ -3206,13 +3163,13 @@
          sodipodi:nodetypes="cc"
          inkscape:connector-curvature="0"
          id="path1784"
-         d="m 632.54906,1232.9161 -68.17598,-187.9817"
+         d="M 632.54906,1232.9161 564.37308,1044.9344"
          style="fill:none;fill-rule:evenodd;stroke:#00b0f0;stroke-width:9.37501431;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
          sodipodi:nodetypes="cc"
          inkscape:connector-curvature="0"
          id="path1786"
-         d="m 740.2186,1220.145 -69.75663,-214.2331"
+         d="M 740.2186,1220.145 670.46197,1005.9119"
          style="fill:none;fill-rule:evenodd;stroke:#00b0f0;stroke-width:9.37501431;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
          sodipodi:nodetypes="cccc"
@@ -3377,25 +3334,25 @@
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
          id="path1828-0"
-         d="m 619.08328,760.96667 -84.21172,-426.36832 -37.89384,-97.07798 -45.46093,-56.84852"
+         d="M 619.08328,760.96667 534.87156,334.59835 496.97772,237.52037 451.51679,180.67185"
          style="fill:none;fill-rule:evenodd;stroke:#7030a0;stroke-width:9.37501431;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
          sodipodi:nodetypes="cc"
          inkscape:connector-curvature="0"
          id="path1828-4"
-         d="m 671.33512,1004.3031 -53.1191,-243.71585"
+         d="M 671.33512,1004.3031 618.21602,760.58725"
          style="fill:none;fill-rule:evenodd;stroke:#ffff00;stroke-width:9.37501431;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
          sodipodi:nodetypes="cc"
          inkscape:connector-curvature="0"
          id="path1828-0-4"
-         d="m 503.07339,796.32207 -71.44401,-331.70221"
+         d="M 503.07339,796.32207 431.62938,464.61986"
          style="fill:none;fill-rule:evenodd;stroke:#7030a0;stroke-width:9.37501431;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
          sodipodi:nodetypes="cc"
          inkscape:connector-curvature="0"
          id="path1828-4-4"
-         d="m 562.73562,1044.9146 -58.96699,-248.00116"
+         d="M 562.73562,1044.9146 503.76863,796.91344"
          style="fill:none;fill-rule:evenodd;stroke:#ffff00;stroke-width:9.37501431;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
          inkscape:connector-curvature="0"
diff --git a/GIS Base Map/Ask Me/20191010 - Gun Run 2019 - Start Directions rev 1.1.png b/GIS Base Map/Ask Me/20191010 - Gun Run 2019 - Start Directions rev 1.0.png
similarity index 100%
rename from GIS Base Map/Ask Me/20191010 - Gun Run 2019 - Start Directions rev 1.1.png
rename to GIS Base Map/Ask Me/20191010 - Gun Run 2019 - Start Directions rev 1.0.png
diff --git a/GIS Base Map/Fencing/20191015 - Main Road (Clyde Road to Three Anchor Bay Boulevard).png b/GIS Base Map/Fencing/20191015 - Main Road (Clyde Road to Three Anchor Bay Boulevard).png
deleted file mode 100644
index 451afbb..0000000
--- a/GIS Base Map/Fencing/20191015 - Main Road (Clyde Road to Three Anchor Bay Boulevard).png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b6d8ff730ee46d5b50ec4b87c3f14c8a0424235900267d408d07e423714f6b38
-size 2834923
diff --git a/GIS Base Map/Fencing/20191015 - Main Road (York Road to Clyde Road).png b/GIS Base Map/Fencing/20191015 - Main Road (York Road to Clyde Road).png
deleted file mode 100644
index 8067ff3..0000000
--- a/GIS Base Map/Fencing/20191015 - Main Road (York Road to Clyde Road).png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ae5ff7b25ee837f88e567ba4b472bd820efe061c4ae817e884625f2745e5b751
-size 2802545
diff --git a/GIS Base Map/Gun Run.qgs b/GIS Base Map/Gun Run.qgs
index c3c762b..683993c 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 projectname="Gun Run" version="3.8.3-Zanzibar">
+<qgis version="3.8.3-Zanzibar" projectname="Gun Run">
   <homePath path=""/>
   <title>Gun Run</title>
   <autotransaction active="0"/>
@@ -19,146 +19,149 @@
   </projectCrs>
   <layer-tree-group>
     <customproperties/>
-    <layer-tree-group expanded="1" checked="Qt::Unchecked" name="Marshals">
+    <layer-tree-group expanded="1" name="Marshals" checked="Qt::Unchecked">
       <customproperties/>
-      <layer-tree-layer providerKey="ogr" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" checked="Qt::Unchecked" source="./marshal_positions.shp|layername=marshal_positions" name="marshal_positions">
+      <layer-tree-layer source="./marshal_positions.shp|layername=marshal_positions" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" name="marshal_positions" checked="Qt::Unchecked" providerKey="ogr">
         <customproperties>
           <property key="legend/expressionFilter" value=""/>
           <property key="legend/expressionFilterEnabled" value="false"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer providerKey="ogr" expanded="1" id="extra_security20170921130834191" checked="Qt::Unchecked" source="./extra_security.shp" name="extra_security">
+      <layer-tree-layer source="./extra_security.shp" expanded="1" id="extra_security20170921130834191" name="extra_security" checked="Qt::Unchecked" providerKey="ogr">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer providerKey="delimitedtext" expanded="1" id="marshals_by_position20161003112326575" checked="Qt::Unchecked" source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" name="marshals_by_position">
+      <layer-tree-layer source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" expanded="1" id="marshals_by_position20161003112326575" name="marshals_by_position" checked="Qt::Unchecked" providerKey="delimitedtext">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-layer providerKey="virtual" expanded="1" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" checked="Qt::Unchecked" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" name="complete_marshal_overview">
+      <layer-tree-layer source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" expanded="1" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" name="complete_marshal_overview" checked="Qt::Unchecked" providerKey="virtual">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-layer providerKey="ogr" expanded="0" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" checked="Qt::Unchecked" source="./marshal overviews.shp|layername=marshal overviews" name="marshal_overviews">
+      <layer-tree-layer source="./marshal overviews.shp|layername=marshal overviews" expanded="0" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" name="marshal_overviews" checked="Qt::Unchecked" providerKey="ogr">
         <customproperties>
           <property key="legend/expressionFilter" value=""/>
           <property key="legend/expressionFilterEnabled" value="false"/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" checked="Qt::Checked" name="Fencing and Cones">
+    <layer-tree-group expanded="1" name="Fencing and Cones" checked="Qt::Unchecked">
       <customproperties/>
-      <layer-tree-layer providerKey="ogr" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" checked="Qt::Checked" source="./fencing.shp|layername=fencing" name="fencing">
+      <layer-tree-layer source="./fencing.shp|layername=fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" name="fencing" checked="Qt::Checked" providerKey="ogr">
         <customproperties>
           <property key="expandedLegendNodes" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
           <property key="legend/expressionFilter" value=""/>
           <property key="legend/expressionFilterEnabled" value="false"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer providerKey="virtual" expanded="1" id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" checked="Qt::Unchecked" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" name="fence_groups">
+      <layer-tree-layer source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" expanded="1" id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" name="fence_groups" checked="Qt::Unchecked" providerKey="virtual">
         <customproperties/>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" checked="Qt::Checked" name="Routes">
+    <layer-tree-group expanded="1" name="Routes" checked="Qt::Unchecked">
       <customproperties/>
-      <layer-tree-layer providerKey="ogr" expanded="0" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" checked="Qt::Unchecked" source="./timelapse.shp|layername=timelapse" name="timelapse">
+      <layer-tree-layer source="./timelapse.shp|layername=timelapse" expanded="0" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" name="timelapse" checked="Qt::Unchecked" providerKey="ogr">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-group expanded="1" checked="Qt::Unchecked" name="Markers">
+      <layer-tree-group expanded="1" name="Markers" checked="Qt::Unchecked">
         <customproperties/>
-        <layer-tree-layer providerKey="memory" expanded="1" id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" checked="Qt::Checked" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:Integer64(10,0)&amp;field=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={3d8e4e7b-efb1-4912-8f83-a6abd6543ea7}" name="route markers">
+        <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={3955fc09-b9fc-4501-ba8d-c8444564817c}" expanded="1" id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" name="route markers" checked="Qt::Checked" providerKey="memory">
           <customproperties>
             <property key="expandedLegendNodes"/>
             <property key="showFeatureCount" value="1"/>
           </customproperties>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-layer providerKey="ogr" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" checked="Qt::Checked" source="./all_routes.shp|layername=all_routes" name="all_routes">
+      <layer-tree-layer source="./all_routes.shp|layername=all_routes" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" name="all_routes" checked="Qt::Checked" providerKey="ogr">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" checked="Qt::Checked" name="Feeding Stations">
+    <layer-tree-group expanded="1" name="Feeding Stations" checked="Qt::Unchecked">
       <customproperties/>
-      <layer-tree-layer providerKey="ogr" expanded="1" id="water_tables20170921142016467" checked="Qt::Checked" source="./water_tables.shp" name="water_tables">
+      <layer-tree-layer source="./water_tables.shp" expanded="1" id="water_tables20170921142016467" name="water_tables" checked="Qt::Checked" providerKey="ogr">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Ask Me">
+    <layer-tree-group expanded="0" name="Ask Me" checked="Qt::Unchecked">
       <customproperties/>
-      <layer-tree-layer providerKey="ogr" expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" checked="Qt::Unchecked" source="./poi_labels.shp|layername=poi_labels" name="poi_labels">
+      <layer-tree-layer source="./poi_labels.shp|layername=poi_labels" expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" name="poi_labels" checked="Qt::Unchecked" providerKey="ogr">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-layer providerKey="ogr" expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" checked="Qt::Unchecked" source="./directions_to_start.shp|layername=directions_to_start" name="directions_to_start">
+      <layer-tree-layer source="./directions_to_start.shp|layername=directions_to_start" expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" name="directions_to_start" checked="Qt::Unchecked" providerKey="ogr">
         <customproperties/>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Residents Access">
+    <layer-tree-group expanded="0" name="Residents Access" checked="Qt::Unchecked">
       <customproperties/>
-      <layer-tree-layer providerKey="ogr" expanded="1" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" checked="Qt::Unchecked" source="./viplabels.shp" name="viplabels">
+      <layer-tree-layer source="./mayor.shp" expanded="1" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" name="mayor" checked="Qt::Unchecked" providerKey="ogr">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-layer providerKey="ogr" expanded="1" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" checked="Qt::Unchecked" source="./vipaccess.shp" name="vipaccess">
+      <layer-tree-layer source="./viplabels.shp" expanded="1" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" name="viplabels" checked="Qt::Checked" providerKey="ogr">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-layer providerKey="ogr" expanded="0" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" checked="Qt::Unchecked" source="./golfaccess.shp" name="golfaccess">
+      <layer-tree-layer source="./vipaccess.shp" expanded="1" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" name="vipaccess" checked="Qt::Checked" providerKey="ogr">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-layer providerKey="ogr" expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" checked="Qt::Unchecked" source="./residents_access_roads.shp|layername=residents_access_roads" name="residents_access_roads">
+      <layer-tree-layer source="./golfaccess.shp" expanded="0" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" name="golfaccess" checked="Qt::Unchecked" providerKey="ogr">
+        <customproperties/>
+      </layer-tree-layer>
+      <layer-tree-layer source="./residents_access_roads.shp|layername=residents_access_roads" expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" name="residents_access_roads" checked="Qt::Unchecked" providerKey="ogr">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer providerKey="ogr" expanded="1" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" checked="Qt::Unchecked" source="./residents_access.shp|layername=residents_access" name="residents_access">
+      <layer-tree-layer source="./residents_access.shp|layername=residents_access" expanded="1" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" name="residents_access" checked="Qt::Unchecked" providerKey="ogr">
         <customproperties/>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" checked="Qt::Checked" name="OSM data">
+    <layer-tree-group expanded="1" name="OSM data" checked="Qt::Checked">
       <customproperties/>
-      <layer-tree-layer providerKey="ogr" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" checked="Qt::Checked" source="./osm_roads.shp" name="osm_roads">
+      <layer-tree-layer source="./osm_roads.shp" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" name="osm_roads" checked="Qt::Checked" providerKey="ogr">
         <customproperties>
           <property key="expandedLegendNodes"/>
           <property key="showFeatureCount" value="1"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer providerKey="ogr" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" checked="Qt::Checked" source="./osm_places.shp|layername=osm_places" name="osm_places">
+      <layer-tree-layer source="./osm_places.shp|layername=osm_places" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" name="osm_places" checked="Qt::Checked" providerKey="ogr">
         <customproperties>
           <property key="expandedLegendNodes"/>
           <property key="showFeatureCount" value="1"/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Start and Finish pages">
+    <layer-tree-group expanded="0" name="Start and Finish pages" checked="Qt::Unchecked">
       <customproperties/>
-      <layer-tree-layer providerKey="ogr" expanded="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" checked="Qt::Unchecked" source="./data-comments.shp" name="data-comments">
+      <layer-tree-layer source="./data-comments.shp" expanded="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" name="data-comments" checked="Qt::Unchecked" providerKey="ogr">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer providerKey="ogr" expanded="1" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" checked="Qt::Unchecked" source="./start_finish_area.shp" name="start_finish_area">
+      <layer-tree-layer source="./start_finish_area.shp" expanded="1" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" name="start_finish_area" checked="Qt::Unchecked" providerKey="ogr">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Elevation">
+    <layer-tree-group expanded="0" name="Elevation" checked="Qt::Unchecked">
       <customproperties/>
-      <layer-tree-layer providerKey="ogr" expanded="1" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" checked="Qt::Unchecked" source="./capetownelevation-1m.shp" name="capetownelevation-1m">
+      <layer-tree-layer source="./capetownelevation-1m.shp" expanded="1" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" name="capetownelevation-1m" checked="Qt::Unchecked" providerKey="ogr">
         <customproperties>
           <property key="showFeatureCount" value="1"/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" checked="Qt::Checked" name="Map">
+    <layer-tree-group expanded="1" name="Map" checked="Qt::Checked">
       <customproperties/>
-      <layer-tree-layer providerKey="gdal" expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" checked="Qt::Checked" source="./GDAL-City of Cape Town 2015 Aerial.xml" name="GDAL-City of Cape Town 2015 Aerial">
+      <layer-tree-layer source="./GDAL-City of Cape Town 2015 Aerial.xml" expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" name="GDAL-City of Cape Town 2015 Aerial" checked="Qt::Checked" providerKey="gdal">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer providerKey="wms" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" checked="Qt::Unchecked" 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" name="Outlines">
+      <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" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" name="Outlines" checked="Qt::Unchecked" providerKey="wms">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
@@ -189,42 +192,44 @@
       <item>vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea</item>
       <item>viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0</item>
       <item>fence_groups_cbaea960_3348_4aea_b155_46e5d310f792</item>
+      <item>mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings unit="1" tolerance="10" type="1" intersection-snapping="1" enabled="0" mode="3">
+  <snapping-settings tolerance="10" type="1" enabled="0" unit="1" intersection-snapping="1" mode="3">
     <individual-layer-settings>
-      <layer-setting id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" tolerance="12" type="1" enabled="0" units="1"/>
-      <layer-setting id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" tolerance="12" type="2" enabled="0" units="1"/>
-      <layer-setting id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" tolerance="12" type="1" enabled="0" units="1"/>
-      <layer-setting id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" tolerance="12" type="2" enabled="0" units="1"/>
-      <layer-setting id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" tolerance="12" type="2" enabled="0" units="1"/>
-      <layer-setting id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" tolerance="12" type="2" enabled="0" units="1"/>
-      <layer-setting id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" tolerance="12" type="1" enabled="0" units="1"/>
-      <layer-setting id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" tolerance="12" type="2" enabled="0" units="1"/>
-      <layer-setting id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" tolerance="12" type="2" enabled="0" units="1"/>
-      <layer-setting id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" tolerance="12" type="2" enabled="0" units="1"/>
-      <layer-setting id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" tolerance="12" type="1" enabled="0" units="1"/>
-      <layer-setting id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" tolerance="12" type="2" enabled="0" units="1"/>
-      <layer-setting id="water_tables20170921142016467" tolerance="0" type="2" enabled="0" units="2"/>
-      <layer-setting id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" tolerance="12" type="2" enabled="0" units="1"/>
-      <layer-setting id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" tolerance="12" type="2" enabled="0" units="1"/>
-      <layer-setting id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" tolerance="12" type="2" enabled="0" units="1"/>
-      <layer-setting id="extra_security20170921130834191" tolerance="0" type="2" enabled="0" units="2"/>
-      <layer-setting id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" tolerance="12" type="2" enabled="0" units="1"/>
-      <layer-setting id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" tolerance="20" type="2" enabled="1" units="1"/>
-      <layer-setting id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" tolerance="12" type="2" enabled="0" units="1"/>
-      <layer-setting id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" tolerance="12" type="2" enabled="0" units="1"/>
-      <layer-setting id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" tolerance="12" type="2" enabled="0" units="1"/>
+      <layer-setting tolerance="12" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" type="2" enabled="0" units="1"/>
+      <layer-setting tolerance="12" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" type="1" enabled="0" units="1"/>
+      <layer-setting tolerance="12" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" type="1" enabled="0" units="1"/>
+      <layer-setting tolerance="12" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" type="2" enabled="0" units="1"/>
+      <layer-setting tolerance="12" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" type="2" enabled="0" units="1"/>
+      <layer-setting tolerance="12" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" type="2" enabled="0" units="1"/>
+      <layer-setting tolerance="12" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" type="2" enabled="0" units="1"/>
+      <layer-setting tolerance="12" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" type="2" enabled="0" units="1"/>
+      <layer-setting tolerance="0" id="extra_security20170921130834191" type="2" enabled="0" units="2"/>
+      <layer-setting tolerance="12" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" type="2" enabled="0" units="1"/>
+      <layer-setting tolerance="12" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" type="2" enabled="0" units="1"/>
+      <layer-setting tolerance="12" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" type="1" enabled="0" units="1"/>
+      <layer-setting tolerance="12" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" type="2" enabled="0" units="1"/>
+      <layer-setting tolerance="12" id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" type="2" enabled="0" units="1"/>
+      <layer-setting tolerance="12" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" type="2" enabled="0" units="1"/>
+      <layer-setting tolerance="0" id="water_tables20170921142016467" type="2" enabled="0" units="2"/>
+      <layer-setting tolerance="12" id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" type="1" enabled="0" units="1"/>
+      <layer-setting tolerance="12" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" type="1" enabled="0" units="1"/>
+      <layer-setting tolerance="12" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" type="2" enabled="0" units="1"/>
+      <layer-setting tolerance="12" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" type="2" enabled="0" units="1"/>
+      <layer-setting tolerance="12" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" type="2" enabled="0" units="1"/>
+      <layer-setting tolerance="12" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" type="2" enabled="0" units="1"/>
+      <layer-setting tolerance="20" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" type="2" enabled="1" units="1"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
   <mapcanvas annotationsVisible="1" name="theMapCanvas">
     <units>degrees</units>
     <extent>
-      <xmin>18.41692767498590655</xmin>
-      <ymin>-33.90411869074364404</ymin>
-      <xmax>18.4171160058941652</xmax>
-      <ymax>-33.90401241322751957</ymax>
+      <xmin>18.40827367082285093</xmin>
+      <ymin>-33.90790565674178936</ymin>
+      <xmax>18.41115303973960948</xmax>
+      <ymax>-33.90628079218919311</ymax>
     </extent>
     <rotation>0</rotation>
     <destinationsrs>
@@ -244,150 +249,155 @@
   </mapcanvas>
   <projectModels/>
   <legend updateDrawingOrder="true">
-    <legendgroup checked="Qt::Unchecked" open="true" name="Marshals">
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="true" name="marshal_positions">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0"/>
+    <legendgroup name="Marshals" open="true" checked="Qt::Unchecked">
+      <legendlayer name="marshal_positions" open="true" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="true" name="extra_security">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="extra_security20170921130834191" visible="0"/>
+      <legendlayer name="extra_security" open="true" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="extra_security20170921130834191" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="true" name="marshals_by_position">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="marshals_by_position20161003112326575" visible="0"/>
+      <legendlayer name="marshals_by_position" open="true" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="marshals_by_position20161003112326575" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="true" name="complete_marshal_overview">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" visible="0"/>
+      <legendlayer name="complete_marshal_overview" open="true" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="false" name="marshal_overviews">
-        <filegroup hidden="false" open="false">
-          <legendlayerfile isInOverview="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" visible="0"/>
+      <legendlayer name="marshal_overviews" open="false" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1">
+        <filegroup open="false" hidden="false">
+          <legendlayerfile layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Checked" open="true" name="Fencing and Cones">
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" showFeatureCount="0" open="true" name="fencing">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1"/>
+    <legendgroup name="Fencing and Cones" open="true" checked="Qt::Unchecked">
+      <legendlayer name="fencing" open="true" checked="Qt::Checked" showFeatureCount="0" drawingOrder="-1">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="true" name="fence_groups">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" visible="0"/>
+      <legendlayer name="fence_groups" open="true" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Checked" open="true" name="Routes">
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="false" name="timelapse">
-        <filegroup hidden="false" open="false">
-          <legendlayerfile isInOverview="0" layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" visible="0"/>
+    <legendgroup name="Routes" open="true" checked="Qt::Unchecked">
+      <legendlayer name="timelapse" open="false" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1">
+        <filegroup open="false" hidden="false">
+          <legendlayerfile layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendgroup checked="Qt::Unchecked" open="true" name="Markers">
-        <legendlayer checked="Qt::Checked" drawingOrder="-1" showFeatureCount="1" open="true" name="route markers">
-          <filegroup hidden="false" open="true">
-            <legendlayerfile isInOverview="0" layerid="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" visible="0"/>
+      <legendgroup name="Markers" open="true" checked="Qt::Unchecked">
+        <legendlayer name="route markers" open="true" checked="Qt::Checked" showFeatureCount="1" drawingOrder="-1">
+          <filegroup open="true" hidden="false">
+            <legendlayerfile layerid="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" visible="0" isInOverview="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" showFeatureCount="0" open="true" name="all_routes">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1"/>
+      <legendlayer name="all_routes" open="true" checked="Qt::Checked" showFeatureCount="0" drawingOrder="-1">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Checked" open="true" name="Feeding Stations">
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" showFeatureCount="0" open="true" name="water_tables">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="water_tables20170921142016467" visible="1"/>
+    <legendgroup name="Feeding Stations" open="true" checked="Qt::Unchecked">
+      <legendlayer name="water_tables" open="true" checked="Qt::Checked" showFeatureCount="0" drawingOrder="-1">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="water_tables20170921142016467" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" open="false" name="Ask Me">
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="true" name="poi_labels">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" visible="0"/>
+    <legendgroup name="Ask Me" open="false" checked="Qt::Unchecked">
+      <legendlayer name="poi_labels" open="true" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="true" name="directions_to_start">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="0"/>
+      <legendlayer name="directions_to_start" open="true" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" open="false" name="Residents Access">
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="true" name="viplabels">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" visible="0"/>
+    <legendgroup name="Residents Access" open="false" checked="Qt::Unchecked">
+      <legendlayer name="mayor" open="true" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="true" name="vipaccess">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" visible="0"/>
+      <legendlayer name="viplabels" open="true" checked="Qt::Checked" showFeatureCount="0" drawingOrder="-1">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="false" name="golfaccess">
-        <filegroup hidden="false" open="false">
-          <legendlayerfile isInOverview="0" layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" visible="0"/>
+      <legendlayer name="vipaccess" open="true" checked="Qt::Checked" showFeatureCount="0" drawingOrder="-1">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="true" name="residents_access_roads">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="0"/>
+      <legendlayer name="golfaccess" open="false" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1">
+        <filegroup open="false" hidden="false">
+          <legendlayerfile layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="true" name="residents_access">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" visible="0"/>
+      <legendlayer name="residents_access_roads" open="true" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="0" isInOverview="0"/>
+        </filegroup>
+      </legendlayer>
+      <legendlayer name="residents_access" open="true" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Checked" open="true" name="OSM data">
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" showFeatureCount="1" open="false" name="osm_roads">
-        <filegroup hidden="false" open="false">
-          <legendlayerfile isInOverview="0" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
+    <legendgroup name="OSM data" open="true" checked="Qt::Checked">
+      <legendlayer name="osm_roads" open="false" checked="Qt::Checked" showFeatureCount="1" drawingOrder="-1">
+        <filegroup open="false" hidden="false">
+          <legendlayerfile layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" showFeatureCount="1" open="true" name="osm_places">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1"/>
+      <legendlayer name="osm_places" open="true" checked="Qt::Checked" showFeatureCount="1" drawingOrder="-1">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" open="false" name="Start and Finish pages">
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="true" name="data-comments">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" visible="0"/>
+    <legendgroup name="Start and Finish pages" open="false" checked="Qt::Unchecked">
+      <legendlayer name="data-comments" open="true" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="true" name="start_finish_area">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" visible="0"/>
+      <legendlayer name="start_finish_area" open="true" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" open="false" name="Elevation">
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="1" open="true" name="capetownelevation-1m">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" visible="0"/>
+    <legendgroup name="Elevation" open="false" checked="Qt::Unchecked">
+      <legendlayer name="capetownelevation-1m" open="true" checked="Qt::Unchecked" showFeatureCount="1" drawingOrder="-1">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Checked" open="true" name="Map">
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" showFeatureCount="0" open="true" name="GDAL-City of Cape Town 2015 Aerial">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1"/>
+    <legendgroup name="Map" open="true" checked="Qt::Checked">
+      <legendlayer name="GDAL-City of Cape Town 2015 Aerial" open="true" checked="Qt::Checked" showFeatureCount="0" drawingOrder="-1">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="true" name="Outlines">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="0"/>
+      <legendlayer name="Outlines" open="true" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
@@ -395,7 +405,7 @@
   <mapViewDocks/>
   <mapViewDocks3D/>
   <projectlayers>
-    <maplayer autoRefreshEnabled="0" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="100000" type="raster" minScale="1e+08" refreshOnNotifyMessage="" autoRefreshTime="0" styleCategories="AllStyleCategories">
+    <maplayer hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" type="raster" maxScale="100000" styleCategories="AllStyleCategories" refreshOnNotifyEnabled="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0">
       <extent>
         <xmin>-20037508.33999999985098839</xmin>
         <ymin>-20037508.33999999985098839</ymin>
@@ -448,11 +458,11 @@
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" miny="0" crs="" dimensions="2" maxy="0" maxz="0" maxx="0"/>
+          <spatial dimensions="2" miny="0" maxx="0" minz="0" minx="0" crs="" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -463,9 +473,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"/>
@@ -482,7 +492,7 @@
         <property key="identify/format" value="Value"/>
       </customproperties>
       <pipe>
-        <rasterrenderer type="multibandcolor" greenBand="2" alphaBand="-1" opacity="0.6" redBand="1" blueBand="3">
+        <rasterrenderer type="multibandcolor" opacity="0.5" alphaBand="-1" blueBand="3" redBand="1" greenBand="2">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -493,13 +503,13 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast brightness="0" contrast="0"/>
-        <huesaturation colorizeGreen="128" grayscaleMode="0" colorizeRed="255" colorizeBlue="128" saturation="0" colorizeOn="0" colorizeStrength="100"/>
+        <brightnesscontrast contrast="0" brightness="0"/>
+        <huesaturation grayscaleMode="0" colorizeRed="255" colorizeOn="0" colorizeGreen="128" saturation="0" colorizeStrength="100" colorizeBlue="128"/>
         <rasterresampler maxOversampling="2"/>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" type="raster" minScale="1e+08" refreshOnNotifyMessage="" autoRefreshTime="0" styleCategories="AllStyleCategories">
+    <maplayer hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" type="raster" maxScale="0" styleCategories="AllStyleCategories" refreshOnNotifyEnabled="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0">
       <extent>
         <xmin>-20037508.34278924390673637</xmin>
         <ymin>-20037508.62692910060286522</ymin>
@@ -552,11 +562,11 @@
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" miny="0" crs="" dimensions="2" maxy="0" maxz="0" maxx="0"/>
+          <spatial dimensions="2" miny="0" maxx="0" minz="0" minx="0" crs="" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -567,7 +577,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"/>
@@ -584,7 +594,7 @@
         <property key="identify/format" value="Undefined"/>
       </customproperties>
       <pipe>
-        <rasterrenderer type="singlebandcolordata" band="1" alphaBand="-1" opacity="0.75">
+        <rasterrenderer type="singlebandcolordata" opacity="0.75" alphaBand="-1" band="1">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -595,13 +605,13 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast brightness="0" contrast="0"/>
-        <huesaturation colorizeGreen="128" grayscaleMode="0" colorizeRed="255" colorizeBlue="128" saturation="0" colorizeOn="0" colorizeStrength="100"/>
+        <brightnesscontrast contrast="0" brightness="0"/>
+        <huesaturation grayscaleMode="0" colorizeRed="255" colorizeOn="0" colorizeGreen="128" saturation="0" colorizeStrength="100" colorizeBlue="128"/>
         <rasterresampler maxOversampling="2"/>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer simplifyDrawingHints="0" readOnly="0" simplifyAlgorithm="0" autoRefreshTime="0" geometry="Line" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="100000" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" type="vector" simplifyLocal="1" refreshOnNotifyMessage="" minScale="1e+08" refreshOnNotifyEnabled="0" labelsEnabled="1" wkbType="MultiLineString">
+    <maplayer refreshOnNotifyMessage="" readOnly="0" autoRefreshEnabled="0" simplifyDrawingHints="0" geometry="Line" labelsEnabled="1" wkbType="MultiLineString" simplifyDrawingTol="1" simplifyAlgorithm="0" type="vector" autoRefreshTime="0" maxScale="100000" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" minScale="1e+08" styleCategories="AllStyleCategories" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37527226735897301</xmin>
         <ymin>-33.94586066151139647</ymin>
@@ -654,11 +664,11 @@
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" miny="0" crs="" dimensions="2" maxy="0" maxz="0" maxx="0"/>
+          <spatial dimensions="2" miny="0" maxx="0" minz="0" minx="0" crs="" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -673,8 +683,8 @@
       <dataDependencies/>
       <legend type="default-vector"/>
       <expressionfields>
-        <field comment="" type="2" subType="0" expression="$length" name="length_m" precision="0" length="6" typeName="integer"/>
-        <field comment="" type="6" subType="0" expression="$length / 1000" name="length_km" precision="0" length="-1" typeName="double precision"/>
+        <field expression="$length" type="2" name="length_m" comment="" length="6" subType="0" precision="0" typeName="integer"/>
+        <field expression="$length / 1000" type="6" name="length_km" comment="" length="-1" subType="0" precision="0" typeName="double precision"/>
       </expressionfields>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -685,96 +695,96 @@
         <Removable>0</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="RuleRenderer" enableorderby="0" symbollevels="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" enableorderby="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule label="Active Routes" description="Only show when active in Atlas" checkstate="0" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" symbol="0" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )">
-            <rule label="21KM" description="This should be disabled, since it's only for legends" checkstate="0" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" symbol="1" filter="&quot;Distance&quot; = '21KM'"/>
-            <rule label="10KM" description="This should be disabled, since it's only for legends" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" symbol="2" filter="&quot;Distance&quot; = '10KM'"/>
-            <rule label="5KM" description="This should be disabled, since it's only for legends" checkstate="0" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" symbol="3" filter="&quot;Distance&quot; = '25'"/>
+          <rule key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" symbol="0" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )" label="Active Routes" checkstate="0" description="Only show when active in Atlas">
+            <rule key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" symbol="1" filter="&quot;Distance&quot; = '21KM'" label="21KM" checkstate="0" description="This should be disabled, since it's only for legends"/>
+            <rule key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" symbol="2" filter="&quot;Distance&quot; = '10KM'" label="10KM" description="This should be disabled, since it's only for legends"/>
+            <rule key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" symbol="3" filter="&quot;Distance&quot; = '25'" label="5KM" checkstate="0" description="This should be disabled, since it's only for legends"/>
           </rule>
-          <rule label="Always show" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" symbol="4"/>
+          <rule key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" symbol="4" label="Always show"/>
         </rules>
         <symbols>
-          <symbol type="line" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="250" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+          <symbol alpha="1" force_rhr="0" type="line" clip_to_extent="1" name="0">
+            <layer locked="0" enabled="1" pass="0" 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"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="250"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@0@0" clip_to_extent="1" force_rhr="0">
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="0,0,0,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol alpha="1" force_rhr="0" type="marker" clip_to_extent="1" name="@0@0">
+                <layer locked="0" enabled="1" pass="0" class="FilledMarker">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="0,0,0,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@0@0@0" clip_to_extent="1" force_rhr="0">
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="0,0,0,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="227,26,28,0" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol alpha="1" force_rhr="0" type="fill" clip_to_extent="1" name="@@0@0@0">
+                    <layer locked="0" enabled="1" pass="0" 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"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="227,26,28,0"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option type="bool" value="true" name="active"/>
-                              <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
-                              <Option type="int" value="3" name="type"/>
+                              <Option type="bool" name="active" value="true"/>
+                              <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option type="int" name="type" value="3"/>
                             </Option>
                           </Option>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -782,236 +792,236 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MapUnit" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.5" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <layer locked="0" enabled="1" pass="0" class="SimpleLine">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MapUnit"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,0,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.5"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="lastvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer locked="0" enabled="1" pass="0" 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"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="lastvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@0@2" clip_to_extent="1" force_rhr="0">
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="0,0,0,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol alpha="1" force_rhr="0" type="marker" clip_to_extent="1" name="@0@2">
+                <layer locked="0" enabled="1" pass="0" class="SimpleMarker">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="0,0,0,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" value="true" name="active"/>
-                          <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
-                          <Option type="int" value="3" name="type"/>
+                          <Option type="bool" name="active" value="true"/>
+                          <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                          <Option type="int" name="type" value="3"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="firstvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer locked="0" enabled="1" pass="0" 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"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="firstvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@0@3" clip_to_extent="1" force_rhr="0">
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="0,0,0,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol alpha="1" force_rhr="0" type="marker" clip_to_extent="1" name="@0@3">
+                <layer locked="0" enabled="1" pass="0" class="SimpleMarker">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="0,0,0,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" value="true" name="active"/>
-                          <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
-                          <Option type="int" value="3" name="type"/>
+                          <Option type="bool" name="active" value="true"/>
+                          <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                          <Option type="int" name="type" value="3"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="1" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="250" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+          <symbol alpha="1" force_rhr="0" type="line" clip_to_extent="1" name="1">
+            <layer locked="0" enabled="1" pass="0" 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"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="250"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@1@0" clip_to_extent="1" force_rhr="0">
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="210,32,39,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol alpha="1" force_rhr="0" type="marker" clip_to_extent="1" name="@1@0">
+                <layer locked="0" enabled="1" pass="0" class="FilledMarker">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="210,32,39,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@1@0@0" clip_to_extent="1" force_rhr="0">
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="210,32,39,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="227,26,28,0" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol alpha="1" force_rhr="0" type="fill" clip_to_extent="1" name="@@1@0@0">
+                    <layer locked="0" enabled="1" pass="0" 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"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="227,26,28,0"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option type="bool" value="false" name="active"/>
-                              <Option type="int" value="1" name="type"/>
-                              <Option type="QString" value="" name="val"/>
+                              <Option type="bool" name="active" value="false"/>
+                              <Option type="int" name="type" value="1"/>
+                              <Option type="QString" name="val" value=""/>
                             </Option>
                           </Option>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1019,236 +1029,236 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MapUnit" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="210,32,39,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.5" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <layer locked="0" enabled="1" pass="0" class="SimpleLine">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MapUnit"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="210,32,39,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.5"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="lastvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer locked="0" enabled="1" pass="0" 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"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="lastvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@1@2" clip_to_extent="1" force_rhr="0">
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="210,32,39,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol alpha="1" force_rhr="0" type="marker" clip_to_extent="1" name="@1@2">
+                <layer locked="0" enabled="1" pass="0" class="SimpleMarker">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="210,32,39,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="firstvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer locked="0" enabled="1" pass="0" 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"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="firstvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@1@3" clip_to_extent="1" force_rhr="0">
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="210,32,39,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol alpha="1" force_rhr="0" type="marker" clip_to_extent="1" name="@1@3">
+                <layer locked="0" enabled="1" pass="0" class="SimpleMarker">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="210,32,39,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="2" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="250" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+          <symbol alpha="1" force_rhr="0" type="line" clip_to_extent="1" name="2">
+            <layer locked="0" enabled="1" pass="0" 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"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="250"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@2@0" clip_to_extent="1" force_rhr="0">
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="103,34,144,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol alpha="1" force_rhr="0" type="marker" clip_to_extent="1" name="@2@0">
+                <layer locked="0" enabled="1" pass="0" class="FilledMarker">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="103,34,144,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@2@0@0" clip_to_extent="1" force_rhr="0">
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="103,34,144,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="227,26,28,0" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol alpha="1" force_rhr="0" type="fill" clip_to_extent="1" name="@@2@0@0">
+                    <layer locked="0" enabled="1" pass="0" 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"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="227,26,28,0"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option type="bool" value="false" name="active"/>
-                              <Option type="int" value="1" name="type"/>
-                              <Option type="QString" value="" name="val"/>
+                              <Option type="bool" name="active" value="false"/>
+                              <Option type="int" name="type" value="1"/>
+                              <Option type="QString" name="val" value=""/>
                             </Option>
                           </Option>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1256,236 +1266,236 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MapUnit" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="103,34,144,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.5" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <layer locked="0" enabled="1" pass="0" class="SimpleLine">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MapUnit"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="103,34,144,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.5"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="lastvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer locked="0" enabled="1" pass="0" 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"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="lastvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@2@2" clip_to_extent="1" force_rhr="0">
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="103,34,144,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol alpha="1" force_rhr="0" type="marker" clip_to_extent="1" name="@2@2">
+                <layer locked="0" enabled="1" pass="0" class="SimpleMarker">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="103,34,144,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="firstvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer locked="0" enabled="1" pass="0" 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"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="firstvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@2@3" clip_to_extent="1" force_rhr="0">
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="103,34,144,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol alpha="1" force_rhr="0" type="marker" clip_to_extent="1" name="@2@3">
+                <layer locked="0" enabled="1" pass="0" class="SimpleMarker">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="103,34,144,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="3" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="250" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+          <symbol alpha="1" force_rhr="0" type="line" clip_to_extent="1" name="3">
+            <layer locked="0" enabled="1" pass="0" 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"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="250"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@3@0" clip_to_extent="1" force_rhr="0">
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="145,211,55,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol alpha="1" force_rhr="0" type="marker" clip_to_extent="1" name="@3@0">
+                <layer locked="0" enabled="1" pass="0" class="FilledMarker">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="145,211,55,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@3@0@0" clip_to_extent="1" force_rhr="0">
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="145,211,55,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="227,26,28,0" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol alpha="1" force_rhr="0" type="fill" clip_to_extent="1" name="@@3@0@0">
+                    <layer locked="0" enabled="1" pass="0" 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"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="227,26,28,0"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option type="bool" value="false" name="active"/>
-                              <Option type="int" value="1" name="type"/>
-                              <Option type="QString" value="" name="val"/>
+                              <Option type="bool" name="active" value="false"/>
+                              <Option type="int" name="type" value="1"/>
+                              <Option type="QString" name="val" value=""/>
                             </Option>
                           </Option>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1493,185 +1503,185 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MapUnit" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="145,211,55,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.5" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <layer locked="0" enabled="1" pass="0" class="SimpleLine">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MapUnit"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="145,211,55,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.5"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="lastvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer locked="0" enabled="1" pass="0" 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"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="lastvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@3@2" clip_to_extent="1" force_rhr="0">
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="145,211,55,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol alpha="1" force_rhr="0" type="marker" clip_to_extent="1" name="@3@2">
+                <layer locked="0" enabled="1" pass="0" class="SimpleMarker">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="145,211,55,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="firstvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer locked="0" enabled="1" pass="0" 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"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="firstvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@3@3" clip_to_extent="1" force_rhr="0">
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="145,211,55,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol alpha="1" force_rhr="0" type="marker" clip_to_extent="1" name="@3@3">
+                <layer locked="0" enabled="1" pass="0" class="SimpleMarker">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="145,211,55,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="4" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.26" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol alpha="1" force_rhr="0" type="line" clip_to_extent="1" name="4">
+            <layer locked="0" enabled="1" pass="0" class="SimpleLine">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,0,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.26"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -1683,53 +1693,53 @@
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{86cc78bd-cf95-435a-99c5-13093c859aa5}">
-          <rule active="0" description="Active routes" key="{68d5cde2-f285-4651-b007-1511cc17bfbe}" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
+          <rule key="{68d5cde2-f285-4651-b007-1511cc17bfbe}" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" active="0" description="Active routes">
             <settings>
-              <text-style fontItalic="0" fieldName="round($length / 1000, 0)" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="63" blendMode="0" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="10" multilineHeight="1" textOpacity="1" fontSizeUnit="Point" textColor="255,255,255,255" namedStyle="Semibold" fontFamily="Myriad Pro" isExpression="1">
-                <text-buffer bufferOpacity="1" bufferJoinStyle="64" bufferSize="1" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255"/>
-                <background shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeType="0" shapeRadiiY="1" shapeBlendMode="0" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="0,0,0,255" shapeJoinStyle="128" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="1" shapeRadiiX="1" shapeSizeX="1" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-                <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+              <text-style fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" fontSizeUnit="Point" fieldName="round($length / 1000, 0)" multilineHeight="1" fontUnderline="0" fontWordSpacing="0" useSubstitutions="0" fontItalic="0" fontSize="10" textColor="255,255,255,255" fontCapitals="0" isExpression="1" textOpacity="1" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" blendMode="0">
+                <text-buffer bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0"/>
+                <background shapeSizeType="0" shapeOffsetY="0" shapeFillColor="0,0,0,255" shapeSizeUnit="MM" shapeSizeX="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeType="0" shapeDraw="1" shapeBorderColor="0,0,0,255" shapeOpacity="1" shapeRadiiUnit="MM" shapeBorderWidth="1" shapeOffsetX="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeBlendMode="0" shapeJoinStyle="128" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowUnder="0" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowDraw="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowScale="100"/>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" wrapChar="" placeDirectionSymbol="0" decimals="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="0" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-              <placement quadOffset="3" preserveRotation="1" geometryGenerator="km_marker()" placement="0" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" priority="10" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-20" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" offsetUnits="MapUnit" placementFlags="10" geometryGeneratorEnabled="1" dist="2" offsetType="0"/>
-              <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="1" fontLimitPixelSize="0" displayAll="1" obstacleFactor="2" obstacle="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="0" maxNumLabels="2000" scaleMax="10000000"/>
+              <text-format wrapChar="" multilineAlign="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0" plussign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0" decimals="0" addDirectionSymbol="0"/>
+              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" fitInPolygonOnly="0" quadOffset="3" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" yOffset="0" maxCurvedCharAngleIn="20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" priority="10" maxCurvedCharAngleOut="-20" dist="2" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" rotationAngle="0" centroidInside="0" placementFlags="10" geometryGeneratorEnabled="1" geometryGenerator="km_marker()" repeatDistance="0" distUnits="MM" preserveRotation="1" offsetType="0" centroidWhole="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering obstacleType="0" zIndex="0" drawLabels="1" fontMaxPixelSize="10000" scaleMin="1" scaleMax="10000000" obstacleFactor="2" fontMinPixelSize="3" labelPerPart="0" displayAll="1" maxNumLabels="2000" limitNumLabels="0" mergeLines="0" fontLimitPixelSize="0" minFeatureSize="0" scaleVisibility="0" upsidedownLabels="0" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="PositionX">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                     <Option type="Map" name="PredefinedPositionOrder">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="quadrant" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="quadrant"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                     <Option type="Map" name="Rotation">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="rotation" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="field" value="rotation"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                     <Option type="Map" name="ShapeBorderColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </settings>
@@ -1757,21 +1767,21 @@
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundColor="#ffffff" backgroundAlpha="255" labelPlacementMethod="XHeight" lineSizeType="MM" minimumSize="0" diagramOrientation="Up" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" barWidth="5" penWidth="0" penColor="#000000" width="15" scaleDependency="Area" minScaleDenominator="100000" height="15" scaleBasedVisibility="0" rotationOffset="270" enabled="0">
+        <DiagramCategory maxScaleDenominator="1e+08" minScaleDenominator="100000" backgroundAlpha="255" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" scaleBasedVisibility="0" lineSizeType="MM" opacity="1" diagramOrientation="Up" width="15" rotationOffset="270" scaleDependency="Area" barWidth="5" labelPlacementMethod="XHeight" penColor="#000000" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" enabled="0" penWidth="0" height="15">
           <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" color="#000000"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="2" zIndex="0" obstacle="0" linePlacementFlags="2" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" placement="2" dist="0" showAll="1" linePlacementFlags="2" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -1780,8 +1790,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -1790,8 +1800,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -1800,8 +1810,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -1810,8 +1820,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -1820,8 +1830,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -1830,8 +1840,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -1840,8 +1850,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -1850,8 +1860,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -1860,8 +1870,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -1870,8 +1880,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -1904,49 +1914,49 @@
         <default field="length_km" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="Name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="descriptio" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="timestamp" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="begin" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="end" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Distance" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="RouteLen" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Source" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="length_m" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="length_km" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint exp_strength="0" field="Name" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="descriptio" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="timestamp" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="begin" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="end" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="Distance" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="RouteLen" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="Source" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="length_m" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="length_km" notnull_strength="0" constraints="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="Name" desc="" exp=""/>
+        <constraint field="descriptio" desc="" exp=""/>
+        <constraint field="timestamp" desc="" exp=""/>
+        <constraint field="begin" desc="" exp=""/>
+        <constraint field="end" desc="" exp=""/>
+        <constraint field="Distance" desc="" exp=""/>
+        <constraint field="RouteLen" desc="" exp=""/>
+        <constraint field="Source" desc="" exp=""/>
+        <constraint field="length_m" desc="" exp=""/>
+        <constraint field="length_km" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields>
-        <field comment="" type="2" subType="0" expression="$length" name="length_m" precision="0" length="6" typeName="integer"/>
-        <field comment="" type="6" subType="0" expression="$length / 1000" name="length_km" precision="0" length="-1" typeName="double precision"/>
+        <field expression="$length" type="2" name="length_m" comment="" length="6" subType="0" precision="0" typeName="integer"/>
+        <field expression="$length / 1000" type="6" name="length_km" comment="" length="-1" subType="0" precision="0" typeName="double precision"/>
       </expressionfields>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;Name&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;Name&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="Name"/>
-          <column hidden="0" type="field" width="-1" name="descriptio"/>
-          <column hidden="0" type="field" width="-1" name="timestamp"/>
-          <column hidden="0" type="field" width="163" name="begin"/>
-          <column hidden="0" type="field" width="-1" name="end"/>
-          <column hidden="0" type="field" width="-1" name="Distance"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="RouteLen"/>
-          <column hidden="0" type="field" width="-1" name="Source"/>
-          <column hidden="0" type="field" width="-1" name="length_m"/>
-          <column hidden="0" type="field" width="-1" name="length_km"/>
+          <column width="-1" type="field" name="Name" hidden="0"/>
+          <column width="-1" type="field" name="descriptio" hidden="0"/>
+          <column width="-1" type="field" name="timestamp" hidden="0"/>
+          <column width="163" type="field" name="begin" hidden="0"/>
+          <column width="-1" type="field" name="end" hidden="0"/>
+          <column width="-1" type="field" name="Distance" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column width="-1" type="field" name="RouteLen" hidden="0"/>
+          <column width="-1" type="field" name="Source" hidden="0"/>
+          <column width="-1" type="field" name="length_m" hidden="0"/>
+          <column width="-1" type="field" name="length_km" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -1977,16 +1987,16 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Source"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="end"/>
-        <field editable="0" name="length_km"/>
-        <field editable="0" name="length_m"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="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"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="Distance"/>
@@ -2004,7 +2014,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="1" readOnly="0" simplifyAlgorithm="0" autoRefreshTime="0" geometry="Line" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" type="vector" simplifyLocal="1" refreshOnNotifyMessage="" minScale="1e+08" refreshOnNotifyEnabled="0" labelsEnabled="0" wkbType="MultiLineString">
+    <maplayer refreshOnNotifyMessage="" readOnly="0" autoRefreshEnabled="0" simplifyDrawingHints="1" geometry="Line" labelsEnabled="0" wkbType="MultiLineString" simplifyDrawingTol="1" simplifyAlgorithm="0" type="vector" autoRefreshTime="0" maxScale="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" minScale="1e+08" styleCategories="AllStyleCategories" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>17.99958333333333371</xmin>
         <ymin>-34.00041666666666629</ymin>
@@ -2048,7 +2058,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -2068,31 +2078,31 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" enableorderby="0" symbollevels="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol type="line" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="183,72,75,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.26" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol alpha="1" force_rhr="0" type="line" clip_to_extent="1" name="0">
+            <layer locked="0" enabled="1" pass="0" class="SimpleLine">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="183,72,75,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.26"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -2105,7 +2115,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>
@@ -2145,20 +2155,20 @@ def my_form_open(dialog, layer, feature):
         <default field="elevation" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="ID" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="height" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="elevation" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint exp_strength="0" field="ID" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="height" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="elevation" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="ID" exp="" desc=""/>
-        <constraint field="height" exp="" desc=""/>
-        <constraint field="elevation" exp="" desc=""/>
+        <constraint field="ID" desc="" exp=""/>
+        <constraint field="height" desc="" exp=""/>
+        <constraint field="elevation" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -2178,7 +2188,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="1" readOnly="0" simplifyAlgorithm="0" autoRefreshTime="0" geometry="Polygon" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" type="vector" simplifyLocal="1" refreshOnNotifyMessage="" minScale="1e+08" refreshOnNotifyEnabled="0" labelsEnabled="0" wkbType="Polygon">
+    <maplayer refreshOnNotifyMessage="" readOnly="0" autoRefreshEnabled="0" simplifyDrawingHints="1" geometry="Polygon" labelsEnabled="0" wkbType="Polygon" simplifyDrawingTol="1" simplifyAlgorithm="0" type="vector" autoRefreshTime="0" maxScale="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" minScale="1e+08" styleCategories="AllStyleCategories" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.94678832168284544</ymin>
@@ -2222,7 +2232,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -2244,26 +2254,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" enableorderby="0" symbollevels="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol type="fill" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="225,89,137,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
+          <symbol alpha="1" force_rhr="0" type="fill" clip_to_extent="1" name="0">
+            <layer locked="0" enabled="1" pass="0" 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"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="35,35,35,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0.26"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -2276,7 +2286,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 type="QString" value=""/>
         </activeChecks>
@@ -2318,20 +2328,20 @@ def my_form_open(dialog, layer, feature):
         <default field="page" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="page" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="page" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="page" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="page" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -2351,7 +2361,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="1" readOnly="0" simplifyAlgorithm="0" autoRefreshTime="0" geometry="Line" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" type="vector" simplifyLocal="1" refreshOnNotifyMessage="" minScale="1e+08" refreshOnNotifyEnabled="0" labelsEnabled="1" wkbType="MultiLineString">
+    <maplayer refreshOnNotifyMessage="" readOnly="0" autoRefreshEnabled="0" simplifyDrawingHints="1" geometry="Line" labelsEnabled="1" wkbType="MultiLineString" simplifyDrawingTol="1" simplifyAlgorithm="0" type="vector" autoRefreshTime="0" maxScale="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" minScale="1e+08" styleCategories="AllStyleCategories" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.41275838185438474</xmin>
         <ymin>-33.90124710387746632</ymin>
@@ -2404,11 +2414,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" miny="0" crs="" dimensions="2" maxy="0" maxz="0" maxx="0"/>
+          <spatial dimensions="2" miny="0" maxx="0" minz="0" minx="0" crs="" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -2432,31 +2442,31 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" enableorderby="0" symbollevels="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol type="line" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,85,255,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="1" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol alpha="1" force_rhr="0" type="line" clip_to_extent="1" name="0">
+            <layer locked="0" enabled="1" pass="0" class="SimpleLine">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,85,255,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="1"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -2467,20 +2477,20 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings>
-          <text-style fontItalic="0" fieldName="Name" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="63" blendMode="0" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="10" multilineHeight="1" textOpacity="1" fontSizeUnit="Point" textColor="0,0,0,255" namedStyle="Semibold" fontFamily="Myriad Pro" isExpression="0">
-            <text-buffer bufferOpacity="1" bufferJoinStyle="128" bufferSize="1" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="1" bufferColor="255,255,255,255"/>
-            <background shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeType="0" shapeRadiiY="0" shapeBlendMode="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="0" shapeRadiiX="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-            <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+          <text-style fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" fontSizeUnit="Point" fieldName="Name" multilineHeight="1" fontUnderline="0" fontWordSpacing="0" useSubstitutions="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" fontCapitals="0" isExpression="0" textOpacity="1" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" blendMode="0">
+            <text-buffer bufferOpacity="1" bufferSize="1" bufferDraw="1" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0"/>
+            <background shapeSizeType="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeType="0" shapeDraw="0" shapeBorderColor="128,128,128,255" shapeOpacity="1" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetX="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeBlendMode="0" shapeJoinStyle="64" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowUnder="0" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowDraw="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowScale="100"/>
             <substitutions/>
           </text-style>
-          <text-format rightDirectionSymbol=">" wrapChar="" placeDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="0" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-          <placement quadOffset="4" preserveRotation="1" geometryGenerator="" placement="2" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" priority="5" geometryGeneratorType="LineGeometry" repeatDistance="0" maxCurvedCharAngleOut="-25" maxCurvedCharAngleIn="25" repeatDistanceUnits="MM" offsetUnits="MM" placementFlags="10" geometryGeneratorEnabled="0" dist="2" offsetType="0"/>
-          <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="0" fontLimitPixelSize="0" displayAll="0" obstacleFactor="1" obstacle="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="0" maxNumLabels="2000" scaleMax="0"/>
+          <text-format wrapChar="" multilineAlign="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0" plussign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0" decimals="3" addDirectionSymbol="0"/>
+          <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" fitInPolygonOnly="0" quadOffset="4" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" yOffset="0" maxCurvedCharAngleIn="25" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" priority="5" maxCurvedCharAngleOut="-25" dist="2" repeatDistanceUnits="MM" geometryGeneratorType="LineGeometry" rotationAngle="0" centroidInside="0" placementFlags="10" geometryGeneratorEnabled="0" geometryGenerator="" repeatDistance="0" distUnits="MM" preserveRotation="1" offsetType="0" centroidWhole="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering obstacleType="0" zIndex="0" drawLabels="1" fontMaxPixelSize="10000" scaleMin="0" scaleMax="0" obstacleFactor="1" fontMinPixelSize="3" labelPerPart="0" displayAll="0" maxNumLabels="2000" limitNumLabels="0" mergeLines="0" fontLimitPixelSize="0" minFeatureSize="0" scaleVisibility="0" upsidedownLabels="0" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </settings>
@@ -2495,21 +2505,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundColor="#ffffff" backgroundAlpha="255" labelPlacementMethod="XHeight" lineSizeType="MM" minimumSize="0" diagramOrientation="Up" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" barWidth="5" penWidth="0" penColor="#000000" width="15" scaleDependency="Area" minScaleDenominator="0" height="15" scaleBasedVisibility="0" rotationOffset="270" enabled="0">
+        <DiagramCategory maxScaleDenominator="1e+08" minScaleDenominator="0" backgroundAlpha="255" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" scaleBasedVisibility="0" lineSizeType="MM" opacity="1" diagramOrientation="Up" width="15" rotationOffset="270" scaleDependency="Area" barWidth="5" labelPlacementMethod="XHeight" penColor="#000000" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" enabled="0" penWidth="0" height="15">
           <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" color="#000000"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="2" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" placement="2" dist="0" showAll="1" linePlacementFlags="18" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -2540,22 +2550,22 @@ def my_form_open(dialog, layer, feature):
         <default field="Name" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="Name" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="Name" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="Name" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="0" type="field" width="-1" name="Name"/>
-          <column hidden="1" type="actions" width="-1"/>
+          <column width="-1" type="field" name="id" hidden="0"/>
+          <column width="-1" type="field" name="Name" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -2586,8 +2596,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="id"/>
+        <field name="Name" editable="1"/>
+        <field name="id" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="Name"/>
@@ -2597,7 +2607,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>Name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="0" readOnly="0" simplifyAlgorithm="0" autoRefreshTime="0" geometry="Line" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="100000" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" type="vector" simplifyLocal="1" refreshOnNotifyMessage="" minScale="1e+08" refreshOnNotifyEnabled="0" labelsEnabled="0" wkbType="MultiLineString">
+    <maplayer refreshOnNotifyMessage="" readOnly="0" autoRefreshEnabled="0" simplifyDrawingHints="0" geometry="Line" labelsEnabled="0" wkbType="MultiLineString" simplifyDrawingTol="1" simplifyAlgorithm="0" type="vector" autoRefreshTime="0" maxScale="100000" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" minScale="1e+08" styleCategories="AllStyleCategories" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.40814103070666974</xmin>
         <ymin>-33.90827185075657724</ymin>
@@ -2650,11 +2660,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" miny="0" crs="" dimensions="2" maxy="0" maxz="0" maxx="0"/>
+          <spatial dimensions="2" miny="0" maxx="0" minz="0" minx="0" crs="" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -2678,140 +2688,140 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="RuleRenderer" enableorderby="0" symbollevels="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" enableorderby="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule label="21KM" description="Only show when active in Atlas" key="{85adf11b-f941-44b6-8847-c828ab845cdc}" symbol="0" filter="&quot;distance&quot; = '21KM'"/>
-          <rule label="10KM" description="Only show when active in Atlas" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" symbol="1" filter="&quot;distance&quot; = '10KM'"/>
-          <rule label="5KM" description="Only show when active in Atlas" key="{cf733f0f-ab72-441e-b213-841aa39c1671}" symbol="2" filter="&quot;distance&quot; = '5KM'"/>
+          <rule key="{85adf11b-f941-44b6-8847-c828ab845cdc}" symbol="0" filter="&quot;distance&quot; = '21KM'" label="21KM" description="Only show when active in Atlas"/>
+          <rule key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" symbol="1" filter="&quot;distance&quot; = '10KM'" label="10KM" description="Only show when active in Atlas"/>
+          <rule key="{cf733f0f-ab72-441e-b213-841aa39c1671}" symbol="2" filter="&quot;distance&quot; = '5KM'" label="5KM" description="Only show when active in Atlas"/>
         </rules>
         <symbols>
-          <symbol type="line" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="lastvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+          <symbol alpha="1" force_rhr="0" type="line" clip_to_extent="1" name="0">
+            <layer locked="0" enabled="1" pass="0" 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"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="placement" v="lastvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@0@0" clip_to_extent="1" force_rhr="0">
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="210,32,39,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="miter" k="joinstyle"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="210,32,39,255" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0.5" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="area" k="scale_method"/>
-                  <prop v="3" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol alpha="1" force_rhr="0" type="marker" clip_to_extent="1" name="@0@0">
+                <layer locked="0" enabled="1" pass="0" class="SimpleMarker">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="210,32,39,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="miter"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="210,32,39,255"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0.5"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="area"/>
+                  <prop k="size" v="3"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="250" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MapUnit" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="100" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer locked="0" enabled="1" pass="0" 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"/>
+              <prop k="interval" v="250"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MapUnit"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="100"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MapUnit"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@0@1" clip_to_extent="1" force_rhr="0">
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="210,32,39,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol alpha="1" force_rhr="0" type="marker" clip_to_extent="1" name="@0@1">
+                <layer locked="0" enabled="1" pass="0" class="FilledMarker">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="210,32,39,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="3"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@0@1@0" clip_to_extent="1" force_rhr="0">
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="210,32,39,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="26,0,201,0" k="outline_color"/>
-                      <prop v="no" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol alpha="1" force_rhr="0" type="fill" clip_to_extent="1" name="@@0@1@0">
+                    <layer locked="0" enabled="1" pass="0" 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"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="26,0,201,0"/>
+                      <prop k="outline_style" v="no"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2819,106 +2829,106 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-              <prop v="flat" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MapUnit" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="miter" k="joinstyle"/>
-              <prop v="210,32,39,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.75" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <layer locked="0" enabled="1" pass="0" 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"/>
+              <prop k="customdash_unit" v="MapUnit"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="miter"/>
+              <prop k="line_color" v="210,32,39,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.75"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="1" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="lastvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+          <symbol alpha="1" force_rhr="0" type="line" clip_to_extent="1" name="1">
+            <layer locked="0" enabled="1" pass="0" 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"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="lastvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@1@0" clip_to_extent="1" force_rhr="0">
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="103,34,144,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol alpha="1" force_rhr="0" type="marker" clip_to_extent="1" name="@1@0">
+                <layer locked="0" enabled="1" pass="0" class="FilledMarker">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="103,34,144,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="3"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@1@0@0" clip_to_extent="1" force_rhr="0">
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="103,34,144,255" k="color"/>
-                      <prop v="miter" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="103,34,144,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0.5" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol alpha="1" force_rhr="0" type="fill" clip_to_extent="1" name="@@1@0@0">
+                    <layer locked="0" enabled="1" pass="0" 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"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="103,34,144,255"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0.5"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2926,79 +2936,79 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="250" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="100" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer locked="0" enabled="1" pass="0" 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"/>
+              <prop k="interval" v="250"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="100"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@1@1" clip_to_extent="1" force_rhr="0">
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="103,34,144,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol alpha="1" force_rhr="0" type="marker" clip_to_extent="1" name="@1@1">
+                <layer locked="0" enabled="1" pass="0" class="FilledMarker">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="103,34,144,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="3"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@1@1@0" clip_to_extent="1" force_rhr="0">
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="103,34,144,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="26,0,201,0" k="outline_color"/>
-                      <prop v="no" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol alpha="1" force_rhr="0" type="fill" clip_to_extent="1" name="@@1@1@0">
+                    <layer locked="0" enabled="1" pass="0" 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"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="26,0,201,0"/>
+                      <prop k="outline_style" v="no"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3006,106 +3016,106 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-              <prop v="flat" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="miter" k="joinstyle"/>
-              <prop v="103,34,144,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.75" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <layer locked="0" enabled="1" pass="0" 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"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="miter"/>
+              <prop k="line_color" v="103,34,144,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.75"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="2" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MapUnit" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="lastvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+          <symbol alpha="1" force_rhr="0" type="line" clip_to_extent="1" name="2">
+            <layer locked="0" enabled="1" pass="0" 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"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MapUnit"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MapUnit"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="placement" v="lastvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@2@0" clip_to_extent="1" force_rhr="0">
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="69,100,25,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol alpha="1" force_rhr="0" type="marker" clip_to_extent="1" name="@2@0">
+                <layer locked="0" enabled="1" pass="0" class="FilledMarker">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="69,100,25,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="3"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@2@0@0" clip_to_extent="1" force_rhr="0">
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="69,100,25,255" k="color"/>
-                      <prop v="miter" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="69,100,25,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0.5" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol alpha="1" force_rhr="0" type="fill" clip_to_extent="1" name="@@2@0@0">
+                    <layer locked="0" enabled="1" pass="0" 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"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="69,100,25,255"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0.5"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3113,79 +3123,79 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="250" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MapUnit" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="100" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer locked="0" enabled="1" pass="0" 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"/>
+              <prop k="interval" v="250"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MapUnit"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="100"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MapUnit"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@2@1" clip_to_extent="1" force_rhr="0">
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="69,100,25,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol alpha="1" force_rhr="0" type="marker" clip_to_extent="1" name="@2@1">
+                <layer locked="0" enabled="1" pass="0" class="FilledMarker">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="69,100,25,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="3"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@2@1@0" clip_to_extent="1" force_rhr="0">
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="69,100,25,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="26,0,201,0" k="outline_color"/>
-                      <prop v="no" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol alpha="1" force_rhr="0" type="fill" clip_to_extent="1" name="@@2@1@0">
+                    <layer locked="0" enabled="1" pass="0" 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"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="26,0,201,0"/>
+                      <prop k="outline_style" v="no"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3193,28 +3203,28 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-              <prop v="flat" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MapUnit" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="miter" k="joinstyle"/>
-              <prop v="69,100,25,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.75" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <layer locked="0" enabled="1" pass="0" 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"/>
+              <prop k="customdash_unit" v="MapUnit"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="miter"/>
+              <prop k="line_color" v="69,100,25,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.75"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -3234,21 +3244,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundColor="#ffffff" backgroundAlpha="255" labelPlacementMethod="XHeight" lineSizeType="MM" minimumSize="0" diagramOrientation="Up" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" barWidth="5" penWidth="0" penColor="#000000" width="15" scaleDependency="Area" minScaleDenominator="100000" height="15" scaleBasedVisibility="0" rotationOffset="270" enabled="0">
+        <DiagramCategory maxScaleDenominator="1e+08" minScaleDenominator="100000" backgroundAlpha="255" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" scaleBasedVisibility="0" lineSizeType="MM" opacity="1" diagramOrientation="Up" width="15" rotationOffset="270" scaleDependency="Area" barWidth="5" labelPlacementMethod="XHeight" penColor="#000000" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" enabled="0" penWidth="0" height="15">
           <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" color="#000000"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="2" zIndex="0" obstacle="0" linePlacementFlags="2" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" placement="2" dist="0" showAll="1" linePlacementFlags="2" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -3264,8 +3274,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -3282,22 +3292,22 @@ def my_form_open(dialog, layer, feature):
         <default field="Distance" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Distance" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="Distance" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="Distance" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="Distance" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;Distance&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;Distance&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="Distance"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="id"/>
+          <column width="-1" type="field" name="Distance" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column width="-1" type="field" name="id" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3328,17 +3338,17 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Source"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="end"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="length_km"/>
-        <field editable="1" name="length_m"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="begin" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="length_km" editable="1"/>
+        <field name="length_m" editable="1"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="Distance"/>
@@ -3357,7 +3367,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="0" readOnly="0" simplifyAlgorithm="0" autoRefreshTime="0" geometry="Point" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="100000" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" type="vector" simplifyLocal="1" refreshOnNotifyMessage="" minScale="1e+08" refreshOnNotifyEnabled="0" labelsEnabled="1" wkbType="Point">
+    <maplayer refreshOnNotifyMessage="" readOnly="0" autoRefreshEnabled="0" simplifyDrawingHints="0" geometry="Point" labelsEnabled="1" wkbType="Point" simplifyDrawingTol="1" simplifyAlgorithm="0" type="vector" autoRefreshTime="0" maxScale="100000" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" minScale="1e+08" styleCategories="AllStyleCategories" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.38517016505928936</xmin>
         <ymin>-33.91987011678683217</ymin>
@@ -3401,7 +3411,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -3421,39 +3431,39 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" enableorderby="0" symbollevels="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol type="marker" alpha="0.796078" name="0" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-              <prop v="0" k="angle"/>
-              <prop v="227,0,185,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,0" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="1" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol alpha="0.796078" force_rhr="0" type="marker" clip_to_extent="1" name="0">
+            <layer locked="0" enabled="1" pass="0" class="SimpleMarker">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="227,0,185,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="circle"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="0,0,0,0"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="1"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="expression" value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -3464,89 +3474,89 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{de1ff1b5-a53a-4841-835f-57785b684a9d}">
-          <rule description="Show in marshal maps" key="{9ea624c1-7179-4746-8777-84b8008475a1}" filter="'marshal' = attribute( $atlasfeature , 'type' )">
+          <rule key="{9ea624c1-7179-4746-8777-84b8008475a1}" filter="'marshal' = attribute( $atlasfeature , 'type' )" description="Show in marshal maps">
             <settings>
-              <text-style fontItalic="0" fieldName="position" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="63" blendMode="0" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="8" multilineHeight="1" textOpacity="1" fontSizeUnit="Point" textColor="0,0,0,255" namedStyle="Semibold" fontFamily="Myriad Pro" isExpression="0">
-                <text-buffer bufferOpacity="1" bufferJoinStyle="64" bufferSize="1" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255"/>
-                <background shapeType="3" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeType="0" shapeRadiiY="0" shapeBlendMode="0" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.2" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="0.4" shapeRadiiX="0" shapeSizeX="0.2" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-                <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+              <text-style fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" fontSizeUnit="Point" fieldName="position" multilineHeight="1" fontUnderline="0" fontWordSpacing="0" useSubstitutions="0" fontItalic="0" fontSize="8" textColor="0,0,0,255" fontCapitals="0" isExpression="0" textOpacity="1" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" blendMode="0">
+                <text-buffer bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0"/>
+                <background shapeSizeType="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeSizeX="0.2" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeType="3" shapeDraw="1" shapeBorderColor="0,0,0,255" shapeOpacity="1" shapeRadiiUnit="MM" shapeBorderWidth="0.4" shapeOffsetX="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeSizeY="0.2" shapeBlendMode="0" shapeJoinStyle="64" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowUnder="0" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowDraw="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowScale="100"/>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" wrapChar="" placeDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="0" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-              <placement quadOffset="4" preserveRotation="1" geometryGenerator="" placement="1" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" priority="8" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-20" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" offsetUnits="MapUnit" placementFlags="10" geometryGeneratorEnabled="0" dist="0" offsetType="0"/>
-              <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="1" fontLimitPixelSize="0" displayAll="1" obstacleFactor="1" obstacle="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="0" maxNumLabels="2000" scaleMax="10000000"/>
+              <text-format wrapChar="" multilineAlign="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0" plussign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0" decimals="3" addDirectionSymbol="0"/>
+              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" fitInPolygonOnly="0" quadOffset="4" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" yOffset="0" maxCurvedCharAngleIn="20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="1" priority="8" maxCurvedCharAngleOut="-20" dist="0" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" rotationAngle="0" centroidInside="0" placementFlags="10" geometryGeneratorEnabled="0" geometryGenerator="" repeatDistance="0" distUnits="MM" preserveRotation="1" offsetType="0" centroidWhole="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering obstacleType="0" zIndex="0" drawLabels="1" fontMaxPixelSize="10000" scaleMin="1" scaleMax="10000000" obstacleFactor="1" fontMinPixelSize="3" labelPerPart="0" displayAll="1" maxNumLabels="2000" limitNumLabels="0" mergeLines="0" fontLimitPixelSize="0" minFeatureSize="0" scaleVisibility="0" upsidedownLabels="0" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="FontStyle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                     <Option type="Map" name="ObstacleFactor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                     <Option type="Map" name="Priority">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                     <Option type="Map" name="Size">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                     <Option type="Map" name="ZIndex">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </settings>
           </rule>
-          <rule description="Show in marshal overview" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}" filter="'marshal plan' = attribute( $atlasfeature , 'type' )">
+          <rule key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}" filter="'marshal plan' = attribute( $atlasfeature , 'type' )" description="Show in marshal overview">
             <settings>
-              <text-style fontItalic="0" fieldName="position" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="63" blendMode="0" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="4" multilineHeight="1" textOpacity="0.9" fontSizeUnit="Point" textColor="227,0,185,255" namedStyle="Semibold" fontFamily="Myriad Pro" isExpression="0">
-                <text-buffer bufferOpacity="1" bufferJoinStyle="64" bufferSize="1" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255"/>
-                <background shapeType="3" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.5" shapeSizeType="0" shapeRadiiY="0" shapeBlendMode="0" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="0.1" shapeRadiiX="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-                <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+              <text-style fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" fontSizeUnit="Point" fieldName="position" multilineHeight="1" fontUnderline="0" fontWordSpacing="0" useSubstitutions="0" fontItalic="0" fontSize="4" textColor="227,0,185,255" fontCapitals="0" isExpression="0" textOpacity="0.9" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" blendMode="0">
+                <text-buffer bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0"/>
+                <background shapeSizeType="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeType="3" shapeDraw="1" shapeBorderColor="0,0,0,255" shapeOpacity="0.5" shapeRadiiUnit="MM" shapeBorderWidth="0.1" shapeOffsetX="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeBlendMode="0" shapeJoinStyle="64" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowUnder="0" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowDraw="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowScale="100"/>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" wrapChar="" placeDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="0" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-              <placement quadOffset="4" preserveRotation="1" geometryGenerator="" placement="6" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" priority="10" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-20" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" offsetUnits="MapUnit" placementFlags="10" geometryGeneratorEnabled="0" dist="1" offsetType="0"/>
-              <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="1" fontLimitPixelSize="0" displayAll="1" obstacleFactor="1" obstacle="0" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="2" maxNumLabels="2000" scaleMax="10000000"/>
+              <text-format wrapChar="" multilineAlign="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0" plussign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0" decimals="3" addDirectionSymbol="0"/>
+              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" fitInPolygonOnly="0" quadOffset="4" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" yOffset="0" maxCurvedCharAngleIn="20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" priority="10" maxCurvedCharAngleOut="-20" dist="1" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" rotationAngle="0" centroidInside="0" placementFlags="10" geometryGeneratorEnabled="0" geometryGenerator="" repeatDistance="0" distUnits="MM" preserveRotation="1" offsetType="0" centroidWhole="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering obstacleType="0" zIndex="2" drawLabels="1" fontMaxPixelSize="10000" scaleMin="1" scaleMax="10000000" obstacleFactor="1" fontMinPixelSize="3" labelPerPart="0" displayAll="1" maxNumLabels="2000" limitNumLabels="0" mergeLines="0" fontLimitPixelSize="0" minFeatureSize="0" scaleVisibility="0" upsidedownLabels="0" obstacle="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="FontStyle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                     <Option type="Map" name="Size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </settings>
@@ -3697,21 +3707,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundColor="#ffffff" backgroundAlpha="255" labelPlacementMethod="XHeight" lineSizeType="MM" minimumSize="0" diagramOrientation="Up" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" barWidth="5" penWidth="0" penColor="#000000" width="15" scaleDependency="Area" minScaleDenominator="100000" height="15" scaleBasedVisibility="0" rotationOffset="270" enabled="0">
+        <DiagramCategory maxScaleDenominator="1e+08" minScaleDenominator="100000" backgroundAlpha="255" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" scaleBasedVisibility="0" lineSizeType="MM" opacity="1" diagramOrientation="Up" width="15" rotationOffset="270" scaleDependency="Area" barWidth="5" labelPlacementMethod="XHeight" penColor="#000000" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" enabled="0" penWidth="0" height="15">
           <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" color="#000000"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="0" zIndex="0" obstacle="0" linePlacementFlags="10" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" placement="0" dist="0" showAll="1" linePlacementFlags="10" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -3720,8 +3730,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -3730,8 +3740,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -3740,8 +3750,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -3760,25 +3770,25 @@ def my_form_open(dialog, layer, feature):
         <default field="type" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="position" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="position" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="position" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="position" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;position&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;position&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="position"/>
-          <column hidden="0" type="field" width="-1" name="type"/>
+          <column width="-1" type="field" name="id" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column width="-1" type="field" name="position" hidden="0"/>
+          <column width="-1" type="field" name="type" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3851,7 +3861,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="1" readOnly="0" simplifyAlgorithm="0" autoRefreshTime="0" geometry="Polygon" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" type="vector" simplifyLocal="1" refreshOnNotifyMessage="" minScale="1e+08" refreshOnNotifyEnabled="0" labelsEnabled="0" wkbType="Polygon">
+    <maplayer refreshOnNotifyMessage="" readOnly="0" autoRefreshEnabled="0" simplifyDrawingHints="1" geometry="Polygon" labelsEnabled="0" wkbType="Polygon" simplifyDrawingTol="1" simplifyAlgorithm="0" type="vector" autoRefreshTime="0" maxScale="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" minScale="1e+08" styleCategories="AllStyleCategories" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -3895,7 +3905,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -3917,26 +3927,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" enableorderby="0" symbollevels="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol type="fill" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="0,85,0,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,85,0,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="b_diagonal" k="style"/>
+          <symbol alpha="1" force_rhr="0" type="fill" clip_to_extent="1" name="0">
+            <layer locked="0" enabled="1" pass="0" class="SimpleFill">
+              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="color" v="0,85,0,255"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="0,85,0,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0.26"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="style" v="b_diagonal"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -3946,9 +3956,7 @@ def my_form_open(dialog, layer, feature):
         <sizescale/>
       </renderer-v2>
       <customproperties>
-        <property key="dualview/previewExpressions">
-          <value>name</value>
-        </property>
+        <property key="dualview/previewExpressions" value="name"/>
         <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
@@ -3957,21 +3965,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundColor="#ffffff" backgroundAlpha="255" labelPlacementMethod="XHeight" lineSizeType="MM" minimumSize="0" diagramOrientation="Up" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" barWidth="5" penWidth="0" penColor="#000000" width="15" scaleDependency="Area" minScaleDenominator="0" height="15" scaleBasedVisibility="0" rotationOffset="270" enabled="0">
+        <DiagramCategory maxScaleDenominator="1e+08" minScaleDenominator="0" backgroundAlpha="255" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" scaleBasedVisibility="0" lineSizeType="MM" opacity="1" diagramOrientation="Up" width="15" rotationOffset="270" scaleDependency="Area" barWidth="5" labelPlacementMethod="XHeight" penColor="#000000" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" enabled="0" penWidth="0" height="15">
           <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" color="#000000"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="1" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" placement="1" dist="0" showAll="1" linePlacementFlags="18" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -4029,31 +4037,31 @@ def my_form_open(dialog, layer, feature):
         <default field="fence_len" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="group" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="cone_len" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="fence_len" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint exp_strength="0" field="name" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="group" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="cone_len" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="fence_len" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="group" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="cone_len" exp="" desc=""/>
-        <constraint field="fence_len" exp="" desc=""/>
+        <constraint field="name" desc="" exp=""/>
+        <constraint field="group" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="cone_len" desc="" exp=""/>
+        <constraint field="fence_len" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="name"/>
-          <column hidden="0" type="field" width="-1" name="group"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="type"/>
-          <column hidden="0" type="field" width="-1" name="cone_len"/>
-          <column hidden="0" type="field" width="-1" name="fence_len"/>
+          <column width="-1" type="field" name="name" hidden="0"/>
+          <column width="-1" type="field" name="group" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column width="-1" type="field" name="type" hidden="0"/>
+          <column width="-1" type="field" name="cone_len" hidden="0"/>
+          <column width="-1" type="field" name="fence_len" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -4084,8 +4092,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="group"/>
-        <field editable="1" name="name"/>
+        <field name="group" editable="1"/>
+        <field name="name" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="group"/>
@@ -4095,7 +4103,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="1" readOnly="0" simplifyAlgorithm="0" autoRefreshTime="0" geometry="Line" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" type="vector" simplifyLocal="1" refreshOnNotifyMessage="" minScale="1e+08" refreshOnNotifyEnabled="0" labelsEnabled="1" wkbType="MultiLineString">
+    <maplayer refreshOnNotifyMessage="" readOnly="0" autoRefreshEnabled="0" simplifyDrawingHints="1" geometry="Line" labelsEnabled="1" wkbType="MultiLineString" simplifyDrawingTol="1" simplifyAlgorithm="0" type="vector" autoRefreshTime="0" maxScale="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" minScale="1e+08" styleCategories="AllStyleCategories" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -4148,11 +4156,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" miny="0" crs="" dimensions="2" maxy="0" maxz="0" maxx="0"/>
+          <spatial dimensions="2" miny="0" maxx="0" minz="0" minx="0" crs="" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -4167,47 +4175,47 @@ def my_form_open(dialog, layer, feature):
       <dataDependencies/>
       <legend type="default-vector"/>
       <expressionfields>
-        <field comment="" type="6" subType="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" name="fence_len" precision="0" length="-1" typeName="double precision"/>
-        <field comment="" type="6" subType="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" name="fence_len" precision="0" length="-1" typeName="double precision"/>
-        <field comment="" type="6" subType="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" name="cone_len" precision="0" length="-1" typeName="double precision"/>
+        <field expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" type="6" name="fence_len" comment="" length="-1" subType="0" precision="0" typeName="double precision"/>
+        <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" type="6" name="fence_len" comment="" length="-1" subType="0" precision="0" typeName="double precision"/>
+        <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" type="6" name="cone_len" comment="" length="-1" subType="0" precision="0" typeName="double precision"/>
       </expressionfields>
       <map-layer-style-manager current="Fencing">
         <map-layer-style name="Fencing"/>
         <map-layer-style name="Simple">
-          <qgis hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyAlgorithm="0" version="3.8.3-Zanzibar" simplifyDrawingHints="1" simplifyLocal="1" minScale="1e+08" labelsEnabled="1" simplifyDrawingTol="1" simplifyMaxScale="1" readOnly="0" styleCategories="AllStyleCategories">
+          <qgis hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" simplifyDrawingTol="1" version="3.8.3-Zanzibar" maxScale="0" styleCategories="AllStyleCategories" simplifyDrawingHints="1" simplifyMaxScale="1" minScale="1e+08" readOnly="0" simplifyLocal="1" labelsEnabled="1">
             <flags>
               <Identifiable>1</Identifiable>
               <Removable>1</Removable>
               <Searchable>1</Searchable>
             </flags>
-            <renderer-v2 type="RuleRenderer" enableorderby="0" symbollevels="1" forceraster="0">
+            <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="1" enableorderby="0">
               <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-                <rule label="Visible" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" symbol="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL"/>
+                <rule key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" symbol="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" label="Visible"/>
               </rules>
               <symbols>
-                <symbol type="line" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-                  <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-                    <prop v="square" k="capstyle"/>
-                    <prop v="5;2" k="customdash"/>
-                    <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                    <prop v="MM" k="customdash_unit"/>
-                    <prop v="0" k="draw_inside_polygon"/>
-                    <prop v="bevel" k="joinstyle"/>
-                    <prop v="255,255,0,255" k="line_color"/>
-                    <prop v="solid" k="line_style"/>
-                    <prop v="0.5" k="line_width"/>
-                    <prop v="MM" k="line_width_unit"/>
-                    <prop v="0" k="offset"/>
-                    <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                    <prop v="MM" k="offset_unit"/>
-                    <prop v="0" k="ring_filter"/>
-                    <prop v="0" k="use_custom_dash"/>
-                    <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+                <symbol alpha="1" force_rhr="0" type="line" clip_to_extent="1" name="0">
+                  <layer locked="0" enabled="1" pass="0" class="SimpleLine">
+                    <prop k="capstyle" v="square"/>
+                    <prop k="customdash" v="5;2"/>
+                    <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                    <prop k="customdash_unit" v="MM"/>
+                    <prop k="draw_inside_polygon" v="0"/>
+                    <prop k="joinstyle" v="bevel"/>
+                    <prop k="line_color" v="255,255,0,255"/>
+                    <prop k="line_style" v="solid"/>
+                    <prop k="line_width" v="0.5"/>
+                    <prop k="line_width_unit" v="MM"/>
+                    <prop k="offset" v="0"/>
+                    <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                    <prop k="offset_unit" v="MM"/>
+                    <prop k="ring_filter" v="0"/>
+                    <prop k="use_custom_dash" v="0"/>
+                    <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
@@ -4218,62 +4226,62 @@ def my_form_open(dialog, layer, feature):
               <rules key="{7b0a59ec-9387-4d8e-badd-0d99ebc42174}">
                 <rule key="{4961744d-6387-45d0-90bf-01e48d575e6e}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
                   <settings>
-                    <text-style fontItalic="0" fieldName="comment" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="50" blendMode="0" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="11" multilineHeight="1" textOpacity="0.8" fontSizeUnit="Point" textColor="0,0,0,255" namedStyle="Regular" fontFamily="Myriad Pro" isExpression="0">
-                      <text-buffer bufferOpacity="1" bufferJoinStyle="128" bufferSize="1" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255"/>
-                      <background shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.6" shapeSizeType="0" shapeRadiiY="1" shapeBlendMode="0" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="255,255,0,255" shapeSizeY="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="128" shapeFillColor="255,255,255,255" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="0.6" shapeRadiiX="1" shapeSizeX="1" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-                      <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+                    <text-style fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" fontSizeUnit="Point" fieldName="comment" multilineHeight="1" fontUnderline="0" fontWordSpacing="0" useSubstitutions="0" fontItalic="0" fontSize="11" textColor="0,0,0,255" fontCapitals="0" isExpression="0" textOpacity="0.8" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" namedStyle="Regular" fontWeight="50" blendMode="0">
+                      <text-buffer bufferOpacity="1" bufferSize="1" bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferBlendMode="0"/>
+                      <background shapeSizeType="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeSizeX="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeType="0" shapeDraw="1" shapeBorderColor="255,255,0,255" shapeOpacity="0.6" shapeRadiiUnit="MM" shapeBorderWidth="0.6" shapeOffsetX="0" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeRotationType="0" shapeSizeY="1" shapeBlendMode="0" shapeJoinStyle="128" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+                      <shadow shadowUnder="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowDraw="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowScale="100"/>
                       <substitutions/>
                     </text-style>
-                    <text-format rightDirectionSymbol=">" wrapChar="" placeDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="4294967295" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-                    <placement quadOffset="4" preserveRotation="1" geometryGenerator="" placement="4" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" priority="5" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-25" maxCurvedCharAngleIn="25" repeatDistanceUnits="MM" offsetUnits="MM" placementFlags="2" geometryGeneratorEnabled="0" dist="5" offsetType="0"/>
-                    <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="0" fontLimitPixelSize="0" displayAll="1" obstacleFactor="1" obstacle="1" mergeLines="1" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="0" maxNumLabels="2000" scaleMax="0"/>
+                    <text-format wrapChar="" placeDirectionSymbol="0" multilineAlign="4294967295" rightDirectionSymbol=">" leftDirectionSymbol="&lt;" formatNumbers="0" plussign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0" decimals="3" addDirectionSymbol="0"/>
+                    <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" fitInPolygonOnly="0" quadOffset="4" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" yOffset="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" priority="5" placement="4" maxCurvedCharAngleOut="-25" repeatDistanceUnits="MM" dist="5" geometryGeneratorType="PointGeometry" rotationAngle="0" centroidInside="0" placementFlags="2" geometryGeneratorEnabled="0" geometryGenerator="" repeatDistance="0" distUnits="MM" preserveRotation="1" offsetType="0" centroidWhole="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                    <rendering obstacleType="0" zIndex="0" drawLabels="1" fontMaxPixelSize="10000" scaleMin="0" scaleMax="0" obstacleFactor="1" fontMinPixelSize="3" labelPerPart="0" displayAll="1" maxNumLabels="2000" limitNumLabels="0" mergeLines="1" fontLimitPixelSize="0" minFeatureSize="0" scaleVisibility="0" upsidedownLabels="0" obstacle="1"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option type="Map" name="properties">
                           <Option type="Map" name="PositionX">
-                            <Option type="bool" value="true" name="active"/>
-                            <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
-                            <Option type="int" value="2" name="type"/>
+                            <Option type="bool" name="active" value="true"/>
+                            <Option type="QString" name="field" value="auxiliary_storage_labeling_positionx"/>
+                            <Option type="int" name="type" value="2"/>
                           </Option>
                           <Option type="Map" name="PositionY">
-                            <Option type="bool" value="true" name="active"/>
-                            <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
-                            <Option type="int" value="2" name="type"/>
+                            <Option type="bool" name="active" value="true"/>
+                            <Option type="QString" name="field" value="auxiliary_storage_labeling_positiony"/>
+                            <Option type="int" name="type" value="2"/>
                           </Option>
                         </Option>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </dd_properties>
                   </settings>
                 </rule>
                 <rule key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}" filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')">
                   <settings>
-                    <text-style fontItalic="0" fieldName="round( $length, 1) || 'm'" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="63" blendMode="0" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="12" multilineHeight="1" textOpacity="1" fontSizeUnit="Point" textColor="0,0,0,255" namedStyle="Semibold" fontFamily="Myriad Pro" isExpression="1">
-                      <text-buffer bufferOpacity="1" bufferJoinStyle="128" bufferSize="1" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="1" bufferColor="255,255,255,255"/>
-                      <background shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeType="0" shapeRadiiY="0" shapeBlendMode="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="0" shapeRadiiX="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-                      <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+                    <text-style fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" fontSizeUnit="Point" fieldName="round( $length, 1) || 'm'" multilineHeight="1" fontUnderline="0" fontWordSpacing="0" useSubstitutions="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" fontCapitals="0" isExpression="1" textOpacity="1" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" blendMode="0">
+                      <text-buffer bufferOpacity="1" bufferSize="1" bufferSizeUnits="MM" bufferDraw="1" bufferNoFill="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferBlendMode="0"/>
+                      <background shapeSizeType="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeType="0" shapeDraw="0" shapeBorderColor="128,128,128,255" shapeOpacity="1" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetX="0" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeRotationType="0" shapeSizeY="0" shapeBlendMode="0" shapeJoinStyle="64" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+                      <shadow shadowUnder="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowDraw="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowScale="100"/>
                       <substitutions/>
                     </text-style>
-                    <text-format rightDirectionSymbol=">" wrapChar="" placeDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="4294967295" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-                    <placement quadOffset="4" preserveRotation="1" geometryGenerator="" placement="2" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" priority="5" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-25" maxCurvedCharAngleIn="25" repeatDistanceUnits="MM" offsetUnits="MM" placementFlags="15" geometryGeneratorEnabled="0" dist="1" offsetType="0"/>
-                    <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="0" fontLimitPixelSize="0" displayAll="0" obstacleFactor="1" obstacle="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="0" maxNumLabels="2000" scaleMax="0"/>
+                    <text-format wrapChar="" placeDirectionSymbol="0" multilineAlign="4294967295" rightDirectionSymbol=">" leftDirectionSymbol="&lt;" formatNumbers="0" plussign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0" decimals="3" addDirectionSymbol="0"/>
+                    <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" fitInPolygonOnly="0" quadOffset="4" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" yOffset="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" priority="5" placement="2" maxCurvedCharAngleOut="-25" repeatDistanceUnits="MM" dist="1" geometryGeneratorType="PointGeometry" rotationAngle="0" centroidInside="0" placementFlags="15" geometryGeneratorEnabled="0" geometryGenerator="" repeatDistance="0" distUnits="MM" preserveRotation="1" offsetType="0" centroidWhole="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                    <rendering obstacleType="0" zIndex="0" drawLabels="1" fontMaxPixelSize="10000" scaleMin="0" scaleMax="0" obstacleFactor="1" fontMinPixelSize="3" labelPerPart="0" displayAll="0" maxNumLabels="2000" limitNumLabels="0" mergeLines="0" fontLimitPixelSize="0" minFeatureSize="0" scaleVisibility="0" upsidedownLabels="0" obstacle="1"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option type="Map" name="properties">
                           <Option type="Map" name="PositionX">
-                            <Option type="bool" value="true" name="active"/>
-                            <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
-                            <Option type="int" value="2" name="type"/>
+                            <Option type="bool" name="active" value="true"/>
+                            <Option type="QString" name="field" value="auxiliary_storage_labeling_positionx"/>
+                            <Option type="int" name="type" value="2"/>
                           </Option>
                           <Option type="Map" name="PositionY">
-                            <Option type="bool" value="true" name="active"/>
-                            <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
-                            <Option type="int" value="2" name="type"/>
+                            <Option type="bool" name="active" value="true"/>
+                            <Option type="QString" name="field" value="auxiliary_storage_labeling_positiony"/>
+                            <Option type="int" name="type" value="2"/>
                           </Option>
                         </Option>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </dd_properties>
                   </settings>
@@ -4290,21 +4298,21 @@ def my_form_open(dialog, layer, feature):
             <featureBlendMode>0</featureBlendMode>
             <layerOpacity>1</layerOpacity>
             <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-              <DiagramCategory sizeType="MM" opacity="1" backgroundColor="#ffffff" backgroundAlpha="255" labelPlacementMethod="XHeight" lineSizeType="MM" minimumSize="0" diagramOrientation="Up" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" barWidth="5" sizeScale="3x:0,0,0,0,0,0" penWidth="0" penColor="#000000" width="15" scaleDependency="Area" minScaleDenominator="0" height="15" scaleBasedVisibility="0" rotationOffset="270" enabled="0">
-                <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-                <attribute label="" field="" color="#000000"/>
+              <DiagramCategory maxScaleDenominator="1e+08" minScaleDenominator="0" backgroundAlpha="255" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" scaleBasedVisibility="0" lineSizeType="MM" opacity="1" diagramOrientation="Up" width="15" rotationOffset="270" scaleDependency="Area" barWidth="5" labelPlacementMethod="XHeight" penColor="#000000" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" penWidth="0" enabled="0" height="15">
+                <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+                <attribute field="" color="#000000" label=""/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings priority="0" dist="0" placement="2" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
+            <DiagramLayerSettings priority="0" zIndex="0" dist="0" showAll="1" placement="2" linePlacementFlags="18" obstacle="0">
               <properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </properties>
             </DiagramLayerSettings>
-            <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+            <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
               <activeChecks/>
               <checkConfiguration/>
             </geometryOptions>
@@ -4416,53 +4424,53 @@ def my_form_open(dialog, layer, feature):
               <default field="cone_len" expression="" applyOnUpdate="0"/>
             </defaults>
             <constraints>
-              <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="group" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="comment" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="moveable" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="hidden" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="auxiliary_storage_labeling_positiony" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="auxiliary_storage_labeling_positionx" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="fence_len" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="cone_len" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+              <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
+              <constraint exp_strength="0" field="group" notnull_strength="0" constraints="0" unique_strength="0"/>
+              <constraint exp_strength="0" field="comment" notnull_strength="0" constraints="0" unique_strength="0"/>
+              <constraint exp_strength="0" field="moveable" notnull_strength="0" constraints="0" unique_strength="0"/>
+              <constraint exp_strength="0" field="type" notnull_strength="0" constraints="0" unique_strength="0"/>
+              <constraint exp_strength="0" field="name" notnull_strength="0" constraints="0" unique_strength="0"/>
+              <constraint exp_strength="0" field="hidden" notnull_strength="0" constraints="0" unique_strength="0"/>
+              <constraint exp_strength="0" field="auxiliary_storage_labeling_positiony" notnull_strength="0" constraints="0" unique_strength="0"/>
+              <constraint exp_strength="0" field="auxiliary_storage_labeling_positionx" notnull_strength="0" constraints="0" unique_strength="0"/>
+              <constraint exp_strength="0" field="fence_len" notnull_strength="0" constraints="0" unique_strength="0"/>
+              <constraint exp_strength="0" field="cone_len" notnull_strength="0" constraints="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 field="id" desc="" exp=""/>
+              <constraint field="group" desc="" exp=""/>
+              <constraint field="comment" desc="" exp=""/>
+              <constraint field="moveable" desc="" exp=""/>
+              <constraint field="type" desc="" exp=""/>
+              <constraint field="name" desc="" exp=""/>
+              <constraint field="hidden" desc="" exp=""/>
+              <constraint field="auxiliary_storage_labeling_positiony" desc="" exp=""/>
+              <constraint field="auxiliary_storage_labeling_positionx" desc="" exp=""/>
+              <constraint field="fence_len" desc="" exp=""/>
+              <constraint field="cone_len" desc="" exp=""/>
             </constraintExpressions>
             <expressionfields>
-              <field comment="" type="6" subType="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" name="fence_len" precision="0" length="-1" typeName="double precision"/>
-              <field comment="" type="6" subType="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" name="fence_len" precision="0" length="-1" typeName="double precision"/>
-              <field comment="" type="6" subType="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" name="cone_len" precision="0" length="-1" typeName="double precision"/>
+              <field type="6" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" name="fence_len" length="-1" comment="" subType="0" precision="0" typeName="double precision"/>
+              <field type="6" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" name="fence_len" length="-1" comment="" subType="0" precision="0" typeName="double precision"/>
+              <field type="6" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" name="cone_len" length="-1" comment="" subType="0" precision="0" typeName="double precision"/>
             </expressionfields>
             <attributeactions>
               <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
             </attributeactions>
-            <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;group&quot;" sortOrder="0">
+            <attributetableconfig sortExpression="&quot;group&quot;" sortOrder="0" actionWidgetStyle="dropDown">
               <columns>
-                <column hidden="0" type="field" width="-1" name="id"/>
-                <column hidden="0" type="field" width="-1" name="group"/>
-                <column hidden="1" type="actions" width="-1"/>
-                <column hidden="0" type="field" width="223" name="comment"/>
-                <column hidden="0" type="field" width="-1" name="moveable"/>
-                <column hidden="0" type="field" width="-1" name="type"/>
-                <column hidden="0" type="field" width="414" name="name"/>
-                <column hidden="0" type="field" width="-1" name="hidden"/>
-                <column hidden="0" type="field" width="-1" name="fence_len"/>
-                <column hidden="0" type="field" width="-1" name="cone_len"/>
-                <column hidden="1" type="field" width="-1" name="auxiliary_storage_labeling_positiony"/>
-                <column hidden="1" type="field" width="-1" name="auxiliary_storage_labeling_positionx"/>
+                <column width="-1" type="field" name="id" hidden="0"/>
+                <column width="-1" type="field" name="group" hidden="0"/>
+                <column width="-1" type="actions" hidden="1"/>
+                <column width="223" type="field" name="comment" hidden="0"/>
+                <column width="-1" type="field" name="moveable" hidden="0"/>
+                <column width="-1" type="field" name="type" hidden="0"/>
+                <column width="414" type="field" name="name" hidden="0"/>
+                <column width="-1" type="field" name="hidden" hidden="0"/>
+                <column width="-1" type="field" name="fence_len" hidden="0"/>
+                <column width="-1" type="field" name="cone_len" hidden="0"/>
+                <column width="-1" type="field" name="auxiliary_storage_labeling_positiony" hidden="1"/>
+                <column width="-1" type="field" name="auxiliary_storage_labeling_positionx" hidden="1"/>
               </columns>
             </attributetableconfig>
             <conditionalstyles>
@@ -4493,18 +4501,18 @@ def my_form_open(dialog, layer, feature):
             <featformsuppress>0</featformsuppress>
             <editorlayout>generatedlayout</editorlayout>
             <editable>
-              <field editable="0" name="auxiliary_storage_labeling_positionx"/>
-              <field editable="0" name="auxiliary_storage_labeling_positiony"/>
-              <field editable="1" name="comment"/>
-              <field editable="0" name="cone_len"/>
-              <field editable="0" name="fence_len"/>
-              <field editable="1" name="group"/>
-              <field editable="1" name="hidden"/>
-              <field editable="1" name="id"/>
-              <field editable="0" name="length"/>
-              <field editable="1" name="moveable"/>
-              <field editable="1" name="name"/>
-              <field editable="1" name="type"/>
+              <field name="auxiliary_storage_labeling_positionx" editable="0"/>
+              <field name="auxiliary_storage_labeling_positiony" editable="0"/>
+              <field name="comment" editable="1"/>
+              <field name="cone_len" editable="0"/>
+              <field name="fence_len" editable="0"/>
+              <field name="group" editable="1"/>
+              <field name="hidden" editable="1"/>
+              <field name="id" editable="1"/>
+              <field name="length" editable="0"/>
+              <field name="moveable" editable="1"/>
+              <field name="name" editable="1"/>
+              <field name="type" editable="1"/>
             </editable>
             <labelOnTop>
               <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
@@ -4533,200 +4541,200 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="RuleRenderer" enableorderby="0" symbollevels="1" forceraster="0">
+      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="1" enableorderby="0">
         <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-          <rule label="Show in fencing maps" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)')">
-            <rule label="Cones" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" symbol="0" filter="regexp_match(&quot;type&quot;, '^cone')"/>
-            <rule label="Moveable fences" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" symbol="1" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1'"/>
-            <rule label="Fixed fences" key="{070da3c0-926e-4be7-b593-17a3235a88fa}" symbol="2" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1'"/>
-            <rule label="Construction" checkstate="0" key="{7be11354-6d79-48d0-a650-aea5f58c1846}" symbol="3" filter="regexp_match(&quot;type&quot;, '^constr')"/>
+          <rule key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)')" label="Show in fencing maps">
+            <rule key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" symbol="0" filter="regexp_match(&quot;type&quot;, '^cone')" label="Cones"/>
+            <rule key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" symbol="1" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1'" label="Moveable fences"/>
+            <rule key="{070da3c0-926e-4be7-b593-17a3235a88fa}" symbol="2" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1'" label="Fixed fences"/>
+            <rule key="{7be11354-6d79-48d0-a650-aea5f58c1846}" symbol="3" filter="regexp_match(&quot;type&quot;, '^constr')" label="Construction" checkstate="0"/>
           </rule>
-          <rule label="Is Visible" checkstate="0" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" symbol="4" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL"/>
+          <rule key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" symbol="4" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" label="Is Visible" checkstate="0"/>
           <rule key="{29865286-9e35-459b-929c-beb87e7538de}" symbol="5"/>
         </rules>
         <symbols>
-          <symbol type="line" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-              <prop v="round" k="capstyle"/>
-              <prop v="1;4" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="Point" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="round" k="joinstyle"/>
-              <prop v="255,255,0,255" k="line_color"/>
-              <prop v="dot" k="line_style"/>
-              <prop v="1" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol alpha="1" force_rhr="0" type="line" clip_to_extent="1" name="0">
+            <layer locked="0" enabled="1" pass="0" 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"/>
+              <prop k="customdash_unit" v="Point"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="round"/>
+              <prop k="line_color" v="255,255,0,255"/>
+              <prop k="line_style" v="dot"/>
+              <prop k="line_width" v="1"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="1"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="1" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-              <prop v="round" k="capstyle"/>
-              <prop v="4;3" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="round" k="joinstyle"/>
-              <prop v="255,255,0,255" k="line_color"/>
-              <prop v="dash" k="line_style"/>
-              <prop v="1" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol alpha="1" force_rhr="0" type="line" clip_to_extent="1" name="1">
+            <layer locked="0" enabled="1" pass="0" 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"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="round"/>
+              <prop k="line_color" v="255,255,0,255"/>
+              <prop k="line_style" v="dash"/>
+              <prop k="line_width" v="1"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="2" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="255,255,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.8" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol alpha="1" force_rhr="0" type="line" clip_to_extent="1" name="2">
+            <layer locked="0" enabled="1" pass="0" class="SimpleLine">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="255,255,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.8"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="3" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0,255,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.8" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol alpha="1" force_rhr="0" type="line" clip_to_extent="1" name="3">
+            <layer locked="0" enabled="1" pass="0" class="SimpleLine">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,0,255,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.8"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="4" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="255,255,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.26" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol alpha="1" force_rhr="0" type="line" clip_to_extent="1" name="4">
+            <layer locked="0" enabled="1" pass="0" class="SimpleLine">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="255,255,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.26"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="5" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="213,180,60,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.26" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol alpha="1" force_rhr="0" type="line" clip_to_extent="1" name="5">
+            <layer locked="0" enabled="1" pass="0" class="SimpleLine">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="213,180,60,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.26"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -4737,67 +4745,67 @@ def my_form_open(dialog, layer, feature):
         <rules key="{75ef682c-4a85-4fe1-962a-6082490a3c19}">
           <rule key="{05a5f0dd-6b57-4866-8227-d1dd0f4dfdf5}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
             <settings>
-              <text-style fontItalic="0" fieldName="comment" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="50" blendMode="0" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="11" multilineHeight="1" textOpacity="0.8" fontSizeUnit="Point" textColor="0,0,0,255" namedStyle="Regular" fontFamily="Myriad Pro" isExpression="0">
-                <text-buffer bufferOpacity="1" bufferJoinStyle="128" bufferSize="1" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255"/>
-                <background shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.6" shapeSizeType="0" shapeRadiiY="1" shapeBlendMode="0" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeBorderColor="255,255,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="128" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="0.6" shapeRadiiX="1" shapeSizeX="1" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-                <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+              <text-style fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" fontSizeUnit="Point" fieldName="comment" multilineHeight="1" fontUnderline="0" fontWordSpacing="0" useSubstitutions="0" fontItalic="0" fontSize="11" textColor="0,0,0,255" fontCapitals="0" isExpression="0" textOpacity="0.8" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" namedStyle="Regular" fontWeight="50" blendMode="0">
+                <text-buffer bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0"/>
+                <background shapeSizeType="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeSizeX="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeType="0" shapeDraw="1" shapeBorderColor="255,255,0,255" shapeOpacity="0.6" shapeRadiiUnit="MM" shapeBorderWidth="0.6" shapeOffsetX="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeSizeY="1" shapeBlendMode="0" shapeJoinStyle="128" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowUnder="0" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowDraw="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowScale="100"/>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" wrapChar="" placeDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="4294967295" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-              <placement quadOffset="4" preserveRotation="1" geometryGenerator="" placement="2" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" priority="5" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-25" maxCurvedCharAngleIn="25" repeatDistanceUnits="MM" offsetUnits="MM" placementFlags="14" geometryGeneratorEnabled="0" dist="5" offsetType="0"/>
-              <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="0" fontLimitPixelSize="0" displayAll="1" obstacleFactor="1.82" obstacle="1" mergeLines="1" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="0" maxNumLabels="2000" scaleMax="0"/>
+              <text-format wrapChar="" multilineAlign="4294967295" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0" plussign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0" decimals="3" addDirectionSymbol="0"/>
+              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" fitInPolygonOnly="0" quadOffset="4" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" yOffset="0" maxCurvedCharAngleIn="25" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" priority="5" maxCurvedCharAngleOut="-25" dist="5" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" rotationAngle="0" centroidInside="0" placementFlags="14" geometryGeneratorEnabled="0" geometryGenerator="" repeatDistance="0" distUnits="MM" preserveRotation="1" offsetType="0" centroidWhole="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering obstacleType="0" zIndex="0" drawLabels="1" fontMaxPixelSize="10000" scaleMin="0" scaleMax="0" obstacleFactor="1.82" fontMinPixelSize="3" labelPerPart="0" displayAll="1" maxNumLabels="2000" limitNumLabels="0" mergeLines="1" fontLimitPixelSize="0" minFeatureSize="0" scaleVisibility="0" upsidedownLabels="0" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="PositionX">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="auxiliary_storage_labeling_positionx"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="auxiliary_storage_labeling_positiony"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </settings>
           </rule>
           <rule key="{226e1338-ed15-4fc8-a035-fefee03c38d6}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^(fenc|cone)')">
             <settings>
-              <text-style fontItalic="0" fieldName="round( $length, 1) || 'm'" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="63" blendMode="0" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="11" multilineHeight="1" textOpacity="1" fontSizeUnit="Point" textColor="0,0,0,255" namedStyle="Semibold" fontFamily="Myriad Pro" isExpression="1">
-                <text-buffer bufferOpacity="1" bufferJoinStyle="128" bufferSize="1" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="1" bufferColor="255,255,255,255"/>
-                <background shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeType="0" shapeRadiiY="0" shapeBlendMode="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="0" shapeRadiiX="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-                <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+              <text-style fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" fontSizeUnit="Point" fieldName="round( $length, 1) || 'm'" multilineHeight="1" fontUnderline="0" fontWordSpacing="0" useSubstitutions="0" fontItalic="0" fontSize="11" textColor="0,0,0,255" fontCapitals="0" isExpression="1" textOpacity="1" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" blendMode="0">
+                <text-buffer bufferOpacity="1" bufferSize="1" bufferDraw="1" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0"/>
+                <background shapeSizeType="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeType="0" shapeDraw="0" shapeBorderColor="128,128,128,255" shapeOpacity="1" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetX="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeBlendMode="0" shapeJoinStyle="64" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowUnder="0" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowDraw="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowScale="100"/>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" wrapChar="" placeDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="4294967295" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-              <placement quadOffset="4" preserveRotation="1" geometryGenerator="" placement="2" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" priority="6" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-25" maxCurvedCharAngleIn="25" repeatDistanceUnits="MM" offsetUnits="MM" placementFlags="14" geometryGeneratorEnabled="0" dist="1" offsetType="0"/>
-              <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="0" fontLimitPixelSize="0" displayAll="1" obstacleFactor="1" obstacle="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="0" maxNumLabels="2000" scaleMax="0"/>
+              <text-format wrapChar="" multilineAlign="4294967295" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0" plussign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0" decimals="3" addDirectionSymbol="0"/>
+              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" fitInPolygonOnly="0" quadOffset="4" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" yOffset="0" maxCurvedCharAngleIn="25" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" priority="6" maxCurvedCharAngleOut="-25" dist="1" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" rotationAngle="0" centroidInside="0" placementFlags="14" geometryGeneratorEnabled="0" geometryGenerator="" repeatDistance="0" distUnits="MM" preserveRotation="1" offsetType="0" centroidWhole="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering obstacleType="0" zIndex="0" drawLabels="1" fontMaxPixelSize="10000" scaleMin="0" scaleMax="0" obstacleFactor="1" fontMinPixelSize="3" labelPerPart="0" displayAll="1" maxNumLabels="2000" limitNumLabels="0" mergeLines="0" fontLimitPixelSize="0" minFeatureSize="0" scaleVisibility="0" upsidedownLabels="0" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="1" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="expression" value="1"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                     <Option type="Map" name="PositionX">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="auxiliary_storage_labeling_positionx"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="auxiliary_storage_labeling_positiony"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </settings>
@@ -4814,21 +4822,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundColor="#ffffff" backgroundAlpha="255" labelPlacementMethod="XHeight" lineSizeType="MM" minimumSize="0" diagramOrientation="Up" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" barWidth="5" penWidth="0" penColor="#000000" width="15" scaleDependency="Area" minScaleDenominator="0" height="15" scaleBasedVisibility="0" rotationOffset="270" enabled="0">
+        <DiagramCategory maxScaleDenominator="1e+08" minScaleDenominator="0" backgroundAlpha="255" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" scaleBasedVisibility="0" lineSizeType="MM" opacity="1" diagramOrientation="Up" width="15" rotationOffset="270" scaleDependency="Area" barWidth="5" labelPlacementMethod="XHeight" penColor="#000000" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" enabled="0" penWidth="0" height="15">
           <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" color="#000000"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="2" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" placement="2" dist="0" showAll="1" linePlacementFlags="18" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -4922,47 +4930,47 @@ def my_form_open(dialog, layer, feature):
         <default field="cone_len" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="group" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="comment" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="moveable" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="hidden" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="fence_len" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="cone_len" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="group" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="comment" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="moveable" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="name" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="hidden" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="fence_len" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="cone_len" notnull_strength="0" constraints="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="fence_len" exp="" desc=""/>
-        <constraint field="cone_len" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="group" desc="" exp=""/>
+        <constraint field="comment" desc="" exp=""/>
+        <constraint field="moveable" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="name" desc="" exp=""/>
+        <constraint field="hidden" desc="" exp=""/>
+        <constraint field="fence_len" desc="" exp=""/>
+        <constraint field="cone_len" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields>
-        <field comment="" type="6" subType="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" name="fence_len" precision="0" length="-1" typeName="double precision"/>
-        <field comment="" type="6" subType="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" name="fence_len" precision="0" length="-1" typeName="double precision"/>
-        <field comment="" type="6" subType="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" name="cone_len" precision="0" length="-1" typeName="double precision"/>
+        <field expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" type="6" name="fence_len" comment="" length="-1" subType="0" precision="0" typeName="double precision"/>
+        <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" type="6" name="fence_len" comment="" length="-1" subType="0" precision="0" typeName="double precision"/>
+        <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" type="6" name="cone_len" comment="" length="-1" subType="0" precision="0" typeName="double precision"/>
       </expressionfields>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;group&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;group&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="0" type="field" width="-1" name="group"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="373" name="comment"/>
-          <column hidden="0" type="field" width="-1" name="moveable"/>
-          <column hidden="0" type="field" width="-1" name="type"/>
-          <column hidden="0" type="field" width="692" name="name"/>
-          <column hidden="0" type="field" width="-1" name="hidden"/>
-          <column hidden="0" type="field" width="-1" name="fence_len"/>
-          <column hidden="0" type="field" width="-1" name="cone_len"/>
+          <column width="-1" type="field" name="id" hidden="0"/>
+          <column width="-1" type="field" name="group" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column width="373" type="field" name="comment" hidden="0"/>
+          <column width="-1" type="field" name="moveable" hidden="0"/>
+          <column width="-1" type="field" name="type" hidden="0"/>
+          <column width="692" type="field" name="name" hidden="0"/>
+          <column width="-1" type="field" name="hidden" hidden="0"/>
+          <column width="-1" type="field" name="fence_len" hidden="0"/>
+          <column width="-1" type="field" name="cone_len" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -4993,18 +5001,18 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="auxiliary_storage_labeling_positionx"/>
-        <field editable="0" name="auxiliary_storage_labeling_positiony"/>
-        <field editable="1" name="comment"/>
-        <field editable="0" name="cone_len"/>
-        <field editable="0" name="fence_len"/>
-        <field editable="1" name="group"/>
-        <field editable="1" name="hidden"/>
-        <field editable="1" name="id"/>
-        <field editable="0" name="length"/>
-        <field editable="1" name="moveable"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="type"/>
+        <field name="auxiliary_storage_labeling_positionx" editable="0"/>
+        <field name="auxiliary_storage_labeling_positiony" editable="0"/>
+        <field name="comment" editable="1"/>
+        <field name="cone_len" editable="0"/>
+        <field name="fence_len" editable="0"/>
+        <field name="group" editable="1"/>
+        <field name="hidden" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="length" editable="0"/>
+        <field name="moveable" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
@@ -5024,7 +5032,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="1" readOnly="0" simplifyAlgorithm="0" autoRefreshTime="0" geometry="Line" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" type="vector" simplifyLocal="1" refreshOnNotifyMessage="" minScale="1e+08" refreshOnNotifyEnabled="0" labelsEnabled="0" wkbType="MultiLineString">
+    <maplayer refreshOnNotifyMessage="" readOnly="0" autoRefreshEnabled="0" simplifyDrawingHints="1" geometry="Line" labelsEnabled="0" wkbType="MultiLineString" simplifyDrawingTol="1" simplifyAlgorithm="0" type="vector" autoRefreshTime="0" maxScale="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" minScale="1e+08" styleCategories="AllStyleCategories" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.39891270000000034</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -5068,7 +5076,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -5088,31 +5096,31 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" enableorderby="0" symbollevels="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol type="line" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,178,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="1" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol alpha="1" force_rhr="0" type="line" clip_to_extent="1" name="0">
+            <layer locked="0" enabled="1" pass="0" class="SimpleLine">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,178,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="1"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -5131,21 +5139,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundColor="#ffffff" backgroundAlpha="255" labelPlacementMethod="XHeight" lineSizeType="MM" minimumSize="0" diagramOrientation="Up" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" barWidth="5" penWidth="0" penColor="#000000" width="15" scaleDependency="Area" minScaleDenominator="0" height="15" scaleBasedVisibility="0" rotationOffset="270" enabled="0">
+        <DiagramCategory maxScaleDenominator="1e+08" minScaleDenominator="0" backgroundAlpha="255" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" scaleBasedVisibility="0" lineSizeType="MM" opacity="1" diagramOrientation="Up" width="15" rotationOffset="270" scaleDependency="Area" barWidth="5" labelPlacementMethod="XHeight" penColor="#000000" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" enabled="0" penWidth="0" height="15">
           <fontProperties description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0" style="0"/>
-          <attribute label="" field="" color="#000000"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="2" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" placement="2" dist="0" showAll="1" linePlacementFlags="18" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -5167,19 +5175,19 @@ def my_form_open(dialog, layer, feature):
         <default field="id" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="1" type="actions" width="-1"/>
+          <column width="-1" type="field" name="id" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5210,7 +5218,7 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
+        <field name="id" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -5219,7 +5227,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="1" readOnly="0" simplifyAlgorithm="0" autoRefreshTime="0" geometry="Polygon" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="100000" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" type="vector" simplifyLocal="1" refreshOnNotifyMessage="" minScale="1e+08" refreshOnNotifyEnabled="0" labelsEnabled="0" wkbType="MultiPolygon">
+    <maplayer refreshOnNotifyMessage="" readOnly="0" autoRefreshEnabled="0" simplifyDrawingHints="1" geometry="Polygon" labelsEnabled="0" wkbType="MultiPolygon" simplifyDrawingTol="1" simplifyAlgorithm="0" type="vector" autoRefreshTime="0" maxScale="100000" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" minScale="1e+08" styleCategories="AllStyleCategories" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.94678832168284544</ymin>
@@ -5263,7 +5271,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -5283,26 +5291,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" enableorderby="0" symbollevels="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol type="fill" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="26,0,201,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="dot" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="b_diagonal" k="style"/>
+          <symbol alpha="1" force_rhr="0" type="fill" clip_to_extent="1" name="0">
+            <layer locked="0" enabled="1" pass="0" 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"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="0,0,0,255"/>
+              <prop k="outline_style" v="dot"/>
+              <prop k="outline_width" v="0.26"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="style" v="b_diagonal"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -5321,27 +5329,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundColor="#ffffff" backgroundAlpha="255" labelPlacementMethod="XHeight" lineSizeType="MM" minimumSize="0" diagramOrientation="Up" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" barWidth="5" penWidth="0" penColor="#000000" width="15" scaleDependency="Area" minScaleDenominator="100000" height="15" scaleBasedVisibility="0" rotationOffset="270" enabled="0">
+        <DiagramCategory maxScaleDenominator="1e+08" minScaleDenominator="100000" backgroundAlpha="255" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" scaleBasedVisibility="0" lineSizeType="MM" opacity="1" diagramOrientation="Up" width="15" rotationOffset="270" scaleDependency="Area" barWidth="5" labelPlacementMethod="XHeight" penColor="#000000" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" enabled="0" penWidth="0" height="15">
           <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" color="#000000"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="0" zIndex="0" obstacle="0" linePlacementFlags="2" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" placement="0" dist="0" showAll="1" linePlacementFlags="2" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option type="Map" name="properties">
               <Option type="Map" name="show">
-                <Option type="bool" value="true" name="active"/>
-                <Option type="QString" value="id" name="field"/>
-                <Option type="int" value="2" name="type"/>
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -5350,8 +5358,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -5360,8 +5368,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -5370,8 +5378,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -5390,25 +5398,25 @@ def my_form_open(dialog, layer, feature):
         <default field="page" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="page" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="page" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="page" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="page" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="0" type="field" width="-1" name="type"/>
-          <column hidden="0" type="field" width="-1" name="page"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column width="-1" type="field" name="id" hidden="0"/>
+          <column width="-1" type="field" name="type" hidden="0"/>
+          <column width="-1" type="field" name="page" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5439,9 +5447,9 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="page"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="page" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -5452,7 +5460,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="0" readOnly="0" simplifyAlgorithm="0" autoRefreshTime="0" geometry="Point" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="100000" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" type="vector" simplifyLocal="1" refreshOnNotifyMessage="" minScale="1e+08" refreshOnNotifyEnabled="0" labelsEnabled="1" wkbType="Point">
+    <maplayer refreshOnNotifyMessage="" readOnly="0" autoRefreshEnabled="0" simplifyDrawingHints="0" geometry="Point" labelsEnabled="1" wkbType="Point" simplifyDrawingTol="1" simplifyAlgorithm="0" type="vector" autoRefreshTime="0" maxScale="100000" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" minScale="1e+08" styleCategories="AllStyleCategories" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37523075794307204</xmin>
         <ymin>-33.94592961896692884</ymin>
@@ -5505,11 +5513,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" miny="0" crs="" dimensions="2" maxy="0" maxz="0" maxx="0"/>
+          <spatial dimensions="2" miny="0" maxx="0" minz="0" minx="0" crs="" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -5520,7 +5528,7 @@ def my_form_open(dialog, layer, feature):
       </resourceMetadata>
       <provider encoding="UTF-8">ogr</provider>
       <vectorjoins>
-        <join editable="0" customPrefix="csv_" targetFieldName="position" cascadedDelete="0" hasCustomPrefix="1" joinLayerId="marshals_by_position20161003112326575" memoryCache="1" upsertOnEdit="0" joinFieldName="position" dynamicForm="0">
+        <join customPrefix="csv_" joinLayerId="marshals_by_position20161003112326575" cascadedDelete="0" dynamicForm="0" memoryCache="1" editable="0" joinFieldName="position" hasCustomPrefix="1" upsertOnEdit="0" targetFieldName="position">
           <joinFieldsSubset>
             <field name="club"/>
             <field name="name"/>
@@ -5545,66 +5553,66 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="RuleRenderer" enableorderby="0" symbollevels="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" enableorderby="0">
         <rules key="{436a5e05-3485-477a-80b7-cf4d12d6dcec}">
-          <rule label="Show in marshal overview" description="Show in marshal overview" key="{308d81eb-cefa-4627-8afb-3baa8363f863}" symbol="0" filter="'marshal plan' = attribute( @atlas_feature , 'type' )"/>
-          <rule label="Show in marshal maps" description="Show in marshal overview" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" symbol="1" filter="'marshal' = attribute( @atlas_feature , 'type' )"/>
+          <rule key="{308d81eb-cefa-4627-8afb-3baa8363f863}" symbol="0" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" label="Show in marshal overview" description="Show in marshal overview"/>
+          <rule key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" symbol="1" filter="'marshal' = attribute( @atlas_feature , 'type' )" label="Show in marshal maps" description="Show in marshal overview"/>
         </rules>
         <symbols>
-          <symbol type="marker" alpha="0.792157" name="0" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="1">
-              <prop v="0" k="angle"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="1" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol alpha="0.792157" force_rhr="0" type="marker" clip_to_extent="1" name="0">
+            <layer locked="0" enabled="1" pass="1" class="SimpleMarker">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="0,0,0,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="circle"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="0,0,0,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="1"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" alpha="0.01" name="1" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="1">
-              <prop v="0" k="angle"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="0.1" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol alpha="0.01" force_rhr="0" type="marker" clip_to_extent="1" name="1">
+            <layer locked="0" enabled="1" pass="1" class="SimpleMarker">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="0,0,0,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="circle"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="0,0,0,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="0.1"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -5613,236 +5621,236 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{3100b6d3-183a-45b5-94f5-2ae25cc59226}">
-          <rule description="Show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" key="{26c6b0ec-ed26-401f-abd2-72394fe7d58d}" filter="'marshal plan' = attribute( @atlas_feature , 'type' )">
+          <rule key="{26c6b0ec-ed26-401f-abd2-72394fe7d58d}" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" description="Show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)">
             <settings>
-              <text-style fontItalic="0" fieldName="position" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="63" blendMode="0" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="6" multilineHeight="1" textOpacity="0.9" fontSizeUnit="Point" textColor="0,0,0,255" namedStyle="Semibold" fontFamily="Myriad Pro" isExpression="0">
-                <text-buffer bufferOpacity="1" bufferJoinStyle="64" bufferSize="1" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255"/>
-                <background shapeType="3" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.5" shapeSizeType="0" shapeRadiiY="0" shapeBlendMode="0" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="0.1" shapeRadiiX="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-                <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+              <text-style fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" fontSizeUnit="Point" fieldName="position" multilineHeight="1" fontUnderline="0" fontWordSpacing="0" useSubstitutions="0" fontItalic="0" fontSize="6" textColor="0,0,0,255" fontCapitals="0" isExpression="0" textOpacity="0.9" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" blendMode="0">
+                <text-buffer bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0"/>
+                <background shapeSizeType="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeType="3" shapeDraw="1" shapeBorderColor="0,0,0,255" shapeOpacity="0.5" shapeRadiiUnit="MM" shapeBorderWidth="0.1" shapeOffsetX="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeBlendMode="0" shapeJoinStyle="64" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowUnder="0" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowDraw="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowScale="100"/>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" wrapChar="" placeDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="0" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-              <placement quadOffset="4" preserveRotation="1" geometryGenerator="" placement="6" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" priority="10" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-20" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" offsetUnits="MapUnit" placementFlags="10" geometryGeneratorEnabled="0" dist="1" offsetType="0"/>
-              <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="1" fontLimitPixelSize="0" displayAll="1" obstacleFactor="1" obstacle="0" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="2" maxNumLabels="2000" scaleMax="10000000"/>
+              <text-format wrapChar="" multilineAlign="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0" plussign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0" decimals="3" addDirectionSymbol="0"/>
+              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" fitInPolygonOnly="0" quadOffset="4" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" yOffset="0" maxCurvedCharAngleIn="20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" priority="10" maxCurvedCharAngleOut="-20" dist="1" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" rotationAngle="0" centroidInside="0" placementFlags="10" geometryGeneratorEnabled="0" geometryGenerator="" repeatDistance="0" distUnits="MM" preserveRotation="1" offsetType="0" centroidWhole="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering obstacleType="0" zIndex="2" drawLabels="1" fontMaxPixelSize="10000" scaleMin="1" scaleMax="10000000" obstacleFactor="1" fontMinPixelSize="3" labelPerPart="0" displayAll="1" maxNumLabels="2000" limitNumLabels="0" mergeLines="0" fontLimitPixelSize="0" minFeatureSize="0" scaleVisibility="0" upsidedownLabels="0" obstacle="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="FontStyle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                     <Option type="Map" name="Size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </settings>
           </rule>
-          <rule active="0" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" key="{98b8f830-3256-405e-9a42-27279b9826d4}" filter="'marshal' = attribute( @atlas_feature , 'type' )">
+          <rule key="{98b8f830-3256-405e-9a42-27279b9826d4}" filter="'marshal' = attribute( @atlas_feature , 'type' )" 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 fontItalic="0" fieldName="position" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="63" blendMode="0" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="6" multilineHeight="1" textOpacity="0.5" fontSizeUnit="Point" textColor="0,0,0,255" namedStyle="Semibold" fontFamily="Myriad Pro" isExpression="0">
-                <text-buffer bufferOpacity="1" bufferJoinStyle="64" bufferSize="1" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255"/>
-                <background shapeType="3" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.5" shapeSizeType="0" shapeRadiiY="0" shapeBlendMode="0" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.2" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="0.4" shapeRadiiX="0" shapeSizeX="0.2" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-                <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+              <text-style fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" fontSizeUnit="Point" fieldName="position" multilineHeight="1" fontUnderline="0" fontWordSpacing="0" useSubstitutions="0" fontItalic="0" fontSize="6" textColor="0,0,0,255" fontCapitals="0" isExpression="0" textOpacity="0.5" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" blendMode="0">
+                <text-buffer bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0"/>
+                <background shapeSizeType="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeSizeX="0.2" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeType="3" shapeDraw="1" shapeBorderColor="0,0,0,255" shapeOpacity="0.5" shapeRadiiUnit="MM" shapeBorderWidth="0.4" shapeOffsetX="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeSizeY="0.2" shapeBlendMode="0" shapeJoinStyle="64" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowUnder="0" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowDraw="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowScale="100"/>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" wrapChar="" placeDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="1" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-              <placement quadOffset="4" preserveRotation="1" geometryGenerator="" placement="6" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" priority="8" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-20" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" offsetUnits="MapUnit" placementFlags="10" geometryGeneratorEnabled="0" dist="0" offsetType="0"/>
-              <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="1" fontLimitPixelSize="0" displayAll="1" obstacleFactor="1.8" obstacle="0" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="5" maxNumLabels="2000" scaleMax="10000000"/>
+              <text-format wrapChar="" multilineAlign="1" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0" plussign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0" decimals="3" addDirectionSymbol="0"/>
+              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" fitInPolygonOnly="0" quadOffset="4" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" yOffset="0" maxCurvedCharAngleIn="20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" priority="8" maxCurvedCharAngleOut="-20" dist="0" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" rotationAngle="0" centroidInside="0" placementFlags="10" geometryGeneratorEnabled="0" geometryGenerator="" repeatDistance="0" distUnits="MM" preserveRotation="1" offsetType="0" centroidWhole="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering obstacleType="0" zIndex="5" drawLabels="1" fontMaxPixelSize="10000" scaleMin="1" scaleMax="10000000" obstacleFactor="1.8" fontMinPixelSize="3" labelPerPart="0" displayAll="1" maxNumLabels="2000" limitNumLabels="0" mergeLines="0" fontLimitPixelSize="0" minFeatureSize="0" scaleVisibility="0" upsidedownLabels="0" obstacle="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if ( @atlasfeature_id = $id, 1, 0)" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if ( @atlasfeature_id = $id, 1, 0)"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                     <Option type="Map" name="FontOpacity">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                     <Option type="Map" name="FontStyle">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                     <Option type="Map" name="ObstacleFactor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                     <Option type="Map" name="Priority">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if ( @atlas_featureid = $id, 10.0, 8.0 )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 10.0, 8.0 )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                     <Option type="Map" name="ShapeOpacity">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                     <Option type="Map" name="Size">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if ( @atlas_featureid = $id, 8, 6 )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 8, 6 )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                     <Option type="Map" name="ZIndex">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if ( @atlasfeature_id = $id, 15, 5 )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if ( @atlasfeature_id = $id, 15, 5 )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </settings>
           </rule>
-          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label" key="{99221fb4-413e-4f4d-b076-d6c2768a862d}" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id">
+          <rule key="{99221fb4-413e-4f4d-b076-d6c2768a862d}" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label">
             <settings>
-              <text-style fontItalic="0" fieldName="position" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="50" blendMode="0" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="6" multilineHeight="1" textOpacity="0.6" fontSizeUnit="Point" textColor="0,0,0,255" namedStyle="Regular" fontFamily="Myriad Pro" isExpression="0">
-                <text-buffer bufferOpacity="1" bufferJoinStyle="64" bufferSize="1" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255"/>
-                <background shapeType="3" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.6" shapeSizeType="0" shapeRadiiY="0" shapeBlendMode="0" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.2" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="0.4" shapeRadiiX="0" shapeSizeX="0.2" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-                <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+              <text-style fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" fontSizeUnit="Point" fieldName="position" multilineHeight="1" fontUnderline="0" fontWordSpacing="0" useSubstitutions="0" fontItalic="0" fontSize="6" textColor="0,0,0,255" fontCapitals="0" isExpression="0" textOpacity="0.6" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" namedStyle="Regular" fontWeight="50" blendMode="0">
+                <text-buffer bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0"/>
+                <background shapeSizeType="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeSizeX="0.2" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeType="3" shapeDraw="1" shapeBorderColor="0,0,0,255" shapeOpacity="0.6" shapeRadiiUnit="MM" shapeBorderWidth="0.4" shapeOffsetX="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeSizeY="0.2" shapeBlendMode="0" shapeJoinStyle="64" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowUnder="0" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowDraw="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowScale="100"/>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" wrapChar="" placeDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="1" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-              <placement quadOffset="4" preserveRotation="1" geometryGenerator="" placement="6" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" priority="8" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-20" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" offsetUnits="MapUnit" placementFlags="10" geometryGeneratorEnabled="0" dist="0" offsetType="0"/>
-              <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="1" fontLimitPixelSize="0" displayAll="1" obstacleFactor="1.8" obstacle="0" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="5" maxNumLabels="2000" scaleMax="10000000"/>
+              <text-format wrapChar="" multilineAlign="1" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0" plussign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0" decimals="3" addDirectionSymbol="0"/>
+              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" fitInPolygonOnly="0" quadOffset="4" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" yOffset="0" maxCurvedCharAngleIn="20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" priority="8" maxCurvedCharAngleOut="-20" dist="0" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" rotationAngle="0" centroidInside="0" placementFlags="10" geometryGeneratorEnabled="0" geometryGenerator="" repeatDistance="0" distUnits="MM" preserveRotation="1" offsetType="0" centroidWhole="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering obstacleType="0" zIndex="5" drawLabels="1" fontMaxPixelSize="10000" scaleMin="1" scaleMax="10000000" obstacleFactor="1.8" fontMinPixelSize="3" labelPerPart="0" displayAll="1" maxNumLabels="2000" limitNumLabels="0" mergeLines="0" fontLimitPixelSize="0" minFeatureSize="0" scaleVisibility="0" upsidedownLabels="0" obstacle="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                     <Option type="Map" name="FontOpacity">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                     <Option type="Map" name="FontStyle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                     <Option type="Map" name="ObstacleFactor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                     <Option type="Map" name="Priority">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                     <Option type="Map" name="ShapeOpacity">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                     <Option type="Map" name="Size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                     <Option type="Map" name="ZIndex">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </settings>
           </rule>
-          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top" key="{85065de1-e51c-4c04-9292-536cbccc7aba}" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id">
+          <rule key="{85065de1-e51c-4c04-9292-536cbccc7aba}" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top">
             <settings>
-              <text-style fontItalic="0" fieldName="position" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="63" blendMode="0" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="8" multilineHeight="1" textOpacity="0.9" fontSizeUnit="Point" textColor="0,0,0,255" namedStyle="Semibold" fontFamily="Myriad Pro" isExpression="0">
-                <text-buffer bufferOpacity="1" bufferJoinStyle="64" bufferSize="1" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255"/>
-                <background shapeType="3" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.9" shapeSizeType="0" shapeRadiiY="0" shapeBlendMode="0" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.2" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,0,255" shapeJoinStyle="64" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="0.4" shapeRadiiX="0" shapeSizeX="0.2" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-                <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+              <text-style fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" fontSizeUnit="Point" fieldName="position" multilineHeight="1" fontUnderline="0" fontWordSpacing="0" useSubstitutions="0" fontItalic="0" fontSize="8" textColor="0,0,0,255" fontCapitals="0" isExpression="0" textOpacity="0.9" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" blendMode="0">
+                <text-buffer bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0"/>
+                <background shapeSizeType="0" shapeOffsetY="0" shapeFillColor="255,255,0,255" shapeSizeUnit="MM" shapeSizeX="0.2" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeType="3" shapeDraw="1" shapeBorderColor="0,0,0,255" shapeOpacity="0.9" shapeRadiiUnit="MM" shapeBorderWidth="0.4" shapeOffsetX="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeSizeY="0.2" shapeBlendMode="0" shapeJoinStyle="64" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowUnder="0" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowDraw="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowScale="100"/>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" wrapChar="" placeDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="1" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-              <placement quadOffset="4" preserveRotation="1" geometryGenerator="" placement="0" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" priority="10" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-20" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" offsetUnits="MapUnit" placementFlags="10" geometryGeneratorEnabled="0" dist="0" offsetType="0"/>
-              <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="1" fontLimitPixelSize="0" displayAll="1" obstacleFactor="1.8" obstacle="0" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="10" maxNumLabels="2000" scaleMax="10000000"/>
+              <text-format wrapChar="" multilineAlign="1" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0" plussign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0" decimals="3" addDirectionSymbol="0"/>
+              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" fitInPolygonOnly="0" quadOffset="4" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" yOffset="0" maxCurvedCharAngleIn="20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" priority="10" maxCurvedCharAngleOut="-20" dist="0" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" rotationAngle="0" centroidInside="0" placementFlags="10" geometryGeneratorEnabled="0" geometryGenerator="" repeatDistance="0" distUnits="MM" preserveRotation="1" offsetType="0" centroidWhole="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering obstacleType="0" zIndex="10" drawLabels="1" fontMaxPixelSize="10000" scaleMin="1" scaleMax="10000000" obstacleFactor="1.8" fontMinPixelSize="3" labelPerPart="0" displayAll="1" maxNumLabels="2000" limitNumLabels="0" mergeLines="0" fontLimitPixelSize="0" minFeatureSize="0" scaleVisibility="0" upsidedownLabels="0" obstacle="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                     <Option type="Map" name="FontOpacity">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                     <Option type="Map" name="FontStyle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                     <Option type="Map" name="ObstacleFactor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                     <Option type="Map" name="Priority">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                     <Option type="Map" name="ShapeOpacity">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                     <Option type="Map" name="Size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                     <Option type="Map" name="ZIndex">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </settings>
@@ -5999,21 +6007,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundColor="#ffffff" backgroundAlpha="255" labelPlacementMethod="XHeight" lineSizeType="MM" minimumSize="0" diagramOrientation="Up" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" barWidth="5" penWidth="0" penColor="#000000" width="15" scaleDependency="Area" minScaleDenominator="100000" height="15" scaleBasedVisibility="0" rotationOffset="270" enabled="0">
+        <DiagramCategory maxScaleDenominator="1e+08" minScaleDenominator="100000" backgroundAlpha="255" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" scaleBasedVisibility="0" lineSizeType="MM" opacity="1" diagramOrientation="Up" width="15" rotationOffset="270" scaleDependency="Area" barWidth="5" labelPlacementMethod="XHeight" penColor="#000000" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" enabled="0" penWidth="0" height="15">
           <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" color="#000000"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="0" zIndex="0" obstacle="0" linePlacementFlags="2" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" placement="0" dist="0" showAll="1" linePlacementFlags="2" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -6022,8 +6030,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -6032,8 +6040,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6042,8 +6050,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -6052,8 +6060,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -6062,8 +6070,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -6072,8 +6080,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -6082,8 +6090,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -6155,52 +6163,52 @@ def my_form_open(dialog, layer, feature):
         <default field="csv_instructions" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="position" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="notes" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="xyposition" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="csv_club" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="csv_name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="csv_captain" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="csv_captain_phone" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="csv_first_runner" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="csv_last_runner" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="csv_instructions" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="position" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="notes" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="xyposition" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="csv_club" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="csv_name" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="csv_captain" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="csv_captain_phone" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="csv_first_runner" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="csv_last_runner" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="csv_instructions" notnull_strength="0" constraints="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="xyposition" exp="" desc=""/>
-        <constraint field="csv_club" exp="" desc=""/>
-        <constraint field="csv_name" exp="" desc=""/>
-        <constraint field="csv_captain" exp="" desc=""/>
-        <constraint field="csv_captain_phone" exp="" desc=""/>
-        <constraint field="csv_first_runner" exp="" desc=""/>
-        <constraint field="csv_last_runner" exp="" desc=""/>
-        <constraint field="csv_instructions" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="position" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="notes" desc="" exp=""/>
+        <constraint field="xyposition" desc="" exp=""/>
+        <constraint field="csv_club" desc="" exp=""/>
+        <constraint field="csv_name" desc="" exp=""/>
+        <constraint field="csv_captain" desc="" exp=""/>
+        <constraint field="csv_captain_phone" desc="" exp=""/>
+        <constraint field="csv_first_runner" desc="" exp=""/>
+        <constraint field="csv_last_runner" desc="" exp=""/>
+        <constraint field="csv_instructions" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;position&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;position&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="position"/>
-          <column hidden="0" type="field" width="-1" name="type"/>
-          <column hidden="0" type="field" width="-1" name="notes"/>
-          <column hidden="0" type="field" width="-1" name="xyposition"/>
-          <column hidden="0" type="field" width="-1" name="csv_name"/>
-          <column hidden="0" type="field" width="-1" name="csv_club"/>
-          <column hidden="0" type="field" width="-1" name="csv_captain"/>
-          <column hidden="0" type="field" width="-1" name="csv_captain_phone"/>
-          <column hidden="0" type="field" width="-1" name="csv_first_runner"/>
-          <column hidden="0" type="field" width="-1" name="csv_last_runner"/>
-          <column hidden="0" type="field" width="-1" name="csv_instructions"/>
+          <column width="-1" type="field" name="id" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column width="-1" type="field" name="position" hidden="0"/>
+          <column width="-1" type="field" name="type" hidden="0"/>
+          <column width="-1" type="field" name="notes" hidden="0"/>
+          <column width="-1" type="field" name="xyposition" hidden="0"/>
+          <column width="-1" type="field" name="csv_name" hidden="0"/>
+          <column width="-1" type="field" name="csv_club" hidden="0"/>
+          <column width="-1" type="field" name="csv_captain" hidden="0"/>
+          <column width="-1" type="field" name="csv_captain_phone" hidden="0"/>
+          <column width="-1" type="field" name="csv_first_runner" hidden="0"/>
+          <column width="-1" type="field" name="csv_last_runner" hidden="0"/>
+          <column width="-1" type="field" name="csv_instructions" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6231,37 +6239,37 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="csv_10_distance"/>
-        <field editable="0" name="csv_21_distance"/>
-        <field editable="0" name="csv_Description"/>
-        <field editable="1" name="csv_capt_1"/>
-        <field editable="1" name="csv_captai"/>
-        <field editable="0" name="csv_captain"/>
-        <field editable="0" name="csv_captain_number"/>
-        <field editable="0" name="csv_captain_phone"/>
-        <field editable="0" name="csv_club"/>
-        <field editable="0" name="csv_email"/>
-        <field editable="0" name="csv_first runner"/>
-        <field editable="1" name="csv_first_"/>
-        <field editable="0" name="csv_first_runner"/>
-        <field editable="0" name="csv_firstname"/>
-        <field editable="1" name="csv_instru"/>
-        <field editable="0" name="csv_instructions"/>
-        <field editable="0" name="csv_last runner"/>
-        <field editable="1" name="csv_last_r"/>
-        <field editable="0" name="csv_last_runner"/>
-        <field editable="0" name="csv_name"/>
-        <field editable="0" name="csv_phone"/>
-        <field editable="1" name="csv_positi"/>
-        <field editable="0" name="csv_position"/>
-        <field editable="0" name="csv_races"/>
-        <field editable="0" name="csv_surname"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="notes"/>
-        <field editable="1" name="oldpositio"/>
-        <field editable="1" name="position"/>
-        <field editable="1" name="type"/>
-        <field editable="1" name="xyposition"/>
+        <field name="csv_10_distance" editable="0"/>
+        <field name="csv_21_distance" editable="0"/>
+        <field name="csv_Description" editable="0"/>
+        <field name="csv_capt_1" editable="1"/>
+        <field name="csv_captai" editable="1"/>
+        <field name="csv_captain" editable="0"/>
+        <field name="csv_captain_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_firstname" editable="0"/>
+        <field name="csv_instru" editable="1"/>
+        <field name="csv_instructions" editable="0"/>
+        <field name="csv_last runner" editable="0"/>
+        <field name="csv_last_r" editable="1"/>
+        <field name="csv_last_runner" editable="0"/>
+        <field name="csv_name" editable="0"/>
+        <field name="csv_phone" editable="0"/>
+        <field name="csv_positi" editable="1"/>
+        <field name="csv_position" editable="0"/>
+        <field name="csv_races" editable="0"/>
+        <field name="csv_surname" editable="0"/>
+        <field name="id" editable="1"/>
+        <field name="notes" editable="1"/>
+        <field name="oldpositio" editable="1"/>
+        <field name="position" editable="1"/>
+        <field name="type" editable="1"/>
+        <field name="xyposition" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="csv_10_distance"/>
@@ -6343,7 +6351,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer geometry="No geometry" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="100000" type="vector" minScale="1e+08" refreshOnNotifyMessage="" wkbType="NoGeometry" readOnly="0" autoRefreshTime="0" styleCategories="AllStyleCategories">
+    <maplayer wkbType="NoGeometry" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" type="vector" maxScale="100000" styleCategories="AllStyleCategories" refreshOnNotifyEnabled="0" geometry="No geometry" autoRefreshTime="0" minScale="1e+08" readOnly="0" autoRefreshEnabled="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>
@@ -6390,11 +6398,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" miny="0" crs="" dimensions="2" maxy="0" maxz="0" maxx="0"/>
+          <spatial dimensions="2" miny="0" maxx="0" minz="0" minx="0" crs="" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -6407,8 +6415,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/>
@@ -6427,7 +6435,7 @@ def my_form_open(dialog, layer, feature):
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -6436,8 +6444,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -6446,8 +6454,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -6470,8 +6478,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -6480,8 +6488,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -6490,8 +6498,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -6500,8 +6508,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -6524,8 +6532,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -6587,58 +6595,58 @@ def my_form_open(dialog, layer, feature):
         <default field="instructions" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="position" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="club" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="firstname" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="surname" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="phone" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="email" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="captain" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="captain_phone" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="captain_email" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="races" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="first_runner" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="last_runner" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="instructions" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint exp_strength="0" field="position" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="club" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="firstname" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="surname" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="name" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="phone" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="email" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="captain" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="captain_phone" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="captain_email" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="races" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="first_runner" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="last_runner" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="instructions" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="position" exp="" desc=""/>
-        <constraint field="club" exp="" desc=""/>
-        <constraint field="firstname" exp="" desc=""/>
-        <constraint field="surname" exp="" desc=""/>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="phone" exp="" desc=""/>
-        <constraint field="email" exp="" desc=""/>
-        <constraint field="captain" exp="" desc=""/>
-        <constraint field="captain_phone" exp="" desc=""/>
-        <constraint field="captain_email" exp="" desc=""/>
-        <constraint field="races" exp="" desc=""/>
-        <constraint field="first_runner" exp="" desc=""/>
-        <constraint field="last_runner" exp="" desc=""/>
-        <constraint field="instructions" exp="" desc=""/>
+        <constraint field="position" desc="" exp=""/>
+        <constraint field="club" desc="" exp=""/>
+        <constraint field="firstname" desc="" exp=""/>
+        <constraint field="surname" desc="" exp=""/>
+        <constraint field="name" desc="" exp=""/>
+        <constraint field="phone" desc="" exp=""/>
+        <constraint field="email" desc="" exp=""/>
+        <constraint field="captain" desc="" exp=""/>
+        <constraint field="captain_phone" desc="" exp=""/>
+        <constraint field="captain_email" desc="" exp=""/>
+        <constraint field="races" desc="" exp=""/>
+        <constraint field="first_runner" desc="" exp=""/>
+        <constraint field="last_runner" desc="" exp=""/>
+        <constraint field="instructions" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="position"/>
-          <column hidden="0" type="field" width="221" name="name"/>
-          <column hidden="0" type="field" width="-1" name="club"/>
-          <column hidden="0" type="field" width="-1" name="phone"/>
-          <column hidden="0" type="field" width="-1" name="email"/>
-          <column hidden="0" type="field" width="-1" name="captain"/>
-          <column hidden="0" type="field" width="-1" name="races"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="first_runner"/>
-          <column hidden="0" type="field" width="-1" name="last_runner"/>
-          <column hidden="0" type="field" width="-1" name="instructions"/>
-          <column hidden="0" type="field" width="-1" name="firstname"/>
-          <column hidden="0" type="field" width="-1" name="surname"/>
-          <column hidden="0" type="field" width="-1" name="captain_phone"/>
-          <column hidden="0" type="field" width="-1" name="captain_email"/>
+          <column width="-1" type="field" name="position" hidden="0"/>
+          <column width="221" type="field" name="name" hidden="0"/>
+          <column width="-1" type="field" name="club" hidden="0"/>
+          <column width="-1" type="field" name="phone" hidden="0"/>
+          <column width="-1" type="field" name="email" hidden="0"/>
+          <column width="-1" type="field" name="captain" hidden="0"/>
+          <column width="-1" type="field" name="races" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column width="-1" type="field" name="first_runner" hidden="0"/>
+          <column width="-1" type="field" name="last_runner" hidden="0"/>
+          <column width="-1" type="field" name="instructions" hidden="0"/>
+          <column width="-1" type="field" name="firstname" hidden="0"/>
+          <column width="-1" type="field" name="surname" hidden="0"/>
+          <column width="-1" type="field" name="captain_phone" hidden="0"/>
+          <column width="-1" type="field" name="captain_email" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6669,23 +6677,23 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="10_distance"/>
-        <field editable="1" name="21_distance"/>
-        <field editable="1" name="5_distance"/>
-        <field editable="1" name="captain"/>
-        <field editable="1" name="captain_number"/>
-        <field editable="1" name="club"/>
-        <field editable="1" name="email"/>
-        <field editable="1" name="first_name"/>
-        <field editable="1" name="first_runner"/>
-        <field editable="1" name="instructions"/>
-        <field editable="1" name="last_name"/>
-        <field editable="1" name="last_runner"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="phone"/>
-        <field editable="1" name="position"/>
-        <field editable="1" name="races"/>
-        <field editable="1" name="tshirt"/>
+        <field name="10_distance" editable="1"/>
+        <field name="21_distance" editable="1"/>
+        <field name="5_distance" editable="1"/>
+        <field name="captain" editable="1"/>
+        <field name="captain_number" editable="1"/>
+        <field name="club" editable="1"/>
+        <field name="email" editable="1"/>
+        <field name="first_name" editable="1"/>
+        <field name="first_runner" editable="1"/>
+        <field name="instructions" editable="1"/>
+        <field name="last_name" editable="1"/>
+        <field name="last_runner" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="phone" editable="1"/>
+        <field name="position" editable="1"/>
+        <field name="races" editable="1"/>
+        <field name="tshirt" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="10_distance"/>
@@ -6710,7 +6718,331 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>first_name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="0" readOnly="0" simplifyAlgorithm="0" autoRefreshTime="0" geometry="Point" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="100000" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" type="vector" simplifyLocal="1" refreshOnNotifyMessage="" minScale="1e+08" refreshOnNotifyEnabled="0" labelsEnabled="1" wkbType="Point">
+    <maplayer refreshOnNotifyMessage="" readOnly="0" autoRefreshEnabled="0" simplifyDrawingHints="1" geometry="Line" labelsEnabled="0" wkbType="MultiLineString" simplifyDrawingTol="1" simplifyAlgorithm="0" type="vector" autoRefreshTime="0" maxScale="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" minScale="1e+08" styleCategories="AllStyleCategories" refreshOnNotifyEnabled="0">
+      <extent>
+        <xmin>18.41055689999999956</xmin>
+        <ymin>-33.9145735999999971</ymin>
+        <xmax>18.42111279999999951</xmax>
+        <ymax>-33.90282662665203617</ymax>
+      </extent>
+      <id>mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea</id>
+      <datasource>./mayor.shp</datasource>
+      <keywordList>
+        <value></value>
+      </keywordList>
+      <layername>mayor</layername>
+      <srs>
+        <spatialrefsys>
+          <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+          <srsid>3452</srsid>
+          <srid>4326</srid>
+          <authid>EPSG:4326</authid>
+          <description>WGS 84</description>
+          <projectionacronym>longlat</projectionacronym>
+          <ellipsoidacronym>WGS84</ellipsoidacronym>
+          <geographicflag>true</geographicflag>
+        </spatialrefsys>
+      </srs>
+      <resourceMetadata>
+        <identifier></identifier>
+        <parentidentifier></parentidentifier>
+        <language></language>
+        <type>dataset</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>
+        <crs>
+          <spatialrefsys>
+            <proj4></proj4>
+            <srsid>0</srsid>
+            <srid>0</srid>
+            <authid></authid>
+            <description></description>
+            <projectionacronym></projectionacronym>
+            <ellipsoidacronym></ellipsoidacronym>
+            <geographicflag>true</geographicflag>
+          </spatialrefsys>
+        </crs>
+        <extent>
+          <spatial dimensions="2" miny="0" maxx="0" minz="0" minx="0" crs="" maxy="0" maxz="0"/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
+      </resourceMetadata>
+      <provider encoding="UTF-8">ogr</provider>
+      <vectorjoins/>
+      <layerDependencies/>
+      <dataDependencies/>
+      <legend type="default-vector"/>
+      <expressionfields/>
+      <map-layer-style-manager current="default">
+        <map-layer-style name="default"/>
+      </map-layer-style-manager>
+      <auxiliaryLayer/>
+      <flags>
+        <Identifiable>1</Identifiable>
+        <Removable>1</Removable>
+        <Searchable>1</Searchable>
+      </flags>
+      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" enableorderby="0">
+        <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
+          <rule key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" symbol="0" filter="&quot;type&quot; IS 'car'" label="Car"/>
+          <rule key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" symbol="1" filter="&quot;type&quot; IS 'walk'" label="Walking"/>
+        </rules>
+        <symbols>
+          <symbol alpha="1" force_rhr="0" type="line" clip_to_extent="1" name="0">
+            <layer locked="0" enabled="1" pass="0" class="SimpleLine">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="123,211,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="1"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+          <symbol alpha="1" force_rhr="0" type="line" clip_to_extent="1" name="1">
+            <layer locked="0" enabled="1" pass="0" class="SimpleLine">
+              <prop k="capstyle" v="flat"/>
+              <prop k="customdash" v="4;1;1;1"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="103,34,144,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="1.25"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="1"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+            <layer locked="0" enabled="1" pass="0" 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"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="lastvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol alpha="1" force_rhr="0" type="marker" clip_to_extent="1" name="@1@1">
+                <layer locked="0" enabled="1" pass="0" class="FilledMarker">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="103,34,144,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="5"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option name="properties"/>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                  <symbol alpha="1" force_rhr="0" type="fill" clip_to_extent="1" name="@@1@1@0">
+                    <layer locked="0" enabled="1" pass="0" 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"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="35,35,35,255"/>
+                      <prop k="outline_style" v="no"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" name="name" value=""/>
+                          <Option name="properties"/>
+                          <Option type="QString" name="type" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                </layer>
+              </symbol>
+            </layer>
+          </symbol>
+        </symbols>
+      </renderer-v2>
+      <customproperties>
+        <property key="dualview/previewExpressions" value="id"/>
+        <property key="embeddedWidgets/count" value="0"/>
+        <property key="variableNames"/>
+        <property key="variableValues"/>
+      </customproperties>
+      <blendMode>0</blendMode>
+      <featureBlendMode>0</featureBlendMode>
+      <layerOpacity>1</layerOpacity>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory maxScaleDenominator="1e+08" minScaleDenominator="0" backgroundAlpha="255" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" scaleBasedVisibility="0" lineSizeType="MM" opacity="1" diagramOrientation="Up" width="15" rotationOffset="270" scaleDependency="Area" barWidth="5" labelPlacementMethod="XHeight" penColor="#000000" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" enabled="0" penWidth="0" height="15">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0" style="0"/>
+          <attribute field="" color="#000000" label=""/>
+        </DiagramCategory>
+      </SingleCategoryDiagramRenderer>
+      <DiagramLayerSettings priority="0" zIndex="0" placement="2" dist="0" showAll="1" linePlacementFlags="18" obstacle="0">
+        <properties>
+          <Option type="Map">
+            <Option type="QString" name="name" value=""/>
+            <Option name="properties"/>
+            <Option type="QString" name="type" value="collection"/>
+          </Option>
+        </properties>
+      </DiagramLayerSettings>
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+        <activeChecks/>
+        <checkConfiguration/>
+      </geometryOptions>
+      <fieldConfiguration>
+        <field name="id">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="type">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+      </fieldConfiguration>
+      <aliases>
+        <alias field="id" index="0" name=""/>
+        <alias field="type" index="1" name=""/>
+      </aliases>
+      <excludeAttributesWMS/>
+      <excludeAttributesWFS/>
+      <defaults>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+      </defaults>
+      <constraints>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" notnull_strength="0" constraints="0" unique_strength="0"/>
+      </constraints>
+      <constraintExpressions>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+      </constraintExpressions>
+      <expressionfields/>
+      <attributeactions>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+      </attributeactions>
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+        <columns>
+          <column width="-1" type="field" name="id" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column width="-1" type="field" name="type" hidden="0"/>
+        </columns>
+      </attributetableconfig>
+      <conditionalstyles>
+        <rowstyles/>
+        <fieldstyles/>
+      </conditionalstyles>
+      <editform tolerant="1"></editform>
+      <editforminit/>
+      <editforminitcodesource>0</editforminitcodesource>
+      <editforminitfilepath></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 name="id" editable="1"/>
+        <field name="type" editable="1"/>
+      </editable>
+      <labelOnTop>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="type"/>
+      </labelOnTop>
+      <widgets/>
+      <previewExpression>id</previewExpression>
+      <mapTip></mapTip>
+    </maplayer>
+    <maplayer refreshOnNotifyMessage="" readOnly="0" autoRefreshEnabled="0" simplifyDrawingHints="0" geometry="Point" labelsEnabled="1" wkbType="Point" simplifyDrawingTol="1" simplifyAlgorithm="0" type="vector" autoRefreshTime="0" maxScale="100000" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" minScale="1e+08" styleCategories="AllStyleCategories" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37896929129519208</xmin>
         <ymin>-33.93500027904928373</ymin>
@@ -6763,11 +7095,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" miny="0" crs="" dimensions="2" maxy="0" maxz="0" maxx="0"/>
+          <spatial dimensions="2" miny="0" maxx="0" minz="0" minx="0" crs="" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -6794,41 +7126,41 @@ def my_form_open(dialog, layer, feature):
       <renderer-v2 type="nullSymbol"/>
       <labeling type="simple">
         <settings>
-          <text-style fontItalic="0" fieldName="name" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="50" blendMode="0" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="8.5" multilineHeight="1" textOpacity="0.75" fontSizeUnit="Point" textColor="0,0,0,255" namedStyle="Regular" fontFamily="Myriad Pro" isExpression="0">
-            <text-buffer bufferOpacity="0.6" bufferJoinStyle="64" bufferSize="1.5" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="1" bufferColor="255,255,255,255"/>
-            <background shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeType="0" shapeRadiiY="0" shapeBlendMode="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="0" shapeRadiiX="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-            <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+          <text-style fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" fontSizeUnit="Point" fieldName="name" multilineHeight="1" fontUnderline="0" fontWordSpacing="0" useSubstitutions="0" fontItalic="0" fontSize="8.5" textColor="0,0,0,255" fontCapitals="0" isExpression="0" textOpacity="0.75" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" namedStyle="Regular" fontWeight="50" blendMode="0">
+            <text-buffer bufferOpacity="0.6" bufferSize="1.5" bufferDraw="1" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0"/>
+            <background shapeSizeType="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeType="0" shapeDraw="0" shapeBorderColor="128,128,128,255" shapeOpacity="1" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetX="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeBlendMode="0" shapeJoinStyle="64" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowUnder="0" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowDraw="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowScale="100"/>
             <substitutions/>
           </text-style>
-          <text-format rightDirectionSymbol=">" wrapChar="" placeDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="0" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-          <placement quadOffset="4" preserveRotation="1" geometryGenerator="" placement="6" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" priority="1" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-20" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" offsetUnits="MapUnit" placementFlags="2" geometryGeneratorEnabled="0" dist="0" offsetType="0"/>
-          <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="1" fontLimitPixelSize="0" displayAll="0" obstacleFactor="0.2" obstacle="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="0" maxNumLabels="2000" scaleMax="10000000"/>
+          <text-format wrapChar="" multilineAlign="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0" plussign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0" decimals="3" addDirectionSymbol="0"/>
+          <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" fitInPolygonOnly="0" quadOffset="4" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" yOffset="0" maxCurvedCharAngleIn="20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" priority="1" maxCurvedCharAngleOut="-20" dist="0" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" rotationAngle="0" centroidInside="0" placementFlags="2" geometryGeneratorEnabled="0" geometryGenerator="" repeatDistance="0" distUnits="MM" preserveRotation="1" offsetType="0" centroidWhole="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering obstacleType="0" zIndex="0" drawLabels="1" fontMaxPixelSize="10000" scaleMin="1" scaleMax="10000000" obstacleFactor="0.2" fontMinPixelSize="3" labelPerPart="0" displayAll="0" maxNumLabels="2000" limitNumLabels="0" mergeLines="0" fontLimitPixelSize="0" minFeatureSize="0" scaleVisibility="0" upsidedownLabels="0" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="LabelRotation">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="360 - (&quot;label_rota&quot;)" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="360 - (&quot;label_rota&quot;)"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
                 <Option type="Map" name="PositionX">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="label_x" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="field" value="label_x"/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
                 <Option type="Map" name="PositionY">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="label_y" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="field" value="label_y"/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
                 <Option type="Map" name="Size">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </settings>
@@ -6843,21 +7175,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundColor="#ffffff" backgroundAlpha="255" labelPlacementMethod="XHeight" lineSizeType="MM" minimumSize="0" diagramOrientation="Up" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" barWidth="5" penWidth="0" penColor="#000000" width="15" scaleDependency="Area" minScaleDenominator="100000" height="15" scaleBasedVisibility="0" rotationOffset="270" enabled="0">
+        <DiagramCategory maxScaleDenominator="1e+08" minScaleDenominator="100000" backgroundAlpha="255" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" scaleBasedVisibility="0" lineSizeType="MM" opacity="1" diagramOrientation="Up" width="15" rotationOffset="270" scaleDependency="Area" barWidth="5" labelPlacementMethod="XHeight" penColor="#000000" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" enabled="0" penWidth="0" height="15">
           <fontProperties description="Arial,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" color="#000000"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="0" zIndex="0" obstacle="0" linePlacementFlags="2" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" placement="0" dist="0" showAll="1" linePlacementFlags="2" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -6866,8 +7198,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -6876,8 +7208,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -6886,8 +7218,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -6896,8 +7228,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -6906,8 +7238,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -6916,8 +7248,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -6926,8 +7258,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -6936,8 +7268,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -6946,8 +7278,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -6978,43 +7310,43 @@ def my_form_open(dialog, layer, feature):
         <default field="label_rota" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="osm_id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="z_order" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="population" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label_x" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label_y" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label_rota" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="osm_id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="name" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="z_order" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="population" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="label_x" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="label_y" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="label_rota" notnull_strength="0" constraints="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 field="id" desc="" exp=""/>
+        <constraint field="osm_id" desc="" exp=""/>
+        <constraint field="name" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="z_order" desc="" exp=""/>
+        <constraint field="population" desc="" exp=""/>
+        <constraint field="label_x" desc="" exp=""/>
+        <constraint field="label_y" desc="" exp=""/>
+        <constraint field="label_rota" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="0" type="field" width="-1" name="osm_id"/>
-          <column hidden="0" type="field" width="-1" name="name"/>
-          <column hidden="0" type="field" width="-1" name="type"/>
-          <column hidden="0" type="field" width="-1" name="z_order"/>
-          <column hidden="0" type="field" width="-1" name="population"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="label_x"/>
-          <column hidden="0" type="field" width="-1" name="label_y"/>
-          <column hidden="0" type="field" width="-1" name="label_rota"/>
+          <column width="-1" type="field" name="id" hidden="0"/>
+          <column width="-1" type="field" name="osm_id" hidden="0"/>
+          <column width="-1" type="field" name="name" hidden="0"/>
+          <column width="-1" type="field" name="type" hidden="0"/>
+          <column width="-1" type="field" name="z_order" hidden="0"/>
+          <column width="-1" type="field" name="population" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column width="-1" type="field" name="label_x" hidden="0"/>
+          <column width="-1" type="field" name="label_y" hidden="0"/>
+          <column width="-1" type="field" name="label_rota" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7045,15 +7377,15 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="label_rota"/>
-        <field editable="1" name="label_x"/>
-        <field editable="1" name="label_y"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="osm_id"/>
-        <field editable="1" name="population"/>
-        <field editable="1" name="type"/>
-        <field editable="1" name="z_order"/>
+        <field name="id" editable="1"/>
+        <field name="label_rota" editable="1"/>
+        <field name="label_x" editable="1"/>
+        <field name="label_y" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="osm_id" editable="1"/>
+        <field name="population" editable="1"/>
+        <field name="type" editable="1"/>
+        <field name="z_order" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -7070,7 +7402,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="0" readOnly="0" simplifyAlgorithm="0" autoRefreshTime="0" geometry="Line" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="100000" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" type="vector" simplifyLocal="1" refreshOnNotifyMessage="" minScale="1e+08" refreshOnNotifyEnabled="0" labelsEnabled="1" wkbType="MultiLineString">
+    <maplayer refreshOnNotifyMessage="" readOnly="0" autoRefreshEnabled="0" simplifyDrawingHints="0" geometry="Line" labelsEnabled="1" wkbType="MultiLineString" simplifyDrawingTol="1" simplifyAlgorithm="0" type="vector" autoRefreshTime="0" maxScale="100000" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" minScale="1e+08" styleCategories="AllStyleCategories" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.3437671999999985</xmin>
         <ymin>-34.02801110000000051</ymin>
@@ -7123,11 +7455,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" miny="0" crs="" dimensions="2" maxy="0" maxz="0" maxx="0"/>
+          <spatial dimensions="2" miny="0" maxx="0" minz="0" minx="0" crs="" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -7154,61 +7486,61 @@ def my_form_open(dialog, layer, feature):
       <renderer-v2 type="nullSymbol"/>
       <labeling type="simple">
         <settings>
-          <text-style fontItalic="0" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="50" blendMode="0" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="7" multilineHeight="1" textOpacity="0.8" fontSizeUnit="Point" textColor="0,0,0,255" namedStyle="Regular" fontFamily="Myriad Pro" isExpression="1">
-            <text-buffer bufferOpacity="0.6" bufferJoinStyle="128" bufferSize="1" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="1" bufferColor="255,255,255,255"/>
-            <background shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeType="0" shapeRadiiY="0" shapeBlendMode="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="0" shapeRadiiX="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-            <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+          <text-style fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" fontSizeUnit="Point" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" multilineHeight="1" fontUnderline="0" fontWordSpacing="0" useSubstitutions="0" fontItalic="0" fontSize="7" textColor="0,0,0,255" fontCapitals="0" isExpression="1" textOpacity="0.8" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" namedStyle="Regular" fontWeight="50" blendMode="0">
+            <text-buffer bufferOpacity="0.6" bufferSize="1" bufferDraw="1" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0"/>
+            <background shapeSizeType="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeType="0" shapeDraw="0" shapeBorderColor="128,128,128,255" shapeOpacity="1" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetX="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeBlendMode="0" shapeJoinStyle="64" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowUnder="0" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowDraw="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowScale="100"/>
             <substitutions/>
           </text-style>
-          <text-format rightDirectionSymbol=">" wrapChar="" placeDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="0" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-          <placement quadOffset="4" preserveRotation="1" geometryGenerator="" placement="3" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" priority="3" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-20" maxCurvedCharAngleIn="20" repeatDistanceUnits="MapUnit" offsetUnits="MapUnit" placementFlags="4" geometryGeneratorEnabled="0" dist="0" offsetType="0"/>
-          <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="1" fontLimitPixelSize="0" displayAll="0" obstacleFactor="0.3" obstacle="1" mergeLines="1" minFeatureSize="5" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="0" maxNumLabels="2000" scaleMax="10000000"/>
+          <text-format wrapChar="" multilineAlign="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0" plussign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0" decimals="3" addDirectionSymbol="0"/>
+          <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" fitInPolygonOnly="0" quadOffset="4" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" yOffset="0" maxCurvedCharAngleIn="20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="3" priority="3" maxCurvedCharAngleOut="-20" dist="0" repeatDistanceUnits="MapUnit" geometryGeneratorType="PointGeometry" rotationAngle="0" centroidInside="0" placementFlags="4" geometryGeneratorEnabled="0" geometryGenerator="" repeatDistance="0" distUnits="MM" preserveRotation="1" offsetType="0" centroidWhole="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering obstacleType="0" zIndex="0" drawLabels="1" fontMaxPixelSize="10000" scaleMin="1" scaleMax="10000000" obstacleFactor="0.3" fontMinPixelSize="3" labelPerPart="0" displayAll="0" maxNumLabels="2000" limitNumLabels="0" mergeLines="1" fontLimitPixelSize="0" minFeatureSize="5" scaleVisibility="0" upsidedownLabels="0" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="AlwaysShow">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="always_sho" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="field" value="always_sho"/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
                 <Option type="Map" name="IsObstacle">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="&quot;&quot;" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value="&quot;&quot;"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
                 <Option type="Map" name="LabelRotation">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="360 - (&quot;label_rota&quot;)" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="360 - (&quot;label_rota&quot;)"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
                 <Option type="Map" name="PositionX">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="label_x" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="field" value="label_x"/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
                 <Option type="Map" name="PositionY">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="label_y" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="field" value="label_y"/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
                 <Option type="Map" name="Priority">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="int" value="1" name="type"/>
-                  <Option type="QString" value="" name="val"/>
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="int" name="type" value="1"/>
+                  <Option type="QString" name="val" value=""/>
                 </Option>
                 <Option type="Map" name="Show">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="auxiliary_storage_labeling_show" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="field" value="auxiliary_storage_labeling_show"/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
                 <Option type="Map" name="Size">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </settings>
@@ -7223,21 +7555,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundColor="#ffffff" backgroundAlpha="255" labelPlacementMethod="XHeight" lineSizeType="MM" minimumSize="0" diagramOrientation="Up" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" barWidth="5" penWidth="0" penColor="#000000" width="15" scaleDependency="Area" minScaleDenominator="100000" height="15" scaleBasedVisibility="0" rotationOffset="270" enabled="0">
+        <DiagramCategory maxScaleDenominator="1e+08" minScaleDenominator="100000" backgroundAlpha="255" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" scaleBasedVisibility="0" lineSizeType="MM" opacity="1" diagramOrientation="Up" width="15" rotationOffset="270" scaleDependency="Area" barWidth="5" labelPlacementMethod="XHeight" penColor="#000000" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" enabled="0" penWidth="0" height="15">
           <fontProperties description="Arial,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" color="#000000"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="2" zIndex="0" obstacle="0" linePlacementFlags="2" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" placement="2" dist="0" showAll="1" linePlacementFlags="2" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -7246,8 +7578,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -7256,8 +7588,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -7301,8 +7633,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -7403,64 +7735,64 @@ def my_form_open(dialog, layer, feature):
         <default field="auxiliary_storage_labeling_show" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="osm_id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="highway" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="waterway" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="aerialway" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="barrier" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="man_made" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="z_order" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="other_tags" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="never_show" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label_x" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label_y" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label_rota" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="always_sho" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="resident_a" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="auxiliary_storage_labeling_show" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint exp_strength="0" field="osm_id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="name" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="highway" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="waterway" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="aerialway" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="barrier" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="man_made" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="z_order" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="other_tags" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="never_show" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="label_x" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="label_y" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="label_rota" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="always_sho" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="resident_a" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="auxiliary_storage_labeling_show" notnull_strength="0" constraints="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 field="osm_id" desc="" exp=""/>
+        <constraint field="name" desc="" exp=""/>
+        <constraint field="highway" desc="" exp=""/>
+        <constraint field="waterway" desc="" exp=""/>
+        <constraint field="aerialway" desc="" exp=""/>
+        <constraint field="barrier" desc="" exp=""/>
+        <constraint field="man_made" desc="" exp=""/>
+        <constraint field="z_order" desc="" exp=""/>
+        <constraint field="other_tags" desc="" exp=""/>
+        <constraint field="never_show" desc="" exp=""/>
+        <constraint field="label_x" desc="" exp=""/>
+        <constraint field="label_y" desc="" exp=""/>
+        <constraint field="label_rota" desc="" exp=""/>
+        <constraint field="always_sho" desc="" exp=""/>
+        <constraint field="resident_a" desc="" exp=""/>
+        <constraint field="auxiliary_storage_labeling_show" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;resident_a&quot;" sortOrder="1">
+      <attributetableconfig sortExpression="&quot;resident_a&quot;" sortOrder="1" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="osm_id"/>
-          <column hidden="0" type="field" width="-1" name="name"/>
-          <column hidden="0" type="field" width="-1" name="z_order"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="highway"/>
-          <column hidden="0" type="field" width="-1" name="waterway"/>
-          <column hidden="0" type="field" width="-1" name="aerialway"/>
-          <column hidden="0" type="field" width="-1" name="barrier"/>
-          <column hidden="0" type="field" width="-1" name="man_made"/>
-          <column hidden="0" type="field" width="-1" name="other_tags"/>
-          <column hidden="0" type="field" width="-1" name="never_show"/>
-          <column hidden="0" type="field" width="-1" name="label_x"/>
-          <column hidden="0" type="field" width="-1" name="label_y"/>
-          <column hidden="0" type="field" width="-1" name="label_rota"/>
-          <column hidden="0" type="field" width="-1" name="always_sho"/>
-          <column hidden="0" type="field" width="-1" name="resident_a"/>
-          <column hidden="0" type="field" width="-1" name="auxiliary_storage_labeling_show"/>
+          <column width="-1" type="field" name="osm_id" hidden="0"/>
+          <column width="-1" type="field" name="name" hidden="0"/>
+          <column width="-1" type="field" name="z_order" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column width="-1" type="field" name="highway" hidden="0"/>
+          <column width="-1" type="field" name="waterway" hidden="0"/>
+          <column width="-1" type="field" name="aerialway" hidden="0"/>
+          <column width="-1" type="field" name="barrier" hidden="0"/>
+          <column width="-1" type="field" name="man_made" hidden="0"/>
+          <column width="-1" type="field" name="other_tags" hidden="0"/>
+          <column width="-1" type="field" name="never_show" hidden="0"/>
+          <column width="-1" type="field" name="label_x" hidden="0"/>
+          <column width="-1" type="field" name="label_y" hidden="0"/>
+          <column width="-1" type="field" name="label_rota" hidden="0"/>
+          <column width="-1" type="field" name="always_sho" hidden="0"/>
+          <column width="-1" type="field" name="resident_a" hidden="0"/>
+          <column width="-1" type="field" name="auxiliary_storage_labeling_show" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7491,40 +7823,40 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="aerialway"/>
-        <field editable="1" name="always_sho"/>
-        <field editable="0" name="auxiliary_storage_labeling_show"/>
-        <field editable="1" name="barrier"/>
-        <field editable="1" name="highway"/>
-        <field editable="1" name="label_rota"/>
-        <field editable="1" name="label_x"/>
-        <field editable="1" name="label_y"/>
-        <field editable="1" name="man_made"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="never_show"/>
-        <field editable="0" name="orig_access"/>
-        <field editable="0" name="orig_always_sho"/>
-        <field editable="0" name="orig_bridge"/>
-        <field editable="0" name="orig_c_z_order"/>
-        <field editable="0" name="orig_class"/>
-        <field editable="0" name="orig_id"/>
-        <field editable="0" name="orig_label_rota"/>
-        <field editable="0" name="orig_label_x"/>
-        <field editable="0" name="orig_label_y"/>
-        <field editable="0" name="orig_name"/>
-        <field editable="0" name="orig_oneway"/>
-        <field editable="0" name="orig_ref"/>
-        <field editable="0" name="orig_service"/>
-        <field editable="0" name="orig_show"/>
-        <field editable="0" name="orig_tunnel"/>
-        <field editable="0" name="orig_type"/>
-        <field editable="0" name="orig_z_order"/>
-        <field editable="1" name="osm_id"/>
-        <field editable="1" name="other_tags"/>
-        <field editable="1" name="resident_a"/>
-        <field editable="1" name="resident_access"/>
-        <field editable="1" name="waterway"/>
-        <field editable="1" name="z_order"/>
+        <field name="aerialway" editable="1"/>
+        <field name="always_sho" editable="1"/>
+        <field name="auxiliary_storage_labeling_show" editable="0"/>
+        <field name="barrier" editable="1"/>
+        <field name="highway" editable="1"/>
+        <field name="label_rota" editable="1"/>
+        <field name="label_x" editable="1"/>
+        <field name="label_y" editable="1"/>
+        <field name="man_made" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="never_show" editable="1"/>
+        <field name="orig_access" editable="0"/>
+        <field name="orig_always_sho" editable="0"/>
+        <field name="orig_bridge" editable="0"/>
+        <field name="orig_c_z_order" editable="0"/>
+        <field name="orig_class" editable="0"/>
+        <field name="orig_id" editable="0"/>
+        <field name="orig_label_rota" editable="0"/>
+        <field name="orig_label_x" editable="0"/>
+        <field name="orig_label_y" editable="0"/>
+        <field name="orig_name" editable="0"/>
+        <field name="orig_oneway" editable="0"/>
+        <field name="orig_ref" editable="0"/>
+        <field name="orig_service" editable="0"/>
+        <field name="orig_show" editable="0"/>
+        <field name="orig_tunnel" editable="0"/>
+        <field name="orig_type" editable="0"/>
+        <field name="orig_z_order" editable="0"/>
+        <field name="osm_id" editable="1"/>
+        <field name="other_tags" editable="1"/>
+        <field name="resident_a" editable="1"/>
+        <field name="resident_access" editable="1"/>
+        <field name="waterway" editable="1"/>
+        <field name="z_order" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="aerialway"/>
@@ -7609,7 +7941,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="0" readOnly="0" simplifyAlgorithm="0" autoRefreshTime="0" geometry="Point" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" type="vector" simplifyLocal="1" refreshOnNotifyMessage="" minScale="1e+08" refreshOnNotifyEnabled="0" labelsEnabled="1" wkbType="Point">
+    <maplayer refreshOnNotifyMessage="" readOnly="0" autoRefreshEnabled="0" simplifyDrawingHints="0" geometry="Point" labelsEnabled="1" wkbType="Point" simplifyDrawingTol="1" simplifyAlgorithm="0" type="vector" autoRefreshTime="0" maxScale="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" minScale="1e+08" styleCategories="AllStyleCategories" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.3984390148267174</xmin>
         <ymin>-33.90832575607554134</ymin>
@@ -7662,11 +7994,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" miny="0" crs="" dimensions="2" maxy="0" maxz="0" maxx="0"/>
+          <spatial dimensions="2" miny="0" maxx="0" minz="0" minx="0" crs="" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -7690,7 +8022,7 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="RuleRenderer" enableorderby="0" symbollevels="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" enableorderby="0">
         <rules key="{0927a9cd-bbb2-44ea-811b-fdbcb767a09a}">
           <rule key="{efda7615-994b-459d-a657-ee8185286b0b}" symbol="0" filter="regexp_match( &quot;type&quot;, '(start|finish)')"/>
           <rule key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}" symbol="1" filter="&quot;type&quot; = 'toilets'"/>
@@ -7700,289 +8032,289 @@ def my_form_open(dialog, layer, feature):
           <rule key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}" symbol="5" filter="&quot;type&quot; = 'parking'"/>
         </rules>
         <symbols>
-          <symbol type="marker" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-              <prop v="0" k="angle"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="round" k="joinstyle"/>
-              <prop v="star" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.5" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="7" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol alpha="1" force_rhr="0" type="marker" clip_to_extent="1" name="0">
+            <layer locked="0" enabled="1" pass="0" class="SimpleMarker">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="0,0,0,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="round"/>
+              <prop k="name" v="star"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="0,0,0,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0.5"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="7"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="if( @map_scale &lt; 7000, '14', '7' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '14', '7' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" alpha="1" name="1" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SvgMarker" enabled="1" pass="0">
-              <prop v="0" k="angle"/>
-              <prop v="0,32,80,255" k="color"/>
-              <prop v="0" k="fixedAspectRatio"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="amenity/amenity_toilets.svg" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="7" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol alpha="1" force_rhr="0" type="marker" clip_to_extent="1" name="1">
+            <layer locked="0" enabled="1" pass="0" class="SvgMarker">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="0,32,80,255"/>
+              <prop k="fixedAspectRatio" v="0"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="name" v="amenity/amenity_toilets.svg"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="35,35,35,255"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="7"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="if( @map_scale &lt; 7000, '10', '5' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '10', '5' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" alpha="1" name="2" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SvgMarker" enabled="1" pass="0">
-              <prop v="0" k="angle"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="0" k="fixedAspectRatio"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="../images/gym-bag.svg" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="6" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol alpha="1" force_rhr="0" type="marker" clip_to_extent="1" name="2">
+            <layer locked="0" enabled="1" pass="0" class="SvgMarker">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="0,0,0,255"/>
+              <prop k="fixedAspectRatio" v="0"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="name" v="../images/gym-bag.svg"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="0,0,0,255"/>
+              <prop k="outline_width" v="0.2"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="6"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="fillColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="CASE&#xa;WHEN &quot;distance&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;distance&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;distance&quot; = '5KM'  THEN '#456419'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;distance&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;distance&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;distance&quot; = '5KM'  THEN '#456419'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                     <Option type="Map" name="size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="if( @map_scale &lt; 7000, '10', '5' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '10', '5' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" alpha="1" name="3" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SvgMarker" enabled="1" pass="0">
-              <prop v="0" k="angle"/>
-              <prop v="125,139,143,255" k="color"/>
-              <prop v="0" k="fixedAspectRatio"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="../images/road_closure.svg" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="6" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol alpha="1" force_rhr="0" type="marker" clip_to_extent="1" name="3">
+            <layer locked="0" enabled="1" pass="0" class="SvgMarker">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="125,139,143,255"/>
+              <prop k="fixedAspectRatio" v="0"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="name" v="../images/road_closure.svg"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="35,35,35,255"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="6"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="if( @map_scale &lt; 7000, '10', '6' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '10', '6' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" alpha="1" name="4" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SvgMarker" enabled="1" pass="0">
-              <prop v="0" k="angle"/>
-              <prop v="0,12,254,255" k="color"/>
-              <prop v="0" k="fixedAspectRatio"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="transport/transport_bus_stop.svg" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="255,255,255,255" k="outline_color"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="5" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol alpha="1" force_rhr="0" type="marker" clip_to_extent="1" name="4">
+            <layer locked="0" enabled="1" pass="0" class="SvgMarker">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="0,12,254,255"/>
+              <prop k="fixedAspectRatio" v="0"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="name" v="transport/transport_bus_stop.svg"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="255,255,255,255"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="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"/>
               <effect type="effectStack" enabled="0">
                 <effect type="dropShadow">
-                  <prop v="13" k="blend_mode"/>
-                  <prop v="2.645" k="blur_level"/>
-                  <prop v="MM" k="blur_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-                  <prop v="0,0,0,255" k="color"/>
-                  <prop v="2" k="draw_mode"/>
-                  <prop v="0" k="enabled"/>
-                  <prop v="135" k="offset_angle"/>
-                  <prop v="2" k="offset_distance"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_unit_scale"/>
-                  <prop v="1" k="opacity"/>
+                  <prop k="blend_mode" v="13"/>
+                  <prop k="blur_level" v="2.645"/>
+                  <prop k="blur_unit" v="MM"/>
+                  <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="color" v="0,0,0,255"/>
+                  <prop k="draw_mode" v="2"/>
+                  <prop k="enabled" v="0"/>
+                  <prop k="offset_angle" v="135"/>
+                  <prop k="offset_distance" v="2"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="offset_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="opacity" v="1"/>
                 </effect>
                 <effect type="outerGlow">
-                  <prop v="0" k="blend_mode"/>
-                  <prop v="0.7935" k="blur_level"/>
-                  <prop v="MM" k="blur_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-                  <prop v="0,0,255,255" k="color1"/>
-                  <prop v="0,255,0,255" k="color2"/>
-                  <prop v="0" k="color_type"/>
-                  <prop v="0" k="discrete"/>
-                  <prop v="2" k="draw_mode"/>
-                  <prop v="1" k="enabled"/>
-                  <prop v="0.5" k="opacity"/>
-                  <prop v="gradient" k="rampType"/>
-                  <prop v="255,255,255,255" k="single_color"/>
-                  <prop v="2" k="spread"/>
-                  <prop v="MM" k="spread_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="spread_unit_scale"/>
+                  <prop k="blend_mode" v="0"/>
+                  <prop k="blur_level" v="0.7935"/>
+                  <prop k="blur_unit" v="MM"/>
+                  <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="color1" v="0,0,255,255"/>
+                  <prop k="color2" v="0,255,0,255"/>
+                  <prop k="color_type" v="0"/>
+                  <prop k="discrete" v="0"/>
+                  <prop k="draw_mode" v="2"/>
+                  <prop k="enabled" v="1"/>
+                  <prop k="opacity" v="0.5"/>
+                  <prop k="rampType" v="gradient"/>
+                  <prop k="single_color" v="255,255,255,255"/>
+                  <prop k="spread" v="2"/>
+                  <prop k="spread_unit" v="MM"/>
+                  <prop k="spread_unit_scale" v="3x:0,0,0,0,0,0"/>
                 </effect>
                 <effect type="drawSource">
-                  <prop v="0" k="blend_mode"/>
-                  <prop v="2" k="draw_mode"/>
-                  <prop v="1" k="enabled"/>
-                  <prop v="1" k="opacity"/>
+                  <prop k="blend_mode" v="0"/>
+                  <prop k="draw_mode" v="2"/>
+                  <prop k="enabled" v="1"/>
+                  <prop k="opacity" v="1"/>
                 </effect>
                 <effect type="innerShadow">
-                  <prop v="13" k="blend_mode"/>
-                  <prop v="2.645" k="blur_level"/>
-                  <prop v="MM" k="blur_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-                  <prop v="0,0,0,255" k="color"/>
-                  <prop v="2" k="draw_mode"/>
-                  <prop v="0" k="enabled"/>
-                  <prop v="135" k="offset_angle"/>
-                  <prop v="2" k="offset_distance"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_unit_scale"/>
-                  <prop v="1" k="opacity"/>
+                  <prop k="blend_mode" v="13"/>
+                  <prop k="blur_level" v="2.645"/>
+                  <prop k="blur_unit" v="MM"/>
+                  <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="color" v="0,0,0,255"/>
+                  <prop k="draw_mode" v="2"/>
+                  <prop k="enabled" v="0"/>
+                  <prop k="offset_angle" v="135"/>
+                  <prop k="offset_distance" v="2"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="offset_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="opacity" v="1"/>
                 </effect>
                 <effect type="innerGlow">
-                  <prop v="0" k="blend_mode"/>
-                  <prop v="0.7935" k="blur_level"/>
-                  <prop v="MM" k="blur_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-                  <prop v="0,0,255,255" k="color1"/>
-                  <prop v="0,255,0,255" k="color2"/>
-                  <prop v="0" k="color_type"/>
-                  <prop v="0" k="discrete"/>
-                  <prop v="2" k="draw_mode"/>
-                  <prop v="0" k="enabled"/>
-                  <prop v="0.5" k="opacity"/>
-                  <prop v="gradient" k="rampType"/>
-                  <prop v="255,255,255,255" k="single_color"/>
-                  <prop v="2" k="spread"/>
-                  <prop v="MM" k="spread_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="spread_unit_scale"/>
+                  <prop k="blend_mode" v="0"/>
+                  <prop k="blur_level" v="0.7935"/>
+                  <prop k="blur_unit" v="MM"/>
+                  <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="color1" v="0,0,255,255"/>
+                  <prop k="color2" v="0,255,0,255"/>
+                  <prop k="color_type" v="0"/>
+                  <prop k="discrete" v="0"/>
+                  <prop k="draw_mode" v="2"/>
+                  <prop k="enabled" v="0"/>
+                  <prop k="opacity" v="0.5"/>
+                  <prop k="rampType" v="gradient"/>
+                  <prop k="single_color" v="255,255,255,255"/>
+                  <prop k="spread" v="2"/>
+                  <prop k="spread_unit" v="MM"/>
+                  <prop k="spread_unit_scale" v="3x:0,0,0,0,0,0"/>
                 </effect>
               </effect>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" alpha="1" name="5" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SvgMarker" enabled="1" pass="0">
-              <prop v="0" k="angle"/>
-              <prop v="43,153,41,255" k="color"/>
-              <prop v="0" k="fixedAspectRatio"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="transport/amenity=parking.svg" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="6" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol alpha="1" force_rhr="0" type="marker" clip_to_extent="1" name="5">
+            <layer locked="0" enabled="1" pass="0" class="SvgMarker">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="43,153,41,255"/>
+              <prop k="fixedAspectRatio" v="0"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="name" v="transport/amenity=parking.svg"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="35,35,35,255"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="6"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="if( @map_scale &lt; 7000, '10', '5' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '10', '5' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -7991,36 +8323,36 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings>
-          <text-style fontItalic="0" fieldName="name" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="63" blendMode="0" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="10" multilineHeight="1" textOpacity="0.9" fontSizeUnit="Point" textColor="0,0,0,255" namedStyle="Semibold" fontFamily="Myriad Pro" isExpression="0">
-            <text-buffer bufferOpacity="0.8" bufferJoinStyle="128" bufferSize="2" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="1" bufferColor="255,255,255,255"/>
-            <background shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.7" shapeSizeType="0" shapeRadiiY="2" shapeBlendMode="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="0" shapeRadiiX="2" shapeSizeX="1" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-            <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+          <text-style fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" fontSizeUnit="Point" fieldName="name" multilineHeight="1" fontUnderline="0" fontWordSpacing="0" useSubstitutions="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" fontCapitals="0" isExpression="0" textOpacity="0.9" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" blendMode="0">
+            <text-buffer bufferOpacity="0.8" bufferSize="2" bufferDraw="1" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0"/>
+            <background shapeSizeType="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeSizeX="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="2" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="2" shapeType="0" shapeDraw="0" shapeBorderColor="128,128,128,255" shapeOpacity="0.7" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetX="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeSizeY="1" shapeBlendMode="0" shapeJoinStyle="64" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowUnder="0" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowDraw="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowScale="100"/>
             <substitutions/>
           </text-style>
-          <text-format rightDirectionSymbol=">" wrapChar="" placeDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="3" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-          <placement quadOffset="2" preserveRotation="1" geometryGenerator="" placement="0" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="3" distUnits="MM" rotationAngle="0" xOffset="2" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" priority="10" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-25" maxCurvedCharAngleIn="25" repeatDistanceUnits="MM" offsetUnits="MM" placementFlags="10" geometryGeneratorEnabled="0" dist="3" offsetType="0"/>
-          <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="0" fontLimitPixelSize="0" displayAll="1" obstacleFactor="1.8" obstacle="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="10" maxNumLabels="2000" scaleMax="0"/>
+          <text-format wrapChar="" multilineAlign="3" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0" plussign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0" decimals="3" addDirectionSymbol="0"/>
+          <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="2" fitInPolygonOnly="0" quadOffset="2" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" yOffset="3" maxCurvedCharAngleIn="25" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" priority="10" maxCurvedCharAngleOut="-25" dist="3" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" rotationAngle="0" centroidInside="0" placementFlags="10" geometryGeneratorEnabled="0" geometryGenerator="" repeatDistance="0" distUnits="MM" preserveRotation="1" offsetType="0" centroidWhole="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering obstacleType="0" zIndex="10" drawLabels="1" fontMaxPixelSize="10000" scaleMin="0" scaleMax="0" obstacleFactor="1.8" fontMinPixelSize="3" labelPerPart="0" displayAll="1" maxNumLabels="2000" limitNumLabels="0" mergeLines="0" fontLimitPixelSize="0" minFeatureSize="0" scaleVisibility="0" upsidedownLabels="0" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="LabelDistance">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="if( @map_scale &lt; 7000, '5', '3' )" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '5', '3' )"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
                 <Option type="Map" name="OffsetQuad">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="2" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="2"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
                 <Option type="Map" name="Size">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="if( @map_scale &lt; 7000, '14', '10' )" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '14', '10' )"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </settings>
@@ -8035,21 +8367,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundColor="#ffffff" backgroundAlpha="255" labelPlacementMethod="XHeight" lineSizeType="MM" minimumSize="0" diagramOrientation="Up" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" barWidth="5" penWidth="0" penColor="#000000" width="15" scaleDependency="Area" minScaleDenominator="0" height="15" scaleBasedVisibility="0" rotationOffset="270" enabled="0">
+        <DiagramCategory maxScaleDenominator="1e+08" minScaleDenominator="0" backgroundAlpha="255" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" scaleBasedVisibility="0" lineSizeType="MM" opacity="1" diagramOrientation="Up" width="15" rotationOffset="270" scaleDependency="Area" barWidth="5" labelPlacementMethod="XHeight" penColor="#000000" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" enabled="0" penWidth="0" height="15">
           <fontProperties description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0" style="0"/>
-          <attribute label="" field="" color="#000000"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="0" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" placement="0" dist="0" showAll="1" linePlacementFlags="18" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -8098,28 +8430,28 @@ def my_form_open(dialog, layer, feature):
         <default field="distance" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="distance" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="name" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="distance" notnull_strength="0" constraints="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 field="id" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="name" desc="" exp=""/>
+        <constraint field="distance" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;type&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;type&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="0" type="field" width="-1" name="type"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="name"/>
-          <column hidden="0" type="field" width="-1" name="distance"/>
+          <column width="-1" type="field" name="id" hidden="0"/>
+          <column width="-1" type="field" name="type" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column width="-1" type="field" name="name" hidden="0"/>
+          <column width="-1" type="field" name="distance" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8150,10 +8482,10 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="type"/>
+        <field name="distance" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="distance"/>
@@ -8165,7 +8497,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="1" readOnly="0" simplifyAlgorithm="0" autoRefreshTime="0" geometry="Polygon" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" type="vector" simplifyLocal="1" refreshOnNotifyMessage="" minScale="1e+08" refreshOnNotifyEnabled="0" labelsEnabled="0" wkbType="MultiPolygon">
+    <maplayer refreshOnNotifyMessage="" readOnly="0" autoRefreshEnabled="0" simplifyDrawingHints="1" geometry="Polygon" labelsEnabled="0" wkbType="MultiPolygon" simplifyDrawingTol="1" simplifyAlgorithm="0" type="vector" autoRefreshTime="0" maxScale="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" minScale="1e+08" styleCategories="AllStyleCategories" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37312291788339991</xmin>
         <ymin>-33.931815589166888</ymin>
@@ -8209,7 +8541,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -8229,75 +8561,75 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" enableorderby="0" symbollevels="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol type="fill" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="LinePatternFill" enabled="1" pass="0">
-              <prop v="135" k="angle"/>
-              <prop v="211,134,33,255" k="color"/>
-              <prop v="2" k="distance"/>
-              <prop v="3x:0,0,0,0,0,0" k="distance_map_unit_scale"/>
-              <prop v="MM" k="distance_unit"/>
-              <prop v="0.26" k="line_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="line_width_map_unit_scale"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
+          <symbol alpha="1" force_rhr="0" type="fill" clip_to_extent="1" name="0">
+            <layer locked="0" enabled="1" pass="0" class="LinePatternFill">
+              <prop k="angle" v="135"/>
+              <prop k="color" v="211,134,33,255"/>
+              <prop k="distance" v="2"/>
+              <prop k="distance_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="distance_unit" v="MM"/>
+              <prop k="line_width" v="0.26"/>
+              <prop k="line_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="line" alpha="1" name="@0@0" clip_to_extent="1" force_rhr="0">
-                <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-                  <prop v="square" k="capstyle"/>
-                  <prop v="5;2" k="customdash"/>
-                  <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                  <prop v="MM" k="customdash_unit"/>
-                  <prop v="0" k="draw_inside_polygon"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="211,134,33,255" k="line_color"/>
-                  <prop v="solid" k="line_style"/>
-                  <prop v="0.3" k="line_width"/>
-                  <prop v="MM" k="line_width_unit"/>
-                  <prop v="0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0" k="ring_filter"/>
-                  <prop v="0" k="use_custom_dash"/>
-                  <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+              <symbol alpha="1" force_rhr="0" type="line" clip_to_extent="1" name="@0@0">
+                <layer locked="0" enabled="1" pass="0" class="SimpleLine">
+                  <prop k="capstyle" v="square"/>
+                  <prop k="customdash" v="5;2"/>
+                  <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="customdash_unit" v="MM"/>
+                  <prop k="draw_inside_polygon" v="0"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="line_color" v="211,134,33,255"/>
+                  <prop k="line_style" v="solid"/>
+                  <prop k="line_width" v="0.3"/>
+                  <prop k="line_width_unit" v="MM"/>
+                  <prop k="offset" v="0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="ring_filter" v="0"/>
+                  <prop k="use_custom_dash" v="0"/>
+                  <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="211,134,33,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.46" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="no" k="style"/>
+            <layer locked="0" enabled="1" pass="0" 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"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="0,0,0,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0.46"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="style" v="no"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -8316,21 +8648,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundColor="#ffffff" backgroundAlpha="255" labelPlacementMethod="XHeight" lineSizeType="MM" minimumSize="0" diagramOrientation="Up" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" barWidth="5" penWidth="0" penColor="#000000" width="15" scaleDependency="Area" minScaleDenominator="0" height="15" scaleBasedVisibility="0" rotationOffset="270" enabled="0">
+        <DiagramCategory maxScaleDenominator="1e+08" minScaleDenominator="0" backgroundAlpha="255" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" scaleBasedVisibility="0" lineSizeType="MM" opacity="1" diagramOrientation="Up" width="15" rotationOffset="270" scaleDependency="Area" barWidth="5" labelPlacementMethod="XHeight" penColor="#000000" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" enabled="0" penWidth="0" height="15">
           <fontProperties description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0" style="0"/>
-          <attribute label="" field="" color="#000000"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="1" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" placement="1" dist="0" showAll="1" linePlacementFlags="18" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -8352,20 +8684,20 @@ def my_form_open(dialog, layer, feature):
         <default field="FID" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="FID" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint exp_strength="0" field="FID" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="FID" exp="" desc=""/>
+        <constraint field="FID" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="0" type="field" width="431" name="type"/>
-          <column hidden="1" type="actions" width="-1"/>
+          <column width="-1" type="field" name="id" hidden="0"/>
+          <column width="431" type="field" name="type" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8396,8 +8728,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -8407,7 +8739,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="1" readOnly="0" simplifyAlgorithm="0" autoRefreshTime="0" geometry="Line" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" type="vector" simplifyLocal="1" refreshOnNotifyMessage="" minScale="1e+08" refreshOnNotifyEnabled="0" labelsEnabled="1" wkbType="MultiLineString">
+    <maplayer refreshOnNotifyMessage="" readOnly="0" autoRefreshEnabled="0" simplifyDrawingHints="1" geometry="Line" labelsEnabled="1" wkbType="MultiLineString" simplifyDrawingTol="1" simplifyAlgorithm="0" type="vector" autoRefreshTime="0" maxScale="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" minScale="1e+08" styleCategories="AllStyleCategories" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.3752895999999879</xmin>
         <ymin>-33.94589500000000726</ymin>
@@ -8460,11 +8792,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" miny="0" crs="" dimensions="2" maxy="0" maxz="0" maxx="0"/>
+          <spatial dimensions="2" miny="0" maxx="0" minz="0" minx="0" crs="" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -8488,348 +8820,348 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="RuleRenderer" enableorderby="0" symbollevels="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" enableorderby="0">
         <rules key="{57366f52-c504-4c9a-800f-dcbf1d415bf6}">
-          <rule label="Road Open" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" symbol="0" filter="&quot;status&quot; = 'open'"/>
-          <rule label="No Parking" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" symbol="1" filter="&quot;status&quot; = 'no-parking'"/>
-          <rule label="Lane Closed" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" symbol="2" filter="&quot;status&quot; = 'lane-closed'"/>
-          <rule label="One-Way" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" symbol="3" filter="&quot;status&quot; = 'one-way'"/>
-          <rule label="Road Closures" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" symbol="4" filter="&quot;status&quot; = 'closure'"/>
+          <rule key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" symbol="0" filter="&quot;status&quot; = 'open'" label="Road Open"/>
+          <rule key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" symbol="1" filter="&quot;status&quot; = 'no-parking'" label="No Parking"/>
+          <rule key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" symbol="2" filter="&quot;status&quot; = 'lane-closed'" label="Lane Closed"/>
+          <rule key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" symbol="3" filter="&quot;status&quot; = 'one-way'" label="One-Way"/>
+          <rule key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" symbol="4" filter="&quot;status&quot; = 'closure'" label="Road Closures"/>
         </rules>
         <symbols>
-          <symbol type="line" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,255,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.75" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol alpha="1" force_rhr="0" type="line" clip_to_extent="1" name="0">
+            <layer locked="0" enabled="1" pass="0" class="SimpleLine">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,255,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.75"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                     <Option type="Map" name="outlineStyle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="1" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="2" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+          <symbol alpha="1" force_rhr="0" type="line" clip_to_extent="1" name="1">
+            <layer locked="0" enabled="1" pass="0" 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"/>
+              <prop k="interval" v="2"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@1@0" clip_to_extent="1" force_rhr="0">
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="255,255,255,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,255,0,255" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0.5" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="1" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol alpha="1" force_rhr="0" type="marker" clip_to_extent="1" name="@1@0">
+                <layer locked="0" enabled="1" pass="0" class="SimpleMarker">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="255,255,255,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,255,0,255"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0.5"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="1"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="2" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="2;1;1;1" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,255,0,255" k="line_color"/>
-              <prop v="dash dot dot" k="line_style"/>
-              <prop v="0.75" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol alpha="1" force_rhr="0" type="line" clip_to_extent="1" name="2">
+            <layer locked="0" enabled="1" pass="0" 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"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,255,0,255"/>
+              <prop k="line_style" v="dash dot dot"/>
+              <prop k="line_width" v="0.75"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="1"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                     <Option type="Map" name="outlineStyle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="250" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MapUnit" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="25" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer locked="0" enabled="1" pass="0" 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"/>
+              <prop k="interval" v="250"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MapUnit"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="25"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MapUnit"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="enabled">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@2@1" clip_to_extent="1" force_rhr="0">
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="0,255,0,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="35,35,35,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3.5" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol alpha="1" force_rhr="0" type="marker" clip_to_extent="1" name="@2@1">
+                <layer locked="0" enabled="1" pass="0" class="SimpleMarker">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="0,255,0,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="35,35,35,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="3.5"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="outlineStyle">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="3" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="3;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,255,0,255" k="line_color"/>
-              <prop v="dash" k="line_style"/>
-              <prop v="0.75" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol alpha="1" force_rhr="0" type="line" clip_to_extent="1" name="3">
+            <layer locked="0" enabled="1" pass="0" 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"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,255,0,255"/>
+              <prop k="line_style" v="dash"/>
+              <prop k="line_width" v="0.75"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="1"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                     <Option type="Map" name="outlineStyle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="250" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MapUnit" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="25" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer locked="0" enabled="1" pass="0" 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"/>
+              <prop k="interval" v="250"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MapUnit"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="25"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MapUnit"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="enabled">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@3@1" clip_to_extent="1" force_rhr="0">
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="0,255,0,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="35,35,35,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3.5" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol alpha="1" force_rhr="0" type="marker" clip_to_extent="1" name="@3@1">
+                <layer locked="0" enabled="1" pass="0" class="SimpleMarker">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="0,255,0,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="35,35,35,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="3.5"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="outlineStyle">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="4" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="255,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.75" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol alpha="1" force_rhr="0" type="line" clip_to_extent="1" name="4">
+            <layer locked="0" enabled="1" pass="0" class="SimpleLine">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="255,0,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.75"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                     <Option type="Map" name="outlineStyle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -8838,20 +9170,20 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings>
-          <text-style fontItalic="0" fieldName="times" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="50" blendMode="0" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="9" multilineHeight="1" textOpacity="1" fontSizeUnit="Point" textColor="0,0,0,255" namedStyle="Regular" fontFamily="Myriad Pro" isExpression="0">
-            <text-buffer bufferOpacity="1" bufferJoinStyle="128" bufferSize="1" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="1" bufferColor="255,255,255,255"/>
-            <background shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeType="0" shapeRadiiY="0" shapeBlendMode="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="0" shapeRadiiX="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-            <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+          <text-style fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" fontSizeUnit="Point" fieldName="times" multilineHeight="1" fontUnderline="0" fontWordSpacing="0" useSubstitutions="0" fontItalic="0" fontSize="9" textColor="0,0,0,255" fontCapitals="0" isExpression="0" textOpacity="1" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" namedStyle="Regular" fontWeight="50" blendMode="0">
+            <text-buffer bufferOpacity="1" bufferSize="1" bufferDraw="1" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0"/>
+            <background shapeSizeType="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeType="0" shapeDraw="0" shapeBorderColor="128,128,128,255" shapeOpacity="1" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetX="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeBlendMode="0" shapeJoinStyle="64" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowUnder="0" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowDraw="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowScale="100"/>
             <substitutions/>
           </text-style>
-          <text-format rightDirectionSymbol=">" wrapChar="" placeDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="4294967295" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-          <placement quadOffset="4" preserveRotation="1" geometryGenerator="" placement="2" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" priority="5" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-25" maxCurvedCharAngleIn="25" repeatDistanceUnits="MM" offsetUnits="MM" placementFlags="10" geometryGeneratorEnabled="0" dist="0" offsetType="0"/>
-          <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="0" fontLimitPixelSize="0" displayAll="0" obstacleFactor="1" obstacle="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="0" maxNumLabels="2000" scaleMax="0"/>
+          <text-format wrapChar="" multilineAlign="4294967295" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0" plussign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0" decimals="3" addDirectionSymbol="0"/>
+          <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" fitInPolygonOnly="0" quadOffset="4" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" yOffset="0" maxCurvedCharAngleIn="25" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" priority="5" maxCurvedCharAngleOut="-25" dist="0" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" rotationAngle="0" centroidInside="0" placementFlags="10" geometryGeneratorEnabled="0" geometryGenerator="" repeatDistance="0" distUnits="MM" preserveRotation="1" offsetType="0" centroidWhole="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering obstacleType="0" zIndex="0" drawLabels="1" fontMaxPixelSize="10000" scaleMin="0" scaleMax="0" obstacleFactor="1" fontMinPixelSize="3" labelPerPart="0" displayAll="0" maxNumLabels="2000" limitNumLabels="0" mergeLines="0" fontLimitPixelSize="0" minFeatureSize="0" scaleVisibility="0" upsidedownLabels="0" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </settings>
@@ -8866,21 +9198,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundColor="#ffffff" backgroundAlpha="255" labelPlacementMethod="XHeight" lineSizeType="MM" minimumSize="0" diagramOrientation="Up" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" barWidth="5" penWidth="0" penColor="#000000" width="15" scaleDependency="Area" minScaleDenominator="0" height="15" scaleBasedVisibility="0" rotationOffset="270" enabled="0">
+        <DiagramCategory maxScaleDenominator="1e+08" minScaleDenominator="0" backgroundAlpha="255" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" scaleBasedVisibility="0" lineSizeType="MM" opacity="1" diagramOrientation="Up" width="15" rotationOffset="270" scaleDependency="Area" barWidth="5" labelPlacementMethod="XHeight" penColor="#000000" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" enabled="0" penWidth="0" height="15">
           <fontProperties description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0" style="0"/>
-          <attribute label="" field="" color="#000000"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="2" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" placement="2" dist="0" showAll="1" linePlacementFlags="18" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -8929,28 +9261,28 @@ def my_form_open(dialog, layer, feature):
         <default field="times" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="status" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="times" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="status" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="times" notnull_strength="0" constraints="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 field="id" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="status" desc="" exp=""/>
+        <constraint field="times" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="0" type="field" width="202" name="type"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="status"/>
-          <column hidden="0" type="field" width="-1" name="times"/>
+          <column width="-1" type="field" name="id" hidden="0"/>
+          <column width="202" type="field" name="type" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column width="-1" type="field" name="status" hidden="0"/>
+          <column width="-1" type="field" name="times" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8981,10 +9313,10 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="status"/>
-        <field editable="1" name="times"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="status" editable="1"/>
+        <field name="times" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -8996,7 +9328,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="0" readOnly="0" simplifyAlgorithm="0" autoRefreshTime="0" geometry="Point" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="100000" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" type="vector" simplifyLocal="1" refreshOnNotifyMessage="" minScale="1e+08" refreshOnNotifyEnabled="0" labelsEnabled="1" wkbType="Point">
+    <maplayer refreshOnNotifyMessage="" readOnly="0" autoRefreshEnabled="0" simplifyDrawingHints="0" geometry="Point" labelsEnabled="1" wkbType="Point" simplifyDrawingTol="1" simplifyAlgorithm="0" type="vector" autoRefreshTime="0" maxScale="100000" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" minScale="1e+08" styleCategories="AllStyleCategories" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37564632736778236</xmin>
         <ymin>-33.94557692503335744</ymin>
@@ -9049,11 +9381,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" miny="0" crs="" dimensions="2" maxy="0" maxz="0" maxx="0"/>
+          <spatial dimensions="2" miny="0" maxx="0" minz="0" minx="0" crs="" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -9071,7 +9403,7 @@ def my_form_open(dialog, layer, feature):
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
         <map-layer-style name="timelapse">
-          <qgis maxScale="100000" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" version="3.8.3-Zanzibar" simplifyDrawingHints="0" simplifyLocal="1" labelsEnabled="1" minScale="1e+08" simplifyDrawingTol="1" simplifyMaxScale="1" readOnly="0" styleCategories="AllStyleCategories">
+          <qgis hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" simplifyDrawingTol="1" version="3.8.3-Zanzibar" maxScale="100000" styleCategories="AllStyleCategories" simplifyDrawingHints="0" simplifyMaxScale="1" minScale="1e+08" readOnly="0" simplifyLocal="1" labelsEnabled="1">
             <flags>
               <Identifiable>1</Identifiable>
               <Removable>1</Removable>
@@ -9080,125 +9412,125 @@ def my_form_open(dialog, layer, feature):
             <renderer-v2 type="nullSymbol"/>
             <labeling type="rule-based">
               <rules key="{2cf820d0-73b9-4746-94f0-ade0b2da8c4e}">
-                <rule key="{84988b39-de25-471d-aa1f-8d688cc3c1cd}" description="21KM" filter="&quot;Source&quot; = '21KM'">
+                <rule key="{84988b39-de25-471d-aa1f-8d688cc3c1cd}" filter="&quot;Source&quot; = '21KM'" description="21KM">
                   <settings>
-                    <text-style fontItalic="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" blendMode="0" fontWeight="63" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="7" multilineHeight="1" textOpacity="1" fontSizeUnit="Point" textColor="255,255,255,255" namedStyle="Semibold" fontFamily="Myriad Pro" isExpression="1">
-                      <text-buffer bufferOpacity="1" bufferJoinStyle="64" bufferSize="1" bufferNoFill="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255"/>
-                      <background shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeType="0" shapeRadiiY="0.1" shapeBlendMode="0" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="210,32,39,255" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="128" shapeFillColor="210,32,39,255" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeBorderWidth="1" shapeOffsetY="0" shapeRadiiX="1" shapeSizeX="0.5" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-                      <shadow shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowScale="100" shadowRadius="1.5" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+                    <text-style fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" fontSizeUnit="Point" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" multilineHeight="1" fontUnderline="0" fontWordSpacing="0" useSubstitutions="0" fontItalic="0" fontSize="7" textColor="255,255,255,255" fontCapitals="0" isExpression="1" textOpacity="1" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" blendMode="0">
+                      <text-buffer bufferOpacity="1" bufferSize="1" bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferBlendMode="0"/>
+                      <background shapeSizeType="0" shapeOffsetY="0" shapeFillColor="210,32,39,255" shapeSizeUnit="MM" shapeSizeX="0.5" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0.1" shapeType="0" shapeDraw="1" shapeBorderColor="210,32,39,255" shapeOpacity="1" shapeRadiiUnit="MM" shapeBorderWidth="1" shapeOffsetX="0" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeRotationType="0" shapeSizeY="0" shapeBlendMode="0" shapeJoinStyle="128" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+                      <shadow shadowUnder="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowDraw="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowScale="100"/>
                       <substitutions/>
                     </text-style>
-                    <text-format rightDirectionSymbol=">" wrapChar="" decimals="0" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="3" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-                    <placement quadOffset="3" preserveRotation="1" geometryGenerator="" placement="6" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" priority="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-20" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" offsetUnits="MapUnit" placementFlags="10" geometryGeneratorEnabled="0" dist="2" offsetType="0"/>
-                    <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="1" fontLimitPixelSize="0" displayAll="1" obstacleFactor="2" obstacle="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="0" maxNumLabels="2000" scaleMax="10000000"/>
+                    <text-format wrapChar="" placeDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" leftDirectionSymbol="&lt;" formatNumbers="0" plussign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0" decimals="0" addDirectionSymbol="0"/>
+                    <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" fitInPolygonOnly="0" quadOffset="3" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" yOffset="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" priority="10" placement="6" maxCurvedCharAngleOut="-20" repeatDistanceUnits="MM" dist="2" geometryGeneratorType="PointGeometry" rotationAngle="0" centroidInside="0" placementFlags="10" geometryGeneratorEnabled="0" geometryGenerator="" repeatDistance="0" distUnits="MM" preserveRotation="1" offsetType="0" centroidWhole="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                    <rendering obstacleType="0" zIndex="0" drawLabels="1" fontMaxPixelSize="10000" scaleMin="1" scaleMax="10000000" obstacleFactor="2" fontMinPixelSize="3" labelPerPart="0" displayAll="1" maxNumLabels="2000" limitNumLabels="0" mergeLines="0" fontLimitPixelSize="0" minFeatureSize="0" scaleVisibility="0" upsidedownLabels="0" obstacle="1"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option type="Map" name="properties">
                           <Option type="Map" name="PositionX">
-                            <Option type="bool" value="false" name="active"/>
-                            <Option type="int" value="1" name="type"/>
-                            <Option type="QString" value="" name="val"/>
+                            <Option type="bool" name="active" value="false"/>
+                            <Option type="int" name="type" value="1"/>
+                            <Option type="QString" name="val" value=""/>
                           </Option>
                           <Option type="Map" name="PositionY">
-                            <Option type="bool" value="false" name="active"/>
-                            <Option type="int" value="1" name="type"/>
-                            <Option type="QString" value="" name="val"/>
+                            <Option type="bool" name="active" value="false"/>
+                            <Option type="int" name="type" value="1"/>
+                            <Option type="QString" name="val" value=""/>
                           </Option>
                           <Option type="Map" name="PredefinedPositionOrder">
-                            <Option type="bool" value="false" name="active"/>
-                            <Option type="int" value="1" name="type"/>
-                            <Option type="QString" value="" name="val"/>
+                            <Option type="bool" name="active" value="false"/>
+                            <Option type="int" name="type" value="1"/>
+                            <Option type="QString" name="val" value=""/>
                           </Option>
                           <Option type="Map" name="Rotation">
-                            <Option type="bool" value="false" name="active"/>
-                            <Option type="QString" value="rotation" name="field"/>
-                            <Option type="int" value="2" name="type"/>
+                            <Option type="bool" name="active" value="false"/>
+                            <Option type="QString" name="field" value="rotation"/>
+                            <Option type="int" name="type" value="2"/>
                           </Option>
                         </Option>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </dd_properties>
                   </settings>
                 </rule>
-                <rule key="{2699b0bb-7177-40de-af85-7bce9fd38af9}" description="10KM" filter="&quot;Source&quot; = '10KM'">
+                <rule key="{2699b0bb-7177-40de-af85-7bce9fd38af9}" filter="&quot;Source&quot; = '10KM'" description="10KM">
                   <settings>
-                    <text-style fontItalic="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" blendMode="0" fontWeight="63" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="7" multilineHeight="1" textOpacity="1" fontSizeUnit="Point" textColor="255,255,255,255" namedStyle="Semibold" fontFamily="Myriad Pro" isExpression="1">
-                      <text-buffer bufferOpacity="1" bufferJoinStyle="64" bufferSize="1" bufferNoFill="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255"/>
-                      <background shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeType="0" shapeRadiiY="0.1" shapeBlendMode="0" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="103,34,144,255" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="128" shapeFillColor="103,34,144,255" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeBorderWidth="1" shapeOffsetY="0" shapeRadiiX="1" shapeSizeX="0.5" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-                      <shadow shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowScale="100" shadowRadius="1.5" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+                    <text-style fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" fontSizeUnit="Point" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" multilineHeight="1" fontUnderline="0" fontWordSpacing="0" useSubstitutions="0" fontItalic="0" fontSize="7" textColor="255,255,255,255" fontCapitals="0" isExpression="1" textOpacity="1" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" blendMode="0">
+                      <text-buffer bufferOpacity="1" bufferSize="1" bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferBlendMode="0"/>
+                      <background shapeSizeType="0" shapeOffsetY="0" shapeFillColor="103,34,144,255" shapeSizeUnit="MM" shapeSizeX="0.5" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0.1" shapeType="0" shapeDraw="1" shapeBorderColor="103,34,144,255" shapeOpacity="1" shapeRadiiUnit="MM" shapeBorderWidth="1" shapeOffsetX="0" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeRotationType="0" shapeSizeY="0" shapeBlendMode="0" shapeJoinStyle="128" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+                      <shadow shadowUnder="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowDraw="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowScale="100"/>
                       <substitutions/>
                     </text-style>
-                    <text-format rightDirectionSymbol=">" wrapChar="" decimals="0" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="3" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-                    <placement quadOffset="4" preserveRotation="1" geometryGenerator="" placement="6" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" priority="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-20" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" offsetUnits="MapUnit" placementFlags="10" geometryGeneratorEnabled="0" dist="2" offsetType="0"/>
-                    <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="1" fontLimitPixelSize="0" displayAll="1" obstacleFactor="2" obstacle="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="0" maxNumLabels="2000" scaleMax="10000000"/>
+                    <text-format wrapChar="" placeDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" leftDirectionSymbol="&lt;" formatNumbers="0" plussign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0" decimals="0" addDirectionSymbol="0"/>
+                    <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" fitInPolygonOnly="0" quadOffset="4" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" yOffset="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" priority="10" placement="6" maxCurvedCharAngleOut="-20" repeatDistanceUnits="MM" dist="2" geometryGeneratorType="PointGeometry" rotationAngle="0" centroidInside="0" placementFlags="10" geometryGeneratorEnabled="0" geometryGenerator="" repeatDistance="0" distUnits="MM" preserveRotation="1" offsetType="0" centroidWhole="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                    <rendering obstacleType="0" zIndex="0" drawLabels="1" fontMaxPixelSize="10000" scaleMin="1" scaleMax="10000000" obstacleFactor="2" fontMinPixelSize="3" labelPerPart="0" displayAll="1" maxNumLabels="2000" limitNumLabels="0" mergeLines="0" fontLimitPixelSize="0" minFeatureSize="0" scaleVisibility="0" upsidedownLabels="0" obstacle="1"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option type="Map" name="properties">
                           <Option type="Map" name="PositionX">
-                            <Option type="bool" value="false" name="active"/>
-                            <Option type="int" value="1" name="type"/>
-                            <Option type="QString" value="" name="val"/>
+                            <Option type="bool" name="active" value="false"/>
+                            <Option type="int" name="type" value="1"/>
+                            <Option type="QString" name="val" value=""/>
                           </Option>
                           <Option type="Map" name="PositionY">
-                            <Option type="bool" value="false" name="active"/>
-                            <Option type="int" value="1" name="type"/>
-                            <Option type="QString" value="" name="val"/>
+                            <Option type="bool" name="active" value="false"/>
+                            <Option type="int" name="type" value="1"/>
+                            <Option type="QString" name="val" value=""/>
                           </Option>
                           <Option type="Map" name="PredefinedPositionOrder">
-                            <Option type="bool" value="true" name="active"/>
-                            <Option type="QString" value="quadrant" name="field"/>
-                            <Option type="int" value="2" name="type"/>
+                            <Option type="bool" name="active" value="true"/>
+                            <Option type="QString" name="field" value="quadrant"/>
+                            <Option type="int" name="type" value="2"/>
                           </Option>
                           <Option type="Map" name="Rotation">
-                            <Option type="bool" value="false" name="active"/>
-                            <Option type="QString" value="rotation" name="field"/>
-                            <Option type="int" value="2" name="type"/>
+                            <Option type="bool" name="active" value="false"/>
+                            <Option type="QString" name="field" value="rotation"/>
+                            <Option type="int" name="type" value="2"/>
                           </Option>
                         </Option>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </dd_properties>
                   </settings>
                 </rule>
-                <rule key="{63d03041-a1e4-4dad-ab41-9339e48044c5}" description="5KM" filter="&quot;Source&quot; = '5KM'">
+                <rule key="{63d03041-a1e4-4dad-ab41-9339e48044c5}" filter="&quot;Source&quot; = '5KM'" description="5KM">
                   <settings>
-                    <text-style fontItalic="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" blendMode="0" fontWeight="63" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="7" multilineHeight="1" textOpacity="1" fontSizeUnit="Point" textColor="255,255,255,255" namedStyle="Semibold" fontFamily="Myriad Pro" isExpression="1">
-                      <text-buffer bufferOpacity="1" bufferJoinStyle="64" bufferSize="1" bufferNoFill="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255"/>
-                      <background shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeType="0" shapeRadiiY="0.1" shapeBlendMode="0" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="128" shapeFillColor="145,211,55,255" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeBorderWidth="1" shapeOffsetY="0" shapeRadiiX="1" shapeSizeX="0.5" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-                      <shadow shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowScale="100" shadowRadius="1.5" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+                    <text-style fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" fontSizeUnit="Point" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" multilineHeight="1" fontUnderline="0" fontWordSpacing="0" useSubstitutions="0" fontItalic="0" fontSize="7" textColor="255,255,255,255" fontCapitals="0" isExpression="1" textOpacity="1" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" blendMode="0">
+                      <text-buffer bufferOpacity="1" bufferSize="1" bufferSizeUnits="MM" bufferDraw="0" bufferNoFill="0" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferBlendMode="0"/>
+                      <background shapeSizeType="0" shapeOffsetY="0" shapeFillColor="145,211,55,255" shapeSizeUnit="MM" shapeSizeX="0.5" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0.1" shapeType="0" shapeDraw="1" shapeBorderColor="145,211,55,255" shapeOpacity="1" shapeRadiiUnit="MM" shapeBorderWidth="1" shapeOffsetX="0" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeRotationType="0" shapeSizeY="0" shapeBlendMode="0" shapeJoinStyle="128" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+                      <shadow shadowUnder="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowBlendMode="6" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowDraw="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowScale="100"/>
                       <substitutions/>
                     </text-style>
-                    <text-format rightDirectionSymbol=">" wrapChar="" decimals="0" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="3" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-                    <placement quadOffset="4" preserveRotation="1" geometryGenerator="" placement="6" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" priority="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-20" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" offsetUnits="MapUnit" placementFlags="10" geometryGeneratorEnabled="0" dist="2" offsetType="0"/>
-                    <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="1" fontLimitPixelSize="0" displayAll="1" obstacleFactor="2" obstacle="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="0" maxNumLabels="2000" scaleMax="10000000"/>
+                    <text-format wrapChar="" placeDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" leftDirectionSymbol="&lt;" formatNumbers="0" plussign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0" decimals="0" addDirectionSymbol="0"/>
+                    <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" fitInPolygonOnly="0" quadOffset="4" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" yOffset="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" priority="10" placement="6" maxCurvedCharAngleOut="-20" repeatDistanceUnits="MM" dist="2" geometryGeneratorType="PointGeometry" rotationAngle="0" centroidInside="0" placementFlags="10" geometryGeneratorEnabled="0" geometryGenerator="" repeatDistance="0" distUnits="MM" preserveRotation="1" offsetType="0" centroidWhole="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                    <rendering obstacleType="0" zIndex="0" drawLabels="1" fontMaxPixelSize="10000" scaleMin="1" scaleMax="10000000" obstacleFactor="2" fontMinPixelSize="3" labelPerPart="0" displayAll="1" maxNumLabels="2000" limitNumLabels="0" mergeLines="0" fontLimitPixelSize="0" minFeatureSize="0" scaleVisibility="0" upsidedownLabels="0" obstacle="1"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option type="Map" name="properties">
                           <Option type="Map" name="PositionX">
-                            <Option type="bool" value="false" name="active"/>
-                            <Option type="int" value="1" name="type"/>
-                            <Option type="QString" value="" name="val"/>
+                            <Option type="bool" name="active" value="false"/>
+                            <Option type="int" name="type" value="1"/>
+                            <Option type="QString" name="val" value=""/>
                           </Option>
                           <Option type="Map" name="PositionY">
-                            <Option type="bool" value="false" name="active"/>
-                            <Option type="int" value="1" name="type"/>
-                            <Option type="QString" value="" name="val"/>
+                            <Option type="bool" name="active" value="false"/>
+                            <Option type="int" name="type" value="1"/>
+                            <Option type="QString" name="val" value=""/>
                           </Option>
                           <Option type="Map" name="PredefinedPositionOrder">
-                            <Option type="bool" value="true" name="active"/>
-                            <Option type="QString" value="quadrant" name="field"/>
-                            <Option type="int" value="2" name="type"/>
+                            <Option type="bool" name="active" value="true"/>
+                            <Option type="QString" name="field" value="quadrant"/>
+                            <Option type="int" name="type" value="2"/>
                           </Option>
                           <Option type="Map" name="Rotation">
-                            <Option type="bool" value="false" name="active"/>
-                            <Option type="QString" value="rotation" name="field"/>
-                            <Option type="int" value="2" name="type"/>
+                            <Option type="bool" name="active" value="false"/>
+                            <Option type="QString" name="field" value="rotation"/>
+                            <Option type="int" name="type" value="2"/>
                           </Option>
                         </Option>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </dd_properties>
                   </settings>
@@ -9215,21 +9547,21 @@ def my_form_open(dialog, layer, feature):
             <featureBlendMode>0</featureBlendMode>
             <layerOpacity>1</layerOpacity>
             <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-              <DiagramCategory sizeType="MM" opacity="1" backgroundColor="#ffffff" backgroundAlpha="255" labelPlacementMethod="XHeight" lineSizeType="MM" minimumSize="0" diagramOrientation="Up" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" barWidth="5" sizeScale="3x:0,0,0,0,0,0" penWidth="0" penColor="#000000" width="15" scaleDependency="Area" minScaleDenominator="100000" height="15" scaleBasedVisibility="0" rotationOffset="270" enabled="0">
-                <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-                <attribute label="" field="" color="#000000"/>
+              <DiagramCategory maxScaleDenominator="1e+08" minScaleDenominator="100000" backgroundAlpha="255" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" scaleBasedVisibility="0" lineSizeType="MM" opacity="1" diagramOrientation="Up" width="15" rotationOffset="270" scaleDependency="Area" barWidth="5" labelPlacementMethod="XHeight" penColor="#000000" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" penWidth="0" enabled="0" height="15">
+                <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+                <attribute field="" color="#000000" label=""/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings priority="0" dist="0" placement="0" zIndex="0" obstacle="0" linePlacementFlags="2" showAll="1">
+            <DiagramLayerSettings priority="0" zIndex="0" dist="0" showAll="1" placement="0" linePlacementFlags="2" obstacle="0">
               <properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </properties>
             </DiagramLayerSettings>
-            <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+            <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
               <activeChecks/>
               <checkConfiguration/>
             </geometryOptions>
@@ -9238,8 +9570,8 @@ def my_form_open(dialog, layer, feature):
                 <editWidget type="TextEdit">
                   <config>
                     <Option type="Map">
-                      <Option type="QString" value="0" name="IsMultiline"/>
-                      <Option type="QString" value="0" name="UseHtml"/>
+                      <Option type="QString" name="IsMultiline" value="0"/>
+                      <Option type="QString" name="UseHtml" value="0"/>
                     </Option>
                   </config>
                 </editWidget>
@@ -9248,8 +9580,8 @@ def my_form_open(dialog, layer, feature):
                 <editWidget type="TextEdit">
                   <config>
                     <Option type="Map">
-                      <Option type="QString" value="0" name="IsMultiline"/>
-                      <Option type="QString" value="0" name="UseHtml"/>
+                      <Option type="QString" name="IsMultiline" value="0"/>
+                      <Option type="QString" name="UseHtml" value="0"/>
                     </Option>
                   </config>
                 </editWidget>
@@ -9258,8 +9590,8 @@ def my_form_open(dialog, layer, feature):
                 <editWidget type="TextEdit">
                   <config>
                     <Option type="Map">
-                      <Option type="QString" value="0" name="IsMultiline"/>
-                      <Option type="QString" value="0" name="UseHtml"/>
+                      <Option type="QString" name="IsMultiline" value="0"/>
+                      <Option type="QString" name="UseHtml" value="0"/>
                     </Option>
                   </config>
                 </editWidget>
@@ -9268,8 +9600,8 @@ def my_form_open(dialog, layer, feature):
                 <editWidget type="TextEdit">
                   <config>
                     <Option type="Map">
-                      <Option type="QString" value="0" name="IsMultiline"/>
-                      <Option type="QString" value="0" name="UseHtml"/>
+                      <Option type="QString" name="IsMultiline" value="0"/>
+                      <Option type="QString" name="UseHtml" value="0"/>
                     </Option>
                   </config>
                 </editWidget>
@@ -9278,8 +9610,8 @@ def my_form_open(dialog, layer, feature):
                 <editWidget type="TextEdit">
                   <config>
                     <Option type="Map">
-                      <Option type="QString" value="0" name="IsMultiline"/>
-                      <Option type="QString" value="0" name="UseHtml"/>
+                      <Option type="QString" name="IsMultiline" value="0"/>
+                      <Option type="QString" name="UseHtml" value="0"/>
                     </Option>
                   </config>
                 </editWidget>
@@ -9288,8 +9620,8 @@ def my_form_open(dialog, layer, feature):
                 <editWidget type="TextEdit">
                   <config>
                     <Option type="Map">
-                      <Option type="QString" value="0" name="IsMultiline"/>
-                      <Option type="QString" value="0" name="UseHtml"/>
+                      <Option type="QString" name="IsMultiline" value="0"/>
+                      <Option type="QString" name="UseHtml" value="0"/>
                     </Option>
                   </config>
                 </editWidget>
@@ -9298,8 +9630,8 @@ def my_form_open(dialog, layer, feature):
                 <editWidget type="TextEdit">
                   <config>
                     <Option type="Map">
-                      <Option type="QString" value="0" name="IsMultiline"/>
-                      <Option type="QString" value="0" name="UseHtml"/>
+                      <Option type="QString" name="IsMultiline" value="0"/>
+                      <Option type="QString" name="UseHtml" value="0"/>
                     </Option>
                   </config>
                 </editWidget>
@@ -9308,8 +9640,8 @@ def my_form_open(dialog, layer, feature):
                 <editWidget type="TextEdit">
                   <config>
                     <Option type="Map">
-                      <Option type="QString" value="0" name="IsMultiline"/>
-                      <Option type="QString" value="0" name="UseHtml"/>
+                      <Option type="QString" name="IsMultiline" value="0"/>
+                      <Option type="QString" name="UseHtml" value="0"/>
                     </Option>
                   </config>
                 </editWidget>
@@ -9318,8 +9650,8 @@ def my_form_open(dialog, layer, feature):
                 <editWidget type="TextEdit">
                   <config>
                     <Option type="Map">
-                      <Option type="QString" value="0" name="IsMultiline"/>
-                      <Option type="QString" value="0" name="UseHtml"/>
+                      <Option type="QString" name="IsMultiline" value="0"/>
+                      <Option type="QString" name="UseHtml" value="0"/>
                     </Option>
                   </config>
                 </editWidget>
@@ -9328,8 +9660,8 @@ def my_form_open(dialog, layer, feature):
                 <editWidget type="TextEdit">
                   <config>
                     <Option type="Map">
-                      <Option type="QString" value="0" name="IsMultiline"/>
-                      <Option type="QString" value="0" name="UseHtml"/>
+                      <Option type="QString" name="IsMultiline" value="0"/>
+                      <Option type="QString" name="UseHtml" value="0"/>
                     </Option>
                   </config>
                 </editWidget>
@@ -9338,8 +9670,8 @@ def my_form_open(dialog, layer, feature):
                 <editWidget type="TextEdit">
                   <config>
                     <Option type="Map">
-                      <Option type="QString" value="0" name="IsMultiline"/>
-                      <Option type="QString" value="0" name="UseHtml"/>
+                      <Option type="QString" name="IsMultiline" value="0"/>
+                      <Option type="QString" name="UseHtml" value="0"/>
                     </Option>
                   </config>
                 </editWidget>
@@ -9348,8 +9680,8 @@ def my_form_open(dialog, layer, feature):
                 <editWidget type="TextEdit">
                   <config>
                     <Option type="Map">
-                      <Option type="QString" value="0" name="IsMultiline"/>
-                      <Option type="QString" value="0" name="UseHtml"/>
+                      <Option type="QString" name="IsMultiline" value="0"/>
+                      <Option type="QString" name="UseHtml" value="0"/>
                     </Option>
                   </config>
                 </editWidget>
@@ -9386,52 +9718,52 @@ def my_form_open(dialog, layer, feature):
               <default field="distance" expression="" applyOnUpdate="0"/>
             </defaults>
             <constraints>
-              <constraint field="Name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="descriptio" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="timestamp" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="begin" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="end" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="Distance" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="RouteLen" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="Source" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="length_m" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="length_km" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="org_fid" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="distance" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+              <constraint exp_strength="0" field="Name" notnull_strength="0" constraints="0" unique_strength="0"/>
+              <constraint exp_strength="0" field="descriptio" notnull_strength="0" constraints="0" unique_strength="0"/>
+              <constraint exp_strength="0" field="timestamp" notnull_strength="0" constraints="0" unique_strength="0"/>
+              <constraint exp_strength="0" field="begin" notnull_strength="0" constraints="0" unique_strength="0"/>
+              <constraint exp_strength="0" field="end" notnull_strength="0" constraints="0" unique_strength="0"/>
+              <constraint exp_strength="0" field="Distance" notnull_strength="0" constraints="0" unique_strength="0"/>
+              <constraint exp_strength="0" field="RouteLen" notnull_strength="0" constraints="0" unique_strength="0"/>
+              <constraint exp_strength="0" field="Source" notnull_strength="0" constraints="0" unique_strength="0"/>
+              <constraint exp_strength="0" field="length_m" notnull_strength="0" constraints="0" unique_strength="0"/>
+              <constraint exp_strength="0" field="length_km" notnull_strength="0" constraints="0" unique_strength="0"/>
+              <constraint exp_strength="0" field="org_fid" notnull_strength="0" constraints="0" unique_strength="0"/>
+              <constraint exp_strength="0" field="distance" notnull_strength="0" constraints="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 field="Name" desc="" exp=""/>
+              <constraint field="descriptio" desc="" exp=""/>
+              <constraint field="timestamp" desc="" exp=""/>
+              <constraint field="begin" desc="" exp=""/>
+              <constraint field="end" desc="" exp=""/>
+              <constraint field="Distance" desc="" exp=""/>
+              <constraint field="RouteLen" desc="" exp=""/>
+              <constraint field="Source" desc="" exp=""/>
+              <constraint field="length_m" desc="" exp=""/>
+              <constraint field="length_km" desc="" exp=""/>
+              <constraint field="org_fid" desc="" exp=""/>
+              <constraint field="distance" desc="" exp=""/>
             </constraintExpressions>
             <expressionfields/>
             <attributeactions>
               <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
             </attributeactions>
-            <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;distance&quot;" sortOrder="1">
+            <attributetableconfig sortExpression="&quot;distance&quot;" sortOrder="1" actionWidgetStyle="dropDown">
               <columns>
-                <column hidden="1" type="actions" width="-1"/>
-                <column hidden="0" type="field" width="-1" name="org_fid"/>
-                <column hidden="0" type="field" width="-1" name="distance"/>
-                <column hidden="0" type="field" width="-1" name="Name"/>
-                <column hidden="0" type="field" width="-1" name="Source"/>
-                <column hidden="0" type="field" width="-1" name="RouteLen"/>
-                <column hidden="0" type="field" width="-1" name="descriptio"/>
-                <column hidden="0" type="field" width="-1" name="timestamp"/>
-                <column hidden="0" type="field" width="-1" name="begin"/>
-                <column hidden="0" type="field" width="-1" name="end"/>
-                <column hidden="0" type="field" width="-1" name="Distance"/>
-                <column hidden="0" type="field" width="-1" name="length_km"/>
-                <column hidden="0" type="field" width="-1" name="length_m"/>
+                <column width="-1" type="actions" hidden="1"/>
+                <column width="-1" type="field" name="org_fid" hidden="0"/>
+                <column width="-1" type="field" name="distance" hidden="0"/>
+                <column width="-1" type="field" name="Name" hidden="0"/>
+                <column width="-1" type="field" name="Source" hidden="0"/>
+                <column width="-1" type="field" name="RouteLen" hidden="0"/>
+                <column width="-1" type="field" name="descriptio" hidden="0"/>
+                <column width="-1" type="field" name="timestamp" hidden="0"/>
+                <column width="-1" type="field" name="begin" hidden="0"/>
+                <column width="-1" type="field" name="end" hidden="0"/>
+                <column width="-1" type="field" name="Distance" hidden="0"/>
+                <column width="-1" type="field" name="length_km" hidden="0"/>
+                <column width="-1" type="field" name="length_m" hidden="0"/>
               </columns>
             </attributetableconfig>
             <conditionalstyles>
@@ -9462,19 +9794,19 @@ def my_form_open(dialog, layer, feature):
             <featformsuppress>0</featformsuppress>
             <editorlayout>generatedlayout</editorlayout>
             <editable>
-              <field editable="1" name="Distance"/>
-              <field editable="1" name="Name"/>
-              <field editable="1" name="RouteLen"/>
-              <field editable="1" name="Source"/>
-              <field editable="1" name="begin"/>
-              <field editable="1" name="descriptio"/>
-              <field editable="1" name="distance"/>
-              <field editable="1" name="end"/>
-              <field editable="1" name="length_km"/>
-              <field editable="1" name="length_m"/>
-              <field editable="1" name="org_fid"/>
-              <field editable="1" name="quadrant"/>
-              <field editable="1" name="timestamp"/>
+              <field name="Distance" editable="1"/>
+              <field name="Name" editable="1"/>
+              <field name="RouteLen" editable="1"/>
+              <field name="Source" editable="1"/>
+              <field name="begin" editable="1"/>
+              <field name="descriptio" editable="1"/>
+              <field name="distance" editable="1"/>
+              <field name="end" editable="1"/>
+              <field name="length_km" editable="1"/>
+              <field name="length_m" editable="1"/>
+              <field name="org_fid" editable="1"/>
+              <field name="quadrant" editable="1"/>
+              <field name="timestamp" editable="1"/>
             </editable>
             <labelOnTop>
               <field labelOnTop="0" name="Distance"/>
@@ -9507,177 +9839,177 @@ def my_form_open(dialog, layer, feature):
       <renderer-v2 type="nullSymbol"/>
       <labeling type="rule-based">
         <rules key="{3608a1f2-7607-4dc9-9391-a582d9904577}">
-          <rule description="Active routes" key="{6c8d4bc9-8e1a-4cc3-a813-97e2b0ad71f6}" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
+          <rule key="{6c8d4bc9-8e1a-4cc3-a813-97e2b0ad71f6}" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="Active routes">
             <settings>
-              <text-style fontItalic="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="63" blendMode="0" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="10" multilineHeight="1" textOpacity="1" fontSizeUnit="Point" textColor="255,255,255,255" namedStyle="Semibold" fontFamily="Myriad Pro" isExpression="1">
-                <text-buffer bufferOpacity="1" bufferJoinStyle="64" bufferSize="1" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255"/>
-                <background shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeType="0" shapeRadiiY="1" shapeBlendMode="0" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="0,0,0,255" shapeJoinStyle="128" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="1" shapeRadiiX="1" shapeSizeX="1" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-                <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+              <text-style fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" fontSizeUnit="Point" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" multilineHeight="1" fontUnderline="0" fontWordSpacing="0" useSubstitutions="0" fontItalic="0" fontSize="10" textColor="255,255,255,255" fontCapitals="0" isExpression="1" textOpacity="1" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" blendMode="0">
+                <text-buffer bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0"/>
+                <background shapeSizeType="0" shapeOffsetY="0" shapeFillColor="0,0,0,255" shapeSizeUnit="MM" shapeSizeX="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeType="0" shapeDraw="1" shapeBorderColor="0,0,0,255" shapeOpacity="1" shapeRadiiUnit="MM" shapeBorderWidth="1" shapeOffsetX="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeBlendMode="0" shapeJoinStyle="128" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowUnder="0" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowDraw="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowScale="100"/>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" wrapChar="" placeDirectionSymbol="0" decimals="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="3" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-              <placement quadOffset="3" preserveRotation="1" geometryGenerator="" placement="6" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" priority="10" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-20" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" offsetUnits="MapUnit" placementFlags="10" geometryGeneratorEnabled="0" dist="2" offsetType="0"/>
-              <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="1" fontLimitPixelSize="0" displayAll="1" obstacleFactor="2" obstacle="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="0" maxNumLabels="2000" scaleMax="10000000"/>
+              <text-format wrapChar="" multilineAlign="3" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0" plussign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0" decimals="0" addDirectionSymbol="0"/>
+              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" fitInPolygonOnly="0" quadOffset="3" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" yOffset="0" maxCurvedCharAngleIn="20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" priority="10" maxCurvedCharAngleOut="-20" dist="2" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" rotationAngle="0" centroidInside="0" placementFlags="10" geometryGeneratorEnabled="0" geometryGenerator="" repeatDistance="0" distUnits="MM" preserveRotation="1" offsetType="0" centroidWhole="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering obstacleType="0" zIndex="0" drawLabels="1" fontMaxPixelSize="10000" scaleMin="1" scaleMax="10000000" obstacleFactor="2" fontMinPixelSize="3" labelPerPart="0" displayAll="1" maxNumLabels="2000" limitNumLabels="0" mergeLines="0" fontLimitPixelSize="0" minFeatureSize="0" scaleVisibility="0" upsidedownLabels="0" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="PositionX">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                     <Option type="Map" name="PredefinedPositionOrder">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="quadrant" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="quadrant"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                     <Option type="Map" name="Rotation">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="rotation" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="field" value="rotation"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                     <Option type="Map" name="ShapeBorderColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </settings>
           </rule>
-          <rule active="0" description="List for legends" key="{762f5e6f-d30c-4752-b4fa-0f22ed862707}" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
-            <rule active="0" description="21KM" key="{cf2c18af-091f-4ce5-8f44-46bd4999f2ba}" filter="&quot;Source&quot; = '21KM'">
+          <rule key="{762f5e6f-d30c-4752-b4fa-0f22ed862707}" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" active="0" description="List for legends">
+            <rule key="{cf2c18af-091f-4ce5-8f44-46bd4999f2ba}" filter="&quot;Source&quot; = '21KM'" active="0" description="21KM">
               <settings>
-                <text-style fontItalic="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="63" blendMode="0" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="10" multilineHeight="1" textOpacity="1" fontSizeUnit="Point" textColor="255,255,255,255" namedStyle="Semibold" fontFamily="Myriad Pro" isExpression="1">
-                  <text-buffer bufferOpacity="1" bufferJoinStyle="64" bufferSize="1" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255"/>
-                  <background shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeType="0" shapeRadiiY="1" shapeBlendMode="0" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="210,32,39,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="210,32,39,255" shapeJoinStyle="128" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="1" shapeRadiiX="1" shapeSizeX="1" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-                  <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+                <text-style fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" fontSizeUnit="Point" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" multilineHeight="1" fontUnderline="0" fontWordSpacing="0" useSubstitutions="0" fontItalic="0" fontSize="10" textColor="255,255,255,255" fontCapitals="0" isExpression="1" textOpacity="1" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" blendMode="0">
+                  <text-buffer bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0"/>
+                  <background shapeSizeType="0" shapeOffsetY="0" shapeFillColor="210,32,39,255" shapeSizeUnit="MM" shapeSizeX="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeType="0" shapeDraw="1" shapeBorderColor="210,32,39,255" shapeOpacity="1" shapeRadiiUnit="MM" shapeBorderWidth="1" shapeOffsetX="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeBlendMode="0" shapeJoinStyle="128" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <shadow shadowUnder="0" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowDraw="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowScale="100"/>
                   <substitutions/>
                 </text-style>
-                <text-format rightDirectionSymbol=">" wrapChar="" placeDirectionSymbol="0" decimals="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="3" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-                <placement quadOffset="3" preserveRotation="1" geometryGenerator="" placement="6" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" priority="10" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-20" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" offsetUnits="MapUnit" placementFlags="10" geometryGeneratorEnabled="0" dist="2" offsetType="0"/>
-                <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="1" fontLimitPixelSize="0" displayAll="1" obstacleFactor="2" obstacle="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="0" maxNumLabels="2000" scaleMax="10000000"/>
+                <text-format wrapChar="" multilineAlign="3" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0" plussign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0" decimals="0" addDirectionSymbol="0"/>
+                <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" fitInPolygonOnly="0" quadOffset="3" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" yOffset="0" maxCurvedCharAngleIn="20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" priority="10" maxCurvedCharAngleOut="-20" dist="2" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" rotationAngle="0" centroidInside="0" placementFlags="10" geometryGeneratorEnabled="0" geometryGenerator="" repeatDistance="0" distUnits="MM" preserveRotation="1" offsetType="0" centroidWhole="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <rendering obstacleType="0" zIndex="0" drawLabels="1" fontMaxPixelSize="10000" scaleMin="1" scaleMax="10000000" obstacleFactor="2" fontMinPixelSize="3" labelPerPart="0" displayAll="1" maxNumLabels="2000" limitNumLabels="0" mergeLines="0" fontLimitPixelSize="0" minFeatureSize="0" scaleVisibility="0" upsidedownLabels="0" obstacle="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="PositionX">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="int" value="1" name="type"/>
-                        <Option type="QString" value="" name="val"/>
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="int" value="1" name="type"/>
-                        <Option type="QString" value="" name="val"/>
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
                       <Option type="Map" name="PredefinedPositionOrder">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="quadrant" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="quadrant"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                       <Option type="Map" name="Rotation">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="QString" value="rotation" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="QString" name="field" value="rotation"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
               </settings>
             </rule>
-            <rule active="0" description="10KM" key="{85ac541e-ff73-4c62-9c9c-f90872839ec6}" filter="&quot;Source&quot; = '10KM'">
+            <rule key="{85ac541e-ff73-4c62-9c9c-f90872839ec6}" filter="&quot;Source&quot; = '10KM'" active="0" description="10KM">
               <settings>
-                <text-style fontItalic="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="63" blendMode="0" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="10" multilineHeight="1" textOpacity="1" fontSizeUnit="Point" textColor="255,255,255,255" namedStyle="Semibold" fontFamily="Myriad Pro" isExpression="1">
-                  <text-buffer bufferOpacity="1" bufferJoinStyle="64" bufferSize="1" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255"/>
-                  <background shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeType="0" shapeRadiiY="1" shapeBlendMode="0" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="103,34,144,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="103,34,144,255" shapeJoinStyle="128" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="1" shapeRadiiX="1" shapeSizeX="1" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-                  <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+                <text-style fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" fontSizeUnit="Point" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" multilineHeight="1" fontUnderline="0" fontWordSpacing="0" useSubstitutions="0" fontItalic="0" fontSize="10" textColor="255,255,255,255" fontCapitals="0" isExpression="1" textOpacity="1" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" blendMode="0">
+                  <text-buffer bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0"/>
+                  <background shapeSizeType="0" shapeOffsetY="0" shapeFillColor="103,34,144,255" shapeSizeUnit="MM" shapeSizeX="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeType="0" shapeDraw="1" shapeBorderColor="103,34,144,255" shapeOpacity="1" shapeRadiiUnit="MM" shapeBorderWidth="1" shapeOffsetX="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeBlendMode="0" shapeJoinStyle="128" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <shadow shadowUnder="0" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowDraw="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowScale="100"/>
                   <substitutions/>
                 </text-style>
-                <text-format rightDirectionSymbol=">" wrapChar="" placeDirectionSymbol="0" decimals="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="3" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-                <placement quadOffset="4" preserveRotation="1" geometryGenerator="" placement="6" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" priority="10" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-20" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" offsetUnits="MapUnit" placementFlags="10" geometryGeneratorEnabled="0" dist="2" offsetType="0"/>
-                <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="1" fontLimitPixelSize="0" displayAll="1" obstacleFactor="2" obstacle="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="0" maxNumLabels="2000" scaleMax="10000000"/>
+                <text-format wrapChar="" multilineAlign="3" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0" plussign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0" decimals="0" addDirectionSymbol="0"/>
+                <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" fitInPolygonOnly="0" quadOffset="4" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" yOffset="0" maxCurvedCharAngleIn="20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" priority="10" maxCurvedCharAngleOut="-20" dist="2" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" rotationAngle="0" centroidInside="0" placementFlags="10" geometryGeneratorEnabled="0" geometryGenerator="" repeatDistance="0" distUnits="MM" preserveRotation="1" offsetType="0" centroidWhole="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <rendering obstacleType="0" zIndex="0" drawLabels="1" fontMaxPixelSize="10000" scaleMin="1" scaleMax="10000000" obstacleFactor="2" fontMinPixelSize="3" labelPerPart="0" displayAll="1" maxNumLabels="2000" limitNumLabels="0" mergeLines="0" fontLimitPixelSize="0" minFeatureSize="0" scaleVisibility="0" upsidedownLabels="0" obstacle="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="PositionX">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="int" value="1" name="type"/>
-                        <Option type="QString" value="" name="val"/>
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="int" value="1" name="type"/>
-                        <Option type="QString" value="" name="val"/>
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
                       <Option type="Map" name="PredefinedPositionOrder">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="quadrant" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="quadrant"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                       <Option type="Map" name="Rotation">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="QString" value="rotation" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="QString" name="field" value="rotation"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
               </settings>
             </rule>
-            <rule active="0" description="5KM" key="{648c7f2c-5087-45fa-b34c-09d50a7ddedb}" filter="&quot;Source&quot; = '5KM'">
+            <rule key="{648c7f2c-5087-45fa-b34c-09d50a7ddedb}" filter="&quot;Source&quot; = '5KM'" active="0" description="5KM">
               <settings>
-                <text-style fontItalic="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="63" blendMode="0" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="10" multilineHeight="1" textOpacity="1" fontSizeUnit="Point" textColor="255,255,255,255" namedStyle="Semibold" fontFamily="Myriad Pro" isExpression="1">
-                  <text-buffer bufferOpacity="1" bufferJoinStyle="64" bufferSize="1" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255"/>
-                  <background shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeType="0" shapeRadiiY="1" shapeBlendMode="0" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="145,211,55,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="145,211,55,255" shapeJoinStyle="128" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="1" shapeRadiiX="1" shapeSizeX="1" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-                  <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+                <text-style fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" fontSizeUnit="Point" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" multilineHeight="1" fontUnderline="0" fontWordSpacing="0" useSubstitutions="0" fontItalic="0" fontSize="10" textColor="255,255,255,255" fontCapitals="0" isExpression="1" textOpacity="1" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" blendMode="0">
+                  <text-buffer bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0"/>
+                  <background shapeSizeType="0" shapeOffsetY="0" shapeFillColor="145,211,55,255" shapeSizeUnit="MM" shapeSizeX="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeType="0" shapeDraw="1" shapeBorderColor="145,211,55,255" shapeOpacity="1" shapeRadiiUnit="MM" shapeBorderWidth="1" shapeOffsetX="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeBlendMode="0" shapeJoinStyle="128" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <shadow shadowUnder="0" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowDraw="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowScale="100"/>
                   <substitutions/>
                 </text-style>
-                <text-format rightDirectionSymbol=">" wrapChar="" placeDirectionSymbol="0" decimals="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="3" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-                <placement quadOffset="4" preserveRotation="1" geometryGenerator="" placement="6" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" priority="10" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-20" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" offsetUnits="MapUnit" placementFlags="10" geometryGeneratorEnabled="0" dist="2" offsetType="0"/>
-                <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="1" fontLimitPixelSize="0" displayAll="1" obstacleFactor="2" obstacle="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="0" maxNumLabels="2000" scaleMax="10000000"/>
+                <text-format wrapChar="" multilineAlign="3" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0" plussign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0" decimals="0" addDirectionSymbol="0"/>
+                <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" fitInPolygonOnly="0" quadOffset="4" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" yOffset="0" maxCurvedCharAngleIn="20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" priority="10" maxCurvedCharAngleOut="-20" dist="2" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" rotationAngle="0" centroidInside="0" placementFlags="10" geometryGeneratorEnabled="0" geometryGenerator="" repeatDistance="0" distUnits="MM" preserveRotation="1" offsetType="0" centroidWhole="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <rendering obstacleType="0" zIndex="0" drawLabels="1" fontMaxPixelSize="10000" scaleMin="1" scaleMax="10000000" obstacleFactor="2" fontMinPixelSize="3" labelPerPart="0" displayAll="1" maxNumLabels="2000" limitNumLabels="0" mergeLines="0" fontLimitPixelSize="0" minFeatureSize="0" scaleVisibility="0" upsidedownLabels="0" obstacle="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="PositionX">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="int" value="1" name="type"/>
-                        <Option type="QString" value="" name="val"/>
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="int" value="1" name="type"/>
-                        <Option type="QString" value="" name="val"/>
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
                       <Option type="Map" name="PredefinedPositionOrder">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="quadrant" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="quadrant"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                       <Option type="Map" name="Rotation">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="QString" value="rotation" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="QString" name="field" value="rotation"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
               </settings>
@@ -9695,21 +10027,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundColor="#ffffff" backgroundAlpha="255" labelPlacementMethod="XHeight" lineSizeType="MM" minimumSize="0" diagramOrientation="Up" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" barWidth="5" penWidth="0" penColor="#000000" width="15" scaleDependency="Area" minScaleDenominator="100000" height="15" scaleBasedVisibility="0" rotationOffset="270" enabled="0">
+        <DiagramCategory maxScaleDenominator="1e+08" minScaleDenominator="100000" backgroundAlpha="255" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" scaleBasedVisibility="0" lineSizeType="MM" opacity="1" diagramOrientation="Up" width="15" rotationOffset="270" scaleDependency="Area" barWidth="5" labelPlacementMethod="XHeight" penColor="#000000" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" enabled="0" penWidth="0" height="15">
           <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" color="#000000"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="0" zIndex="0" obstacle="0" linePlacementFlags="2" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" placement="0" dist="0" showAll="1" linePlacementFlags="2" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -9718,8 +10050,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -9728,8 +10060,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -9738,8 +10070,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -9748,8 +10080,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -9758,8 +10090,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -9768,8 +10100,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -9778,8 +10110,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -9788,8 +10120,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -9798,8 +10130,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -9808,8 +10140,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -9818,8 +10150,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -9828,8 +10160,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -9866,52 +10198,52 @@ def my_form_open(dialog, layer, feature):
         <default field="distance" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="Name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="descriptio" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="timestamp" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="begin" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="end" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Distance" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="RouteLen" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Source" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="length_m" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="length_km" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="org_fid" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="distance" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint exp_strength="0" field="Name" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="descriptio" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="timestamp" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="begin" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="end" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="Distance" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="RouteLen" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="Source" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="length_m" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="length_km" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="org_fid" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="distance" notnull_strength="0" constraints="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 field="Name" desc="" exp=""/>
+        <constraint field="descriptio" desc="" exp=""/>
+        <constraint field="timestamp" desc="" exp=""/>
+        <constraint field="begin" desc="" exp=""/>
+        <constraint field="end" desc="" exp=""/>
+        <constraint field="Distance" desc="" exp=""/>
+        <constraint field="RouteLen" desc="" exp=""/>
+        <constraint field="Source" desc="" exp=""/>
+        <constraint field="length_m" desc="" exp=""/>
+        <constraint field="length_km" desc="" exp=""/>
+        <constraint field="org_fid" desc="" exp=""/>
+        <constraint field="distance" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;distance&quot;" sortOrder="1">
+      <attributetableconfig sortExpression="&quot;distance&quot;" sortOrder="1" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="org_fid"/>
-          <column hidden="0" type="field" width="-1" name="distance"/>
-          <column hidden="0" type="field" width="-1" name="Name"/>
-          <column hidden="0" type="field" width="-1" name="Source"/>
-          <column hidden="0" type="field" width="-1" name="RouteLen"/>
-          <column hidden="0" type="field" width="-1" name="descriptio"/>
-          <column hidden="0" type="field" width="-1" name="timestamp"/>
-          <column hidden="0" type="field" width="-1" name="begin"/>
-          <column hidden="0" type="field" width="-1" name="end"/>
-          <column hidden="0" type="field" width="-1" name="Distance"/>
-          <column hidden="0" type="field" width="-1" name="length_km"/>
-          <column hidden="0" type="field" width="-1" name="length_m"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column width="-1" type="field" name="org_fid" hidden="0"/>
+          <column width="-1" type="field" name="distance" hidden="0"/>
+          <column width="-1" type="field" name="Name" hidden="0"/>
+          <column width="-1" type="field" name="Source" hidden="0"/>
+          <column width="-1" type="field" name="RouteLen" hidden="0"/>
+          <column width="-1" type="field" name="descriptio" hidden="0"/>
+          <column width="-1" type="field" name="timestamp" hidden="0"/>
+          <column width="-1" type="field" name="begin" hidden="0"/>
+          <column width="-1" type="field" name="end" hidden="0"/>
+          <column width="-1" type="field" name="Distance" hidden="0"/>
+          <column width="-1" type="field" name="length_km" hidden="0"/>
+          <column width="-1" type="field" name="length_m" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9942,19 +10274,19 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Source"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="end"/>
-        <field editable="1" name="length_km"/>
-        <field editable="1" name="length_m"/>
-        <field editable="1" name="org_fid"/>
-        <field editable="1" name="quadrant"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="begin" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="distance" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="length_km" editable="1"/>
+        <field name="length_m" editable="1"/>
+        <field name="org_fid" editable="1"/>
+        <field name="quadrant" editable="1"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="Distance"/>
@@ -9975,7 +10307,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
       <mapTip>Text</mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="1" readOnly="0" simplifyAlgorithm="0" autoRefreshTime="0" geometry="Polygon" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" type="vector" simplifyLocal="1" refreshOnNotifyMessage="" minScale="1e+08" refreshOnNotifyEnabled="0" labelsEnabled="0" wkbType="MultiPolygon">
+    <maplayer refreshOnNotifyMessage="" readOnly="0" autoRefreshEnabled="0" simplifyDrawingHints="1" geometry="Polygon" labelsEnabled="0" wkbType="MultiPolygon" simplifyDrawingTol="1" simplifyAlgorithm="0" type="vector" autoRefreshTime="0" maxScale="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" minScale="1e+08" styleCategories="AllStyleCategories" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.40435736428151614</xmin>
         <ymin>-33.90613600950420903</ymin>
@@ -10019,7 +10351,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -10039,26 +10371,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" enableorderby="0" symbollevels="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol type="fill" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="114,155,111,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
+          <symbol alpha="1" force_rhr="0" type="fill" clip_to_extent="1" name="0">
+            <layer locked="0" enabled="1" pass="0" 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"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="35,35,35,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0.26"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10073,7 +10405,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 type="QString" value=""/>
         </activeChecks>
@@ -10115,25 +10447,25 @@ def my_form_open(dialog, layer, feature):
         <default field="rotation" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="area" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="rotation" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="area" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="rotation" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="area" exp="" desc=""/>
-        <constraint field="rotation" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="area" desc="" exp=""/>
+        <constraint field="rotation" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;rotation&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;rotation&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="0" type="field" width="-1" name="area"/>
-          <column hidden="0" type="field" width="-1" name="rotation"/>
-          <column hidden="1" type="actions" width="-1"/>
+          <column width="-1" type="field" name="id" hidden="0"/>
+          <column width="-1" type="field" name="area" hidden="0"/>
+          <column width="-1" type="field" name="rotation" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10153,7 +10485,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="0" readOnly="0" simplifyAlgorithm="0" autoRefreshTime="0" geometry="Point" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" type="vector" simplifyLocal="1" refreshOnNotifyMessage="" minScale="1e+08" refreshOnNotifyEnabled="0" labelsEnabled="0" wkbType="Point">
+    <maplayer refreshOnNotifyMessage="" readOnly="0" autoRefreshEnabled="0" simplifyDrawingHints="0" geometry="Point" labelsEnabled="0" wkbType="Point" simplifyDrawingTol="1" simplifyAlgorithm="0" type="vector" autoRefreshTime="0" maxScale="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" minScale="1e+08" styleCategories="AllStyleCategories" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37527697005977245</xmin>
         <ymin>-33.94584879231483399</ymin>
@@ -10206,11 +10538,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" miny="0" crs="" dimensions="2" maxy="0" maxz="0" maxx="0"/>
+          <spatial dimensions="2" miny="0" maxx="0" minz="0" minx="0" crs="" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -10234,47 +10566,47 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="RuleRenderer" enableorderby="0" symbollevels="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" enableorderby="0">
         <rules key="{01115dc1-cc6e-4980-a968-7ef94a3b9df6}">
-          <rule label="All distances" checkstate="0" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}" symbol="0"/>
+          <rule key="{e9652330-031e-4b93-b5b4-4caae12a21f9}" symbol="0" label="All distances" checkstate="0"/>
         </rules>
         <symbols>
-          <symbol type="marker" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer locked="1" class="SimpleMarker" enabled="1" pass="0">
-              <prop v="0" k="angle"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,0" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="0.5" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol alpha="1" force_rhr="0" type="marker" clip_to_extent="1" name="0">
+            <layer locked="1" enabled="1" pass="0" class="SimpleMarker">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="0,0,0,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="circle"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="35,35,35,0"/>
+              <prop k="outline_style" v="no"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="0.5"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="fillColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                     <Option type="Map" name="size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10298,21 +10630,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundColor="#ffffff" backgroundAlpha="255" labelPlacementMethod="XHeight" lineSizeType="MM" minimumSize="0" diagramOrientation="Up" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" barWidth="5" penWidth="0" penColor="#000000" width="15" scaleDependency="Area" minScaleDenominator="0" height="15" scaleBasedVisibility="0" rotationOffset="270" enabled="0">
+        <DiagramCategory maxScaleDenominator="1e+08" minScaleDenominator="0" backgroundAlpha="255" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" scaleBasedVisibility="0" lineSizeType="MM" opacity="1" diagramOrientation="Up" width="15" rotationOffset="270" scaleDependency="Area" barWidth="5" labelPlacementMethod="XHeight" penColor="#000000" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" enabled="0" penWidth="0" height="15">
           <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" color="#000000"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="0" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" placement="0" dist="0" showAll="1" linePlacementFlags="18" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -10342,8 +10674,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -10359,8 +10691,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -10369,8 +10701,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -10434,14 +10766,14 @@ def my_form_open(dialog, layer, feature):
         <alias field="last_runne" index="12" name=""/>
       </aliases>
       <excludeAttributesWMS>
-        <attribute>Source</attribute>
-        <attribute>begin</attribute>
         <attribute>RouteLen</attribute>
+        <attribute>begin</attribute>
+        <attribute>Source</attribute>
       </excludeAttributesWMS>
       <excludeAttributesWFS>
-        <attribute>Source</attribute>
-        <attribute>begin</attribute>
         <attribute>RouteLen</attribute>
+        <attribute>begin</attribute>
+        <attribute>Source</attribute>
       </excludeAttributesWFS>
       <defaults>
         <default field="Name" expression="" applyOnUpdate="0"/>
@@ -10459,55 +10791,55 @@ def my_form_open(dialog, layer, feature):
         <default field="last_runne" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="Name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="descriptio" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="timestamp" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="begin" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="end" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="RouteLen" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Source" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="length_m" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="length_km" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="org_fid" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="distance" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="first_runn" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="last_runne" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint exp_strength="0" field="Name" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="descriptio" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="timestamp" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="begin" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="end" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="RouteLen" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="Source" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="length_m" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="length_km" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="org_fid" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="distance" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="first_runn" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="last_runne" notnull_strength="0" constraints="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="RouteLen" exp="" desc=""/>
-        <constraint field="Source" exp="" desc=""/>
-        <constraint field="length_m" exp="" desc=""/>
-        <constraint field="length_km" exp="" desc=""/>
-        <constraint field="org_fid" exp="" desc=""/>
-        <constraint field="distance" exp="" desc=""/>
-        <constraint field="first_runn" exp="" desc=""/>
-        <constraint field="last_runne" exp="" desc=""/>
+        <constraint field="Name" desc="" exp=""/>
+        <constraint field="descriptio" desc="" exp=""/>
+        <constraint field="timestamp" desc="" exp=""/>
+        <constraint field="begin" desc="" exp=""/>
+        <constraint field="end" desc="" exp=""/>
+        <constraint field="RouteLen" desc="" exp=""/>
+        <constraint field="Source" desc="" exp=""/>
+        <constraint field="length_m" desc="" exp=""/>
+        <constraint field="length_km" desc="" exp=""/>
+        <constraint field="org_fid" desc="" exp=""/>
+        <constraint field="distance" desc="" exp=""/>
+        <constraint field="first_runn" desc="" exp=""/>
+        <constraint field="last_runne" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;first_runn&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;first_runn&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="179" name="begin"/>
-          <column hidden="0" type="field" width="-1" name="RouteLen"/>
-          <column hidden="0" type="field" width="-1" name="Source"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="Name"/>
-          <column hidden="0" type="field" width="-1" name="length_m"/>
-          <column hidden="0" type="field" width="-1" name="length_km"/>
-          <column hidden="0" type="field" width="-1" name="org_fid"/>
-          <column hidden="0" type="field" width="-1" name="first_runn"/>
-          <column hidden="0" type="field" width="-1" name="last_runne"/>
-          <column hidden="0" type="field" width="-1" name="descriptio"/>
-          <column hidden="0" type="field" width="-1" name="timestamp"/>
-          <column hidden="0" type="field" width="-1" name="end"/>
-          <column hidden="0" type="field" width="-1" name="distance"/>
+          <column width="179" type="field" name="begin" hidden="0"/>
+          <column width="-1" type="field" name="RouteLen" hidden="0"/>
+          <column width="-1" type="field" name="Source" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column width="-1" type="field" name="Name" hidden="0"/>
+          <column width="-1" type="field" name="length_m" hidden="0"/>
+          <column width="-1" type="field" name="length_km" hidden="0"/>
+          <column width="-1" type="field" name="org_fid" hidden="0"/>
+          <column width="-1" type="field" name="first_runn" hidden="0"/>
+          <column width="-1" type="field" name="last_runne" hidden="0"/>
+          <column width="-1" type="field" name="descriptio" hidden="0"/>
+          <column width="-1" type="field" name="timestamp" hidden="0"/>
+          <column width="-1" type="field" name="end" hidden="0"/>
+          <column width="-1" type="field" name="distance" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10538,31 +10870,31 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Source"/>
-        <field editable="0" name="auxiliary_storage_labeling_positionx"/>
-        <field editable="0" name="auxiliary_storage_labeling_positiony"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="display"/>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="distance_1"/>
-        <field editable="1" name="end"/>
-        <field editable="1" name="first_run"/>
-        <field editable="1" name="first_runn"/>
-        <field editable="1" name="first_runner"/>
-        <field editable="1" name="first_runner_s"/>
-        <field editable="0" name="last_run"/>
-        <field editable="1" name="last_runn"/>
-        <field editable="1" name="last_runne"/>
-        <field editable="1" name="last_runner"/>
-        <field editable="1" name="last_runner_s"/>
-        <field editable="1" name="length_km"/>
-        <field editable="1" name="length_m"/>
-        <field editable="1" name="org_fid"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="auxiliary_storage_labeling_positionx" editable="0"/>
+        <field name="auxiliary_storage_labeling_positiony" editable="0"/>
+        <field name="begin" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="display" editable="1"/>
+        <field name="distance" editable="1"/>
+        <field name="distance_1" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="first_run" editable="1"/>
+        <field name="first_runn" editable="1"/>
+        <field name="first_runner" editable="1"/>
+        <field name="first_runner_s" editable="1"/>
+        <field name="last_run" editable="0"/>
+        <field name="last_runn" editable="1"/>
+        <field name="last_runne" editable="1"/>
+        <field name="last_runner" editable="1"/>
+        <field name="last_runner_s" editable="1"/>
+        <field name="length_km" editable="1"/>
+        <field name="length_m" editable="1"/>
+        <field name="org_fid" editable="1"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="Distance"/>
@@ -10595,7 +10927,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="1" readOnly="0" simplifyAlgorithm="0" autoRefreshTime="0" geometry="Line" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" type="vector" simplifyLocal="1" refreshOnNotifyMessage="" minScale="1e+08" refreshOnNotifyEnabled="0" labelsEnabled="0" wkbType="MultiLineString">
+    <maplayer refreshOnNotifyMessage="" readOnly="0" autoRefreshEnabled="0" simplifyDrawingHints="1" geometry="Line" labelsEnabled="0" wkbType="MultiLineString" simplifyDrawingTol="1" simplifyAlgorithm="0" type="vector" autoRefreshTime="0" maxScale="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" minScale="1e+08" styleCategories="AllStyleCategories" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.40189262273444371</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -10639,7 +10971,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -10659,127 +10991,127 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="RuleRenderer" enableorderby="0" symbollevels="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" enableorderby="0">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule label="Car" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" symbol="0" filter="&quot;type&quot; IS 'car'"/>
-          <rule label="Walking" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" symbol="1" filter="&quot;type&quot; IS 'walk'"/>
+          <rule key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" symbol="0" filter="&quot;type&quot; IS 'car'" label="Car"/>
+          <rule key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" symbol="1" filter="&quot;type&quot; IS 'walk'" label="Walking"/>
         </rules>
         <symbols>
-          <symbol type="line" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="123,211,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="1" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol alpha="1" force_rhr="0" type="line" clip_to_extent="1" name="0">
+            <layer locked="0" enabled="1" pass="0" class="SimpleLine">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="123,211,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="1"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="1" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-              <prop v="flat" k="capstyle"/>
-              <prop v="4;1;1;1" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="103,34,144,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="1.25" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol alpha="1" force_rhr="0" type="line" clip_to_extent="1" name="1">
+            <layer locked="0" enabled="1" pass="0" class="SimpleLine">
+              <prop k="capstyle" v="flat"/>
+              <prop k="customdash" v="4;1;1;1"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="103,34,144,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="1.25"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="1"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="lastvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer locked="0" enabled="1" pass="0" 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"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="lastvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@1@1" clip_to_extent="1" force_rhr="0">
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="103,34,144,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="5" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol alpha="1" force_rhr="0" type="marker" clip_to_extent="1" name="@1@1">
+                <layer locked="0" enabled="1" pass="0" class="FilledMarker">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="103,34,144,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="5"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@1@1@0" clip_to_extent="1" force_rhr="0">
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="103,34,144,255" k="color"/>
-                      <prop v="miter" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="35,35,35,255" k="outline_color"/>
-                      <prop v="no" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol alpha="1" force_rhr="0" type="fill" clip_to_extent="1" name="@@1@1@0">
+                    <layer locked="0" enabled="1" pass="0" 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"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="35,35,35,255"/>
+                      <prop k="outline_style" v="no"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -10800,21 +11132,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundColor="#ffffff" backgroundAlpha="255" labelPlacementMethod="XHeight" lineSizeType="MM" minimumSize="0" diagramOrientation="Up" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" barWidth="5" penWidth="0" penColor="#000000" width="15" scaleDependency="Area" minScaleDenominator="0" height="15" scaleBasedVisibility="0" rotationOffset="270" enabled="0">
+        <DiagramCategory maxScaleDenominator="1e+08" minScaleDenominator="0" backgroundAlpha="255" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" scaleBasedVisibility="0" lineSizeType="MM" opacity="1" diagramOrientation="Up" width="15" rotationOffset="270" scaleDependency="Area" barWidth="5" labelPlacementMethod="XHeight" penColor="#000000" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" enabled="0" penWidth="0" height="15">
           <fontProperties description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0" style="0"/>
-          <attribute label="" field="" color="#000000"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="2" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" placement="2" dist="0" showAll="1" linePlacementFlags="18" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -10845,22 +11177,22 @@ def my_form_open(dialog, layer, feature):
         <default field="type" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="type"/>
+          <column width="-1" type="field" name="id" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column width="-1" type="field" name="type" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10891,8 +11223,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -10902,7 +11234,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="0" readOnly="0" simplifyAlgorithm="0" autoRefreshTime="0" geometry="Point" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" type="vector" simplifyLocal="1" refreshOnNotifyMessage="" minScale="1e+08" refreshOnNotifyEnabled="0" labelsEnabled="1" wkbType="Point">
+    <maplayer refreshOnNotifyMessage="" readOnly="0" autoRefreshEnabled="0" simplifyDrawingHints="0" geometry="Point" labelsEnabled="1" wkbType="Point" simplifyDrawingTol="1" simplifyAlgorithm="0" type="vector" autoRefreshTime="0" maxScale="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" minScale="1e+08" styleCategories="AllStyleCategories" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.4043294703937228</xmin>
         <ymin>-33.90631712958812471</ymin>
@@ -10946,7 +11278,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -10969,20 +11301,20 @@ def my_form_open(dialog, layer, feature):
       <renderer-v2 type="nullSymbol"/>
       <labeling type="simple">
         <settings>
-          <text-style fontItalic="0" fieldName="label" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="63" blendMode="0" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="15" multilineHeight="1" textOpacity="1" fontSizeUnit="Point" textColor="0,0,0,255" namedStyle="Semibold" fontFamily="Myriad Pro" isExpression="0">
-            <text-buffer bufferOpacity="1" bufferJoinStyle="128" bufferSize="1" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="1" bufferColor="255,255,255,255"/>
-            <background shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeType="0" shapeRadiiY="0" shapeBlendMode="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="0" shapeRadiiX="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-            <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+          <text-style fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" fontSizeUnit="Point" fieldName="label" multilineHeight="1" fontUnderline="0" fontWordSpacing="0" useSubstitutions="0" fontItalic="0" fontSize="15" textColor="0,0,0,255" fontCapitals="0" isExpression="0" textOpacity="1" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" blendMode="0">
+            <text-buffer bufferOpacity="1" bufferSize="1" bufferDraw="1" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0"/>
+            <background shapeSizeType="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeType="0" shapeDraw="0" shapeBorderColor="128,128,128,255" shapeOpacity="1" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetX="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeBlendMode="0" shapeJoinStyle="64" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowUnder="0" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowDraw="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowScale="100"/>
             <substitutions/>
           </text-style>
-          <text-format rightDirectionSymbol=">" wrapChar="" placeDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="3" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-          <placement quadOffset="4" preserveRotation="1" geometryGenerator="" placement="0" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" priority="5" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-25" maxCurvedCharAngleIn="25" repeatDistanceUnits="MM" offsetUnits="MM" placementFlags="10" geometryGeneratorEnabled="0" dist="0" offsetType="0"/>
-          <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="0" fontLimitPixelSize="0" displayAll="0" obstacleFactor="1" obstacle="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="0" maxNumLabels="2000" scaleMax="0"/>
+          <text-format wrapChar="" multilineAlign="3" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0" plussign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0" decimals="3" addDirectionSymbol="0"/>
+          <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" fitInPolygonOnly="0" quadOffset="4" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" yOffset="0" maxCurvedCharAngleIn="25" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" priority="5" maxCurvedCharAngleOut="-25" dist="0" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" rotationAngle="0" centroidInside="0" placementFlags="10" geometryGeneratorEnabled="0" geometryGenerator="" repeatDistance="0" distUnits="MM" preserveRotation="1" offsetType="0" centroidWhole="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering obstacleType="0" zIndex="0" drawLabels="1" fontMaxPixelSize="10000" scaleMin="0" scaleMax="0" obstacleFactor="1" fontMinPixelSize="3" labelPerPart="0" displayAll="0" maxNumLabels="2000" limitNumLabels="0" mergeLines="0" fontLimitPixelSize="0" minFeatureSize="0" scaleVisibility="0" upsidedownLabels="0" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </settings>
@@ -10996,21 +11328,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundColor="#ffffff" backgroundAlpha="255" labelPlacementMethod="XHeight" lineSizeType="MM" minimumSize="0" diagramOrientation="Up" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" barWidth="5" penWidth="0" penColor="#000000" width="15" scaleDependency="Area" minScaleDenominator="0" height="15" scaleBasedVisibility="0" rotationOffset="270" enabled="0">
+        <DiagramCategory maxScaleDenominator="1e+08" minScaleDenominator="0" backgroundAlpha="255" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" scaleBasedVisibility="0" lineSizeType="MM" opacity="1" diagramOrientation="Up" width="15" rotationOffset="270" scaleDependency="Area" barWidth="5" labelPlacementMethod="XHeight" penColor="#000000" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" enabled="0" penWidth="0" height="15">
           <fontProperties description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0" style="0"/>
-          <attribute label="" field="" color="#000000"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="0" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" placement="0" dist="0" showAll="1" linePlacementFlags="18" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -11041,22 +11373,22 @@ def my_form_open(dialog, layer, feature):
         <default field="label" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="label" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="label" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="label" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="0" type="field" width="-1" name="label"/>
-          <column hidden="1" type="actions" width="-1"/>
+          <column width="-1" type="field" name="id" hidden="0"/>
+          <column width="-1" type="field" name="label" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11087,8 +11419,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="label"/>
+        <field name="id" editable="1"/>
+        <field name="label" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -11098,7 +11430,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="1" readOnly="0" simplifyAlgorithm="0" autoRefreshTime="0" geometry="Polygon" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" type="vector" simplifyLocal="1" refreshOnNotifyMessage="" minScale="1e+08" refreshOnNotifyEnabled="0" labelsEnabled="1" wkbType="MultiPolygon">
+    <maplayer refreshOnNotifyMessage="" readOnly="0" autoRefreshEnabled="0" simplifyDrawingHints="1" geometry="Polygon" labelsEnabled="1" wkbType="MultiPolygon" simplifyDrawingTol="1" simplifyAlgorithm="0" type="vector" autoRefreshTime="0" maxScale="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" minScale="1e+08" styleCategories="AllStyleCategories" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37549461152003971</xmin>
         <ymin>-33.94162201868364548</ymin>
@@ -11151,11 +11483,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" miny="0" crs="" dimensions="2" maxy="0" maxz="0" maxx="0"/>
+          <spatial dimensions="2" miny="0" maxx="0" minz="0" minx="0" crs="" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -11182,22 +11514,22 @@ def my_form_open(dialog, layer, feature):
       <renderer-v2 type="nullSymbol"/>
       <labeling type="rule-based">
         <rules key="{5dc8b36b-2058-4678-ad09-9a66ad011982}">
-          <rule description="Show water tables" key="{6ef417ce-9c3a-42d0-a533-3a83b1a257ea}" filter="CASE&#xa;WHEN attribute( @atlas_feature , 'RouteLen' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'RouteLen' ) ) THEN 1&#xa;ELSE 0&#xa;END">
+          <rule key="{6ef417ce-9c3a-42d0-a533-3a83b1a257ea}" filter="CASE&#xa;WHEN attribute( @atlas_feature , 'RouteLen' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'RouteLen' ) ) THEN 1&#xa;ELSE 0&#xa;END" description="Show water tables">
             <settings>
-              <text-style fontItalic="0" fieldName="label" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="75" blendMode="0" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="8" multilineHeight="1" textOpacity="0.9" fontSizeUnit="Point" textColor="31,120,180,255" namedStyle="Bold" fontFamily="Myriad Pro" isExpression="0">
-                <text-buffer bufferOpacity="0.4" bufferJoinStyle="128" bufferSize="0.75" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255"/>
-                <background shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.6" shapeSizeType="0" shapeRadiiY="0.5" shapeBlendMode="0" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.3" shapeBorderColor="31,120,206,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,204" shapeJoinStyle="128" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="-0.15" shapeBorderWidth="0.75" shapeRadiiX="0.5" shapeSizeX="0.75" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-                <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+              <text-style fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" fontSizeUnit="Point" fieldName="label" multilineHeight="1" fontUnderline="0" fontWordSpacing="0" useSubstitutions="0" fontItalic="0" fontSize="8" textColor="31,120,180,255" fontCapitals="0" isExpression="0" textOpacity="0.9" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" namedStyle="Bold" fontWeight="75" blendMode="0">
+                <text-buffer bufferOpacity="0.4" bufferSize="0.75" bufferDraw="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0"/>
+                <background shapeSizeType="0" shapeOffsetY="-0.15" shapeFillColor="255,255,255,204" shapeSizeUnit="MM" shapeSizeX="0.75" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0.5" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0.5" shapeType="0" shapeDraw="1" shapeBorderColor="31,120,206,255" shapeOpacity="0.6" shapeRadiiUnit="MM" shapeBorderWidth="0.75" shapeOffsetX="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeSizeY="0.3" shapeBlendMode="0" shapeJoinStyle="128" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowUnder="0" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowDraw="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowScale="100"/>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" wrapChar="" placeDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="1" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-              <placement quadOffset="1" preserveRotation="1" geometryGenerator="" placement="0" centroidWhole="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" priority="5" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-25" maxCurvedCharAngleIn="25" repeatDistanceUnits="MM" offsetUnits="MapUnit" placementFlags="10" geometryGeneratorEnabled="0" dist="0" offsetType="0"/>
-              <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="1" fontLimitPixelSize="0" displayAll="0" obstacleFactor="0.76" obstacle="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="5" maxNumLabels="6" scaleMax="10000000"/>
+              <text-format wrapChar="" multilineAlign="1" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" formatNumbers="0" plussign="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0" decimals="3" addDirectionSymbol="0"/>
+              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="1" fitInPolygonOnly="0" quadOffset="1" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" yOffset="0" maxCurvedCharAngleIn="25" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" priority="5" maxCurvedCharAngleOut="-25" dist="0" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" rotationAngle="0" centroidInside="0" placementFlags="10" geometryGeneratorEnabled="0" geometryGenerator="" repeatDistance="0" distUnits="MM" preserveRotation="1" offsetType="0" centroidWhole="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering obstacleType="0" zIndex="5" drawLabels="1" fontMaxPixelSize="10000" scaleMin="1" scaleMax="10000000" obstacleFactor="0.76" fontMinPixelSize="3" labelPerPart="0" displayAll="0" maxNumLabels="6" limitNumLabels="0" mergeLines="0" fontLimitPixelSize="0" minFeatureSize="0" scaleVisibility="0" upsidedownLabels="0" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </settings>
@@ -11214,21 +11546,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundColor="#ffffff" backgroundAlpha="255" labelPlacementMethod="XHeight" lineSizeType="MM" minimumSize="0" diagramOrientation="Up" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" barWidth="5" penWidth="0" penColor="#000000" width="15" scaleDependency="Area" minScaleDenominator="0" height="15" scaleBasedVisibility="0" rotationOffset="270" enabled="0">
+        <DiagramCategory maxScaleDenominator="1e+08" minScaleDenominator="0" backgroundAlpha="255" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" scaleBasedVisibility="0" lineSizeType="MM" opacity="1" diagramOrientation="Up" width="15" rotationOffset="270" scaleDependency="Area" barWidth="5" labelPlacementMethod="XHeight" penColor="#000000" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" enabled="0" penWidth="0" height="15">
           <fontProperties description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" color="#000000"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="0" zIndex="0" obstacle="0" linePlacementFlags="2" showAll="1">
+      <DiagramLayerSettings priority="0" zIndex="0" placement="0" dist="0" showAll="1" linePlacementFlags="2" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -11237,8 +11569,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11247,8 +11579,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11257,8 +11589,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11286,28 +11618,28 @@ def my_form_open(dialog, layer, feature):
         <default field="races" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="table_set" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="races" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="table_set" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="label" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="races" notnull_strength="0" constraints="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 field="id" desc="" exp=""/>
+        <constraint field="table_set" desc="" exp=""/>
+        <constraint field="label" desc="" exp=""/>
+        <constraint field="races" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;table_set&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;table_set&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="table_set"/>
-          <column hidden="0" type="field" width="-1" name="label"/>
-          <column hidden="0" type="field" width="130" name="races"/>
+          <column width="-1" type="field" name="id" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column width="-1" type="field" name="table_set" hidden="0"/>
+          <column width="-1" type="field" name="label" hidden="0"/>
+          <column width="130" type="field" name="races" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11338,10 +11670,10 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="label"/>
-        <field editable="1" name="races"/>
-        <field editable="1" name="table_set"/>
+        <field name="id" editable="1"/>
+        <field name="label" editable="1"/>
+        <field name="races" editable="1"/>
+        <field name="table_set" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -11379,6 +11711,7 @@ def my_form_open(dialog, layer, feature):
     <layer id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
     <layer id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
     <layer id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792"/>
+    <layer id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
   </layerorder>
   <properties>
     <DefaultStyles>
@@ -11554,7 +11887,7 @@ def my_form_open(dialog, layer, feature):
       <disabledLayers type="QStringList"/>
     </Identify>
     <Layouts>
-      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/Fencing</lastLayoutExportDir>
+      <lastLayoutExportDir type="QString">/home/tim/Documents/GunRunMaps/GIS Base Map/Marshals</lastLayoutExportDir>
     </Layouts>
     <Legend>
       <filterByMap type="bool">false</filterByMap>
@@ -11694,266 +12027,266 @@ def my_form_open(dialog, layer, feature):
     <WMTSUrl type="QString"></WMTSUrl>
   </properties>
   <visibility-presets>
-    <visibility-preset name="Access Routes" has-expanded-info="1">
+    <visibility-preset has-expanded-info="1" name="Access Routes">
       <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" style="default"/>
-      <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
       <layer expanded="0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" style="default"/>
+      <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Elevation"/>
         <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Elevation"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="All Routes" has-expanded-info="1">
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+    <visibility-preset has-expanded-info="1" name="All Routes">
       <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{bf1a10e0-59dd-4cae-9422-60e7158499cb}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <layer expanded="1" id="water_tables20170921142016467" style="default"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Ask Me" has-expanded-info="1">
+    <visibility-preset has-expanded-info="1" name="Ask Me">
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <layer expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" style="default"/>
       <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
       <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" style="default"/>
-      <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
       <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" style="default"/>
+      <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
       <expanded-group-nodes>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
         <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Ask Me"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Map"/>
         <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Fencing" has-expanded-info="1">
-      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing"/>
-      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-      </expanded-legend-nodes>
+    <visibility-preset has-expanded-info="1" name="Fencing">
       <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="1" id="water_tables20170921142016467" style="default"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="OSM data"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset name="Marshal map - inset" has-expanded-info="1">
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="1" id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" style="default"/>
-      <expanded-legend-nodes id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83"/>
-      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="OSM data"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset name="Marshal map - main" has-expanded-info="1">
-      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}"/>
-        <checked-legend-node id="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="1" id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" style="default"/>
-      <expanded-legend-nodes id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83"/>
       <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{bb4463e8-e33a-4475-878c-fd2d7b636418}"/>
-        <checked-legend-node id="{9da1c54c-0ca9-4db9-a722-ce3f53ccd358}"/>
-        <checked-legend-node id="{b3b38ee9-c245-4839-b078-3b966a2a5c4e}"/>
+        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
       </checked-legend-nodes>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="OSM data"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset name="Marshal overview" has-expanded-info="1">
-      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+      </expanded-legend-nodes>
+      <layer expanded="1" id="water_tables20170921142016467" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
       <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <expanded-group-nodes>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Marshals"/>
+      </expanded-group-nodes>
+    </visibility-preset>
+    <visibility-preset has-expanded-info="1" name="Marshal map - inset">
+      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
+      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" style="default"/>
+      <expanded-legend-nodes id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83"/>
+      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <expanded-group-nodes>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Marshals"/>
+      </expanded-group-nodes>
+    </visibility-preset>
+    <visibility-preset has-expanded-info="1" name="Marshal map - main">
       <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}"/>
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
         <checked-legend-node id="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="1" id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" style="default"/>
-      <expanded-legend-nodes id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83"/>
-      <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="OSM data"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset name="Proposed Routes" has-expanded-info="1">
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
+      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing"/>
+      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <checked-legend-node id="{9da1c54c-0ca9-4db9-a722-ce3f53ccd358}"/>
+        <checked-legend-node id="{b3b38ee9-c245-4839-b078-3b966a2a5c4e}"/>
+        <checked-legend-node id="{bb4463e8-e33a-4475-878c-fd2d7b636418}"/>
       </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="1" id="water_tables20170921142016467" style="default"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-group-nodes>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="OSM data"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset name="Routes" has-expanded-info="1">
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="1" id="water_tables20170921142016467" style="default"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-group-nodes>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="OSM data"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset name="Start/Finish" has-expanded-info="1">
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
       <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default"/>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
       <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" style="default"/>
+      <expanded-legend-nodes id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83"/>
+      <layer expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <expanded-group-nodes>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Marshals"/>
+      </expanded-group-nodes>
+    </visibility-preset>
+    <visibility-preset has-expanded-info="1" name="Marshal overview">
+      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
+      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+        <checked-legend-node id="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}"/>
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
+        <checked-legend-node id="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default"/>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" style="default"/>
+      <expanded-legend-nodes id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83"/>
+      <layer expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <expanded-group-nodes>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Marshals"/>
+      </expanded-group-nodes>
+    </visibility-preset>
+    <visibility-preset has-expanded-info="1" name="Proposed Routes">
+      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
+      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <layer expanded="1" id="water_tables20170921142016467" style="default"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing"/>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <expanded-group-nodes>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Marshals"/>
+      </expanded-group-nodes>
+    </visibility-preset>
+    <visibility-preset has-expanded-info="1" name="Routes">
+      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
+      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="1" id="water_tables20170921142016467" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <expanded-group-nodes>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Marshals"/>
+      </expanded-group-nodes>
+    </visibility-preset>
+    <visibility-preset has-expanded-info="1" name="Start/Finish">
       <layer expanded="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" style="default"/>
       <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing"/>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer expanded="1" id="water_tables20170921142016467" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default"/>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Marshal pages"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Marshal pages"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
   </visibility-presets>
@@ -11981,209 +12314,209 @@ def my_form_open(dialog, layer, feature):
   <Annotations/>
   <Layouts>
     <Layout worldFileMap="" name="Routes" units="mm" printResolution="144">
-      <Snapper snapToItems="1" tolerance="5" snapToGrid="0" snapToGuides="1"/>
-      <Grid offsetY="0" resUnits="mm" offsetX="0" resolution="10" offsetUnits="mm"/>
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetUnits="mm" offsetY="0" offsetX="0" resolution="10"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol alpha="1" force_rhr="0" type="fill" clip_to_extent="1" name="">
+          <layer locked="0" enabled="1" pass="0" 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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="no"/>
+            <prop k="outline_width" v="0.26"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem size="297,210,mm" outlineWidthM="0.3,mm" opacity="1" positionOnPage="0,0,mm" templateUuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" frame="false" blendMode="0" frameJoinStyle="miter" background="true" uuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" positionLock="false" type="65638" itemRotation="0" excludeFromExports="0" position="0,0,mm" groupUuid="" visibility="1" zValue="0" referencePoint="0" id="">
-          <FrameColor green="0" red="0" blue="0" alpha="255"/>
-          <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+        <LayoutItem groupUuid="" positionLock="false" templateUuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" position="0,0,mm" uuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" frameJoinStyle="miter" id="" zValue="0" opacity="1" outlineWidthM="0.3,mm" positionOnPage="0,0,mm" background="true" type="65638" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" visibility="1" size="297,210,mm" blendMode="0">
+          <FrameColor blue="0" alpha="255" red="0" green="0"/>
+          <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
           </LayoutObject>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" page="0" units="mm" position="0"/>
+          <Guide position="0" page="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem size="14.1764,7.471,mm" valign="64" outlineWidthM="0.3,mm" opacity="1" positionOnPage="9.44946,191.611,mm" templateUuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="[%&quot;Distance&quot;%]" position="9.44946,191.611,mm" groupUuid="" htmlState="0" visibility="1" zValue="9" referencePoint="0" marginY="1" id="" marginX="1" halign="1">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="true" templateUuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" valign="64" position="9.44946,191.611,mm" uuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" frameJoinStyle="miter" id="" zValue="9" opacity="1" outlineWidthM="0.3,mm" positionOnPage="9.44946,191.611,mm" background="false" halign="1" type="65641" marginX="1" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" visibility="1" size="14.1764,7.471,mm" htmlState="0" labelText="[%&quot;Distance&quot;%]" blendMode="0" marginY="1">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <FontColor blue="0" alpha="255" red="0" green="0"/>
       </LayoutItem>
-      <LayoutItem size="29.2025,7.272,mm" valign="64" outlineWidthM="0.3,mm" opacity="1" positionOnPage="24.2445,191.81,mm" templateUuid="{d9f4225c-620f-4a62-a293-599f109f5206}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{d9f4225c-620f-4a62-a293-599f109f5206}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="RACE ROUTE" position="24.2445,191.81,mm" groupUuid="" htmlState="0" visibility="1" zValue="8" referencePoint="0" marginY="1" id="" marginX="0" halign="1">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="true" templateUuid="{d9f4225c-620f-4a62-a293-599f109f5206}" valign="64" position="24.2445,191.81,mm" uuid="{d9f4225c-620f-4a62-a293-599f109f5206}" frameJoinStyle="miter" id="" zValue="8" opacity="1" outlineWidthM="0.3,mm" positionOnPage="24.2445,191.81,mm" background="false" halign="1" type="65641" marginX="0" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" visibility="1" size="29.2025,7.272,mm" htmlState="0" labelText="RACE ROUTE" blendMode="0" marginY="1">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <FontColor blue="0" alpha="255" red="0" green="0"/>
       </LayoutItem>
-      <LayoutItem size="57.4836,6.8714,mm" valign="64" outlineWidthM="0.3,mm" opacity="1" positionOnPage="204.225,191.81,mm" templateUuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="REVISION 3.0" position="204.225,191.81,mm" groupUuid="" htmlState="0" visibility="1" zValue="6" referencePoint="0" marginY="1" id="" marginX="1" halign="2">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="true" templateUuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" valign="64" position="204.225,191.81,mm" uuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" frameJoinStyle="miter" id="" zValue="6" opacity="1" outlineWidthM="0.3,mm" positionOnPage="204.225,191.81,mm" background="false" halign="2" type="65641" marginX="1" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" visibility="1" size="57.4836,6.8714,mm" htmlState="0" labelText="REVISION 3.0" blendMode="0" marginY="1">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <FontColor blue="0" alpha="255" red="0" green="0"/>
       </LayoutItem>
-      <LayoutItem size="51.6706,6.60801,mm" valign="64" outlineWidthM="0.3,mm" opacity="1" positionOnPage="210.038,199.082,mm" templateUuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="Sunday, 20 October 2019" position="210.038,199.082,mm" groupUuid="" htmlState="0" visibility="1" zValue="5" referencePoint="0" marginY="1" id="" marginX="1" halign="2">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="true" templateUuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" valign="64" position="210.038,199.082,mm" uuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" frameJoinStyle="miter" id="" zValue="5" opacity="1" outlineWidthM="0.3,mm" positionOnPage="210.038,199.082,mm" background="false" halign="2" type="65641" marginX="1" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" visibility="1" size="51.6706,6.60801,mm" htmlState="0" labelText="Sunday, 20 October 2019" blendMode="0" marginY="1">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <FontColor blue="0" alpha="255" red="0" green="0"/>
       </LayoutItem>
-      <LayoutItem size="29.7523,17.4718,mm" mapUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" outlineWidthM="0.3,mm" opacity="1" positionOnPage="262.196,188.218,mm" resizeMode="0" northOffset="0" templateUuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" frame="false" pictureWidth="29.7523" anchorPoint="4" pictureHeight="17.4074" pictureRotation="0" svgBorderColor="0,0,0,255" blendMode="0" svgFillColor="255,255,255,255" frameJoinStyle="miter" background="false" uuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" positionLock="true" svgBorderWidth="0.2" type="65640" itemRotation="0" excludeFromExports="0" position="262.196,188.218,mm" file="../Gun_Run_Logo.png" northMode="0" groupUuid="" visibility="1" zValue="4" referencePoint="0" id="">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" file="../Gun_Run_Logo.png" pictureHeight="17.4074" resizeMode="0" svgFillColor="255,255,255,255" positionLock="true" templateUuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" position="262.196,188.218,mm" uuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" northMode="0" frameJoinStyle="miter" id="" northOffset="0" zValue="4" opacity="1" outlineWidthM="0.3,mm" positionOnPage="262.196,188.218,mm" background="false" pictureRotation="0" type="65640" excludeFromExports="0" itemRotation="0" frame="false" mapUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" referencePoint="0" svgBorderWidth="0.2" visibility="1" size="29.7523,17.4718,mm" svgBorderColor="0,0,0,255" pictureWidth="29.7523" blendMode="0" anchorPoint="4">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value=""/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem size="251.959,0.1,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" cornerRadiusMeasure="0,mm" positionOnPage="9.59946,198.832,mm" templateUuid="{5e005555-54ea-40fd-a5a7-20254950b890}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{5e005555-54ea-40fd-a5a7-20254950b890}" positionLock="true" type="65643" itemRotation="0" excludeFromExports="0" position="9.59946,198.832,mm" groupUuid="" visibility="1" zValue="3" referencePoint="0" id="">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="true" templateUuid="{5e005555-54ea-40fd-a5a7-20254950b890}" position="9.59946,198.832,mm" uuid="{5e005555-54ea-40fd-a5a7-20254950b890}" frameJoinStyle="miter" id="" zValue="3" opacity="1" outlineWidthM="0.3,mm" positionOnPage="9.59946,198.832,mm" shapeType="1" background="false" type="65643" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" cornerRadiusMeasure="0,mm" visibility="1" size="251.959,0.1,mm" blendMode="0">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol alpha="1" force_rhr="0" type="fill" clip_to_extent="1" name="">
+          <layer locked="0" enabled="1" pass="0" 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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="solid"/>
+            <prop k="outline_width" v="0.3"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem size="67.7828,166.874,mm" outlineWidthM="0.3,mm" opacity="1" positionOnPage="5.86559,4.09761,mm" templateUuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" frame="true" blendMode="0" frameJoinStyle="miter" labelMargin="0,mm" background="true" uuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" mapFlags="0" positionLock="true" followPresetName="Routes" type="65639" itemRotation="0" excludeFromExports="0" position="5.86559,4.09761,mm" groupUuid="" visibility="1" zValue="2" referencePoint="0" drawCanvasItems="false" mapRotation="0" id="" keepLayerSet="false" followPreset="true">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="true" templateUuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" mapRotation="0" position="5.86559,4.09761,mm" uuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" frameJoinStyle="miter" id="" zValue="2" opacity="1" outlineWidthM="0.3,mm" positionOnPage="5.86559,4.09761,mm" keepLayerSet="false" followPresetName="Routes" mapFlags="0" background="true" type="65639" excludeFromExports="0" itemRotation="0" frame="true" referencePoint="0" drawCanvasItems="false" visibility="1" size="67.7828,166.874,mm" followPreset="true" labelMargin="0,mm" blendMode="0">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMax">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMax">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
@@ -12202,62 +12535,62 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" topAnnotationPosition="1" rightFrameDivisions="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" gridFramePenThickness="0.5" unit="0" rightAnnotationPosition="1" leftAnnotationDirection="0" topAnnotationDisplay="0" gridFrameSideFlags="15" leftAnnotationDisplay="0" crossLength="3" topFrameDivisions="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" bottomAnnotationDisplay="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" show="0" showAnnotation="0" intervalX="0" topAnnotationDirection="0" frameAnnotationDistance="1" leftFrameDivisions="0" frameFillColor2="0,0,0,255" annotationFormat="0" intervalY="0" rightAnnotationDisplay="0" annotationFontColor="0,0,0,255" gridFrameStyle="0" gridFrameWidth="2" gridStyle="0" rightAnnotationDirection="0" annotationExpression="" offsetX="0" bottomAnnotationPosition="1" annotationPrecision="3" name="Grid 1" offsetY="0" leftAnnotationPosition="1" position="3">
+        <ComposerMapGrid unit="0" gridFrameSideFlags="15" bottomAnnotationDisplay="0" frameFillColor2="0,0,0,255" offsetY="0" gridFrameWidth="2" annotationFontColor="0,0,0,255" intervalY="0" frameAnnotationDistance="1" annotationFormat="0" position="3" rightAnnotationDirection="0" name="Grid 1" annotationExpression="" bottomFrameDivisions="0" topAnnotationPosition="1" gridStyle="0" topFrameDivisions="0" crossLength="3" leftAnnotationPosition="1" gridFramePenThickness="0.5" topAnnotationDirection="0" showAnnotation="0" rightAnnotationDisplay="0" bottomAnnotationDirection="0" leftAnnotationDirection="0" intervalX="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" bottomAnnotationPosition="1" gridFrameStyle="0" topAnnotationDisplay="0" show="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" rightFrameDivisions="0" offsetX="0" leftAnnotationDisplay="0" blendMode="0" leftFrameDivisions="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" annotationPrecision="3">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <symbol alpha="1" force_rhr="0" type="line" clip_to_extent="1" name="">
+              <layer locked="0" enabled="1" pass="0" class="SimpleLine">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol alpha="1" force_rhr="0" type="marker" clip_to_extent="1" name="">
+              <layer locked="0" enabled="1" pass="0" class="SimpleMarker">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -12268,31 +12601,31 @@ def my_form_open(dialog, layer, feature):
         <AtlasMap atlasDriven="0" scalingMode="2" margin="0.05"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutItem size="282.012,175.592,mm" outlineWidthM="0.15,mm" opacity="1" positionOnPage="9.44946,9.08557,mm" templateUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" frame="true" blendMode="0" frameJoinStyle="round" labelMargin="0,mm" background="true" uuid="{b35d820c-6054-4426-a840-5216bed2ca94}" mapFlags="0" positionLock="true" followPresetName="Routes" type="65639" itemRotation="0" excludeFromExports="0" position="9.44946,9.08557,mm" groupUuid="" visibility="1" zValue="1" referencePoint="0" drawCanvasItems="false" mapRotation="0" id="" keepLayerSet="false" followPreset="true">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="true" templateUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" mapRotation="0" position="9.44946,9.08557,mm" uuid="{b35d820c-6054-4426-a840-5216bed2ca94}" frameJoinStyle="round" id="" zValue="1" opacity="1" outlineWidthM="0.15,mm" positionOnPage="9.44946,9.08557,mm" keepLayerSet="false" followPresetName="Routes" mapFlags="0" background="true" type="65639" excludeFromExports="0" itemRotation="0" frame="true" referencePoint="0" drawCanvasItems="false" visibility="1" size="282.012,175.592,mm" followPreset="true" labelMargin="0,mm" blendMode="0">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
@@ -12311,62 +12644,62 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" topAnnotationPosition="1" rightFrameDivisions="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" gridFramePenThickness="0.5" unit="0" rightAnnotationPosition="1" leftAnnotationDirection="0" topAnnotationDisplay="0" gridFrameSideFlags="15" leftAnnotationDisplay="0" crossLength="3" topFrameDivisions="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" bottomAnnotationDisplay="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" show="0" showAnnotation="0" intervalX="0" topAnnotationDirection="0" frameAnnotationDistance="1" leftFrameDivisions="0" frameFillColor2="0,0,0,255" annotationFormat="0" intervalY="0" rightAnnotationDisplay="0" annotationFontColor="0,0,0,255" gridFrameStyle="0" gridFrameWidth="2" gridStyle="0" rightAnnotationDirection="0" annotationExpression="" offsetX="0" bottomAnnotationPosition="1" annotationPrecision="3" name="Grid 1" offsetY="0" leftAnnotationPosition="1" position="3">
+        <ComposerMapGrid unit="0" gridFrameSideFlags="15" bottomAnnotationDisplay="0" frameFillColor2="0,0,0,255" offsetY="0" gridFrameWidth="2" annotationFontColor="0,0,0,255" intervalY="0" frameAnnotationDistance="1" annotationFormat="0" position="3" rightAnnotationDirection="0" name="Grid 1" annotationExpression="" bottomFrameDivisions="0" topAnnotationPosition="1" gridStyle="0" topFrameDivisions="0" crossLength="3" leftAnnotationPosition="1" gridFramePenThickness="0.5" topAnnotationDirection="0" showAnnotation="0" rightAnnotationDisplay="0" bottomAnnotationDirection="0" leftAnnotationDirection="0" intervalX="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" bottomAnnotationPosition="1" gridFrameStyle="0" topAnnotationDisplay="0" show="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" rightFrameDivisions="0" offsetX="0" leftAnnotationDisplay="0" blendMode="0" leftFrameDivisions="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" annotationPrecision="3">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <symbol alpha="1" force_rhr="0" type="line" clip_to_extent="1" name="">
+              <layer locked="0" enabled="1" pass="0" class="SimpleLine">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol alpha="1" force_rhr="0" type="marker" clip_to_extent="1" name="">
+              <layer locked="0" enabled="1" pass="0" class="SimpleMarker">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -12391,43 +12724,43 @@ def my_form_open(dialog, layer, feature):
         <property key="pdfTextFormat" value="0"/>
         <property key="singleFile" value="true"/>
       </customproperties>
-      <Atlas coverageLayerName="all_routes" hideCoverage="0" sortFeatures="1" pageNameExpression="&quot;Distance&quot;" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortKey="length_m" filterFeatures="1" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21)' )" enabled="1" sortAscending="0" coverageLayerProvider="ogr"/>
+      <Atlas coverageLayerSource="/home/tim/Documents/GunRunMaps/GIS Base Map/all_routes.shp|layername=all_routes" coverageLayerName="all_routes" sortAscending="0" enabled="1" sortKey="length_m" coverageLayerProvider="ogr" filterFeatures="1" hideCoverage="0" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortFeatures="1" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" pageNameExpression="&quot;Distance&quot;" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21)' )"/>
     </Layout>
     <Layout worldFileMap="" name="Marshals" units="mm" printResolution="120">
-      <Snapper snapToItems="1" tolerance="5" snapToGrid="0" snapToGuides="1"/>
-      <Grid offsetY="0" resUnits="mm" offsetX="0" resolution="10" offsetUnits="mm"/>
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetUnits="mm" offsetY="0" offsetX="0" resolution="10"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol alpha="1" force_rhr="0" type="fill" clip_to_extent="1" name="">
+          <layer locked="0" enabled="1" pass="0" 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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="no"/>
+            <prop k="outline_width" v="0.26"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem size="297,210,mm" outlineWidthM="0.3,mm" opacity="1" positionOnPage="0,0,mm" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" frame="false" blendMode="0" frameJoinStyle="miter" background="true" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" positionLock="false" type="65638" itemRotation="0" excludeFromExports="0" position="0,0,mm" groupUuid="" visibility="1" zValue="0" referencePoint="0" id="">
-          <FrameColor green="0" red="0" blue="0" alpha="255"/>
-          <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+        <LayoutItem groupUuid="" positionLock="false" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" position="0,0,mm" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" frameJoinStyle="miter" id="" zValue="0" opacity="1" outlineWidthM="0.3,mm" positionOnPage="0,0,mm" background="true" type="65638" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" visibility="1" size="297,210,mm" blendMode="0">
+          <FrameColor blue="0" alpha="255" red="0" green="0"/>
+          <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
@@ -12435,15 +12768,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem title="" outlineWidthM="0.1,mm" blendMode="0" background="true" fontColor="#000000" referencePoint="0" itemRotation="0" size="35.7078,48,mm" frame="true" titleAlignment="1" opacity="1" columnCount="1" equalColumnWidth="1" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" rasterBorderColor="0,0,0,255" excludeFromExports="0" wmsLegendHeight="25" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" resizeToContents="1" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" boxSpace="2" frameJoinStyle="bevel" rasterBorderWidth="0" positionLock="true" wmsLegendWidth="50" symbolHeight="4" symbolWidth="7" type="65642" legendFilterByAtlas="0" splitLayer="0" rasterBorder="1" symbolAlignment="1" groupUuid="" visibility="1" zValue="5" lineSpacing="1" columnSpace="2" id="" wrapChar="" positionOnPage="115.486,4.6628,mm" position="115.486,4.6628,mm">
-        <FrameColor green="128" red="128" blue="128" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem title="" fontColor="#000000" lineSpacing="1" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" outlineWidthM="0.1,mm" symbolWidth="7" opacity="1" symbolAlignment="1" positionOnPage="110.353,5.04491,mm" type="65642" position="110.353,5.04491,mm" splitLayer="0" positionLock="true" rasterBorderWidth="0" wmsLegendHeight="25" id="" wmsLegendWidth="50" visibility="1" size="39.4344,45.9,mm" zValue="5" frameJoinStyle="bevel" rasterBorderColor="0,0,0,255" itemRotation="0" wrapChar="" symbolHeight="4" columnCount="1" titleAlignment="1" equalColumnWidth="1" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" boxSpace="2" rasterBorder="1" columnSpace="2" referencePoint="0" legendFilterByAtlas="0" groupUuid="" blendMode="0" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" frame="true" resizeToContents="1" background="true" excludeFromExports="0">
+        <FrameColor blue="128" alpha="255" red="128" green="128"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
@@ -12455,30 +12788,30 @@ def my_form_open(dialog, layer, feature):
           <style name="group" alignment="1">
             <styleFont description="Myriad Pro,11,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
-          <style name="subgroup" marginTop="1" alignment="1">
+          <style name="subgroup" alignment="1" marginTop="1">
             <styleFont description="Myriad Pro,9,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
-          <style name="symbol" marginTop="2" alignment="1">
+          <style name="symbol" alignment="1" marginTop="2">
             <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
           </style>
-          <style marginLeft="2" name="symbolLabel" marginTop="2" alignment="1">
+          <style name="symbolLabel" alignment="1" marginLeft="2" marginTop="2">
             <styleFont description="Myriad Pro,8,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties/>
-          <layer-tree-group expanded="1" checked="Qt::Checked" name="Routes">
+          <layer-tree-group expanded="1" name="Routes" checked="Qt::Checked">
             <customproperties/>
-            <layer-tree-layer providerKey="ogr" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" checked="Qt::Checked" source="./all_routes.shp|layername=all_routes" name="all_routes">
+            <layer-tree-layer source="./all_routes.shp|layername=all_routes" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" name="all_routes" checked="Qt::Checked" providerKey="ogr">
               <customproperties>
                 <property key="legend/node-order" value="1,2,3"/>
                 <property key="legend/title-style" value="hidden"/>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group expanded="1" checked="Qt::Unchecked" name="Fencing and Cones">
+          <layer-tree-group expanded="1" name="Fencing and Cones" checked="Qt::Unchecked">
             <customproperties/>
-            <layer-tree-layer providerKey="ogr" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" checked="Qt::Checked" source="./fencing.shp|layername=fencing" name="fencing">
+            <layer-tree-layer source="./fencing.shp|layername=fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" name="fencing" checked="Qt::Checked" providerKey="ogr">
               <customproperties>
                 <property key="legend/node-order" value="0,1,2"/>
                 <property key="legend/title-style" value="hidden"/>
@@ -12488,77 +12821,77 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem size="56.5192,54.5647,mm" outlineWidthM="0.2,mm" opacity="1" positionOnPage="96.8723,149.218,mm" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" frame="true" blendMode="0" frameJoinStyle="miter" labelMargin="0,mm" background="true" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" mapFlags="0" positionLock="true" followPresetName="Marshal map - inset" type="65639" itemRotation="0" excludeFromExports="0" position="96.8723,149.218,mm" groupUuid="" visibility="1" zValue="4" referencePoint="0" drawCanvasItems="false" mapRotation="0" id="" keepLayerSet="false" followPreset="true">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="true" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" mapRotation="0" position="98.7828,149.027,mm" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" frameJoinStyle="miter" id="" zValue="4" opacity="1" outlineWidthM="0.2,mm" positionOnPage="98.7828,149.027,mm" keepLayerSet="false" followPresetName="Marshal map - inset" mapFlags="0" background="true" type="65639" excludeFromExports="0" itemRotation="0" frame="true" referencePoint="0" drawCanvasItems="false" visibility="1" size="56.5192,54.5647,mm" followPreset="true" labelMargin="0,mm" blendMode="0">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent ymin="-33.9468506100902232" xmin="18.37543947857280457" xmax="18.37973432449689781" ymax="-33.94270428739947931"/>
+        <Extent ymin="-33.90316824413850583" xmin="18.41064302246786966" xmax="18.41493455420295433" ymax="-33.89902512102636223"/>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" topAnnotationPosition="1" rightFrameDivisions="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" gridFramePenThickness="0.5" unit="0" rightAnnotationPosition="1" leftAnnotationDirection="0" topAnnotationDisplay="0" gridFrameSideFlags="15" leftAnnotationDisplay="0" crossLength="3" topFrameDivisions="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" bottomAnnotationDisplay="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" show="0" showAnnotation="0" intervalX="0" topAnnotationDirection="0" frameAnnotationDistance="1" leftFrameDivisions="0" frameFillColor2="0,0,0,255" annotationFormat="0" intervalY="0" rightAnnotationDisplay="0" annotationFontColor="0,0,0,255" gridFrameStyle="0" gridFrameWidth="2" gridStyle="0" rightAnnotationDirection="0" annotationExpression="" offsetX="0" bottomAnnotationPosition="1" annotationPrecision="3" name="Grid 1" offsetY="0" leftAnnotationPosition="1" position="3">
+        <ComposerMapGrid unit="0" gridFrameSideFlags="15" bottomAnnotationDisplay="0" frameFillColor2="0,0,0,255" offsetY="0" gridFrameWidth="2" annotationFontColor="0,0,0,255" intervalY="0" frameAnnotationDistance="1" annotationFormat="0" position="3" rightAnnotationDirection="0" name="Grid 1" annotationExpression="" bottomFrameDivisions="0" topAnnotationPosition="1" gridStyle="0" topFrameDivisions="0" crossLength="3" leftAnnotationPosition="1" gridFramePenThickness="0.5" topAnnotationDirection="0" showAnnotation="0" rightAnnotationDisplay="0" bottomAnnotationDirection="0" leftAnnotationDirection="0" intervalX="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" bottomAnnotationPosition="1" gridFrameStyle="0" topAnnotationDisplay="0" show="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" rightFrameDivisions="0" offsetX="0" leftAnnotationDisplay="0" blendMode="0" leftFrameDivisions="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" annotationPrecision="3">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <symbol alpha="1" force_rhr="0" type="line" clip_to_extent="1" name="">
+              <layer locked="0" enabled="1" pass="0" class="SimpleLine">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol alpha="1" force_rhr="0" type="marker" clip_to_extent="1" name="">
+              <layer locked="0" enabled="1" pass="0" class="SimpleMarker">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -12566,25 +12899,25 @@ def my_form_open(dialog, layer, feature):
           </markerStyle>
           <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
         </ComposerMapGrid>
-        <ComposerMapOverview blendMode="0" inverted="0" centered="1" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" name="Overview 1" show="1" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" position="3">
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="0,65,170,127" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,102" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
+        <ComposerMapOverview position="3" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" name="Overview 1" inverted="0" centered="1" show="1" blendMode="0" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}">
+          <symbol alpha="1" force_rhr="0" type="fill" clip_to_extent="1" name="">
+            <layer locked="0" enabled="1" pass="0" class="SimpleFill">
+              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="color" v="0,65,170,127"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="35,35,35,102"/>
+              <prop k="outline_style" v="no"/>
+              <prop k="outline_width" v="0.26"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -12593,77 +12926,77 @@ def my_form_open(dialog, layer, feature):
         <AtlasMap atlasDriven="1" scalingMode="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutItem size="142,187.018,mm" outlineWidthM="0.3,mm" opacity="1" positionOnPage="3.53,6.0007,mm" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" frame="false" blendMode="0" frameJoinStyle="miter" labelMargin="0,mm" background="false" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" mapFlags="0" positionLock="true" followPresetName="Marshal map - main" type="65639" itemRotation="0" excludeFromExports="0" position="3.53,6.0007,mm" groupUuid="" visibility="1" zValue="3" referencePoint="0" drawCanvasItems="false" mapRotation="0" id="" keepLayerSet="false" followPreset="true">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="true" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" mapRotation="0" position="3.53,6.0007,mm" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" frameJoinStyle="miter" id="" zValue="3" opacity="1" outlineWidthM="0.3,mm" positionOnPage="3.53,6.0007,mm" keepLayerSet="false" followPresetName="Marshal map - main" mapFlags="0" background="false" type="65639" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" drawCanvasItems="false" visibility="1" size="142,187.018,mm" followPreset="true" labelMargin="0,mm" blendMode="0">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent ymin="-33.94545417898715556" xmin="18.37707307000128054" xmax="18.37810073306842185" ymax="-33.94410071850254695"/>
+        <Extent ymin="-33.9017728906146445" xmin="18.41227535330844844" xmax="18.41330222336237554" ymax="-33.90042047455022356"/>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" topAnnotationPosition="1" rightFrameDivisions="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" gridFramePenThickness="0.5" unit="0" rightAnnotationPosition="1" leftAnnotationDirection="0" topAnnotationDisplay="0" gridFrameSideFlags="15" leftAnnotationDisplay="0" crossLength="3" topFrameDivisions="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" bottomAnnotationDisplay="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" show="0" showAnnotation="0" intervalX="0" topAnnotationDirection="0" frameAnnotationDistance="1" leftFrameDivisions="0" frameFillColor2="0,0,0,255" annotationFormat="0" intervalY="0" rightAnnotationDisplay="0" annotationFontColor="0,0,0,255" gridFrameStyle="0" gridFrameWidth="2" gridStyle="0" rightAnnotationDirection="0" annotationExpression="" offsetX="0" bottomAnnotationPosition="1" annotationPrecision="3" name="Grid 1" offsetY="0" leftAnnotationPosition="1" position="3">
+        <ComposerMapGrid unit="0" gridFrameSideFlags="15" bottomAnnotationDisplay="0" frameFillColor2="0,0,0,255" offsetY="0" gridFrameWidth="2" annotationFontColor="0,0,0,255" intervalY="0" frameAnnotationDistance="1" annotationFormat="0" position="3" rightAnnotationDirection="0" name="Grid 1" annotationExpression="" bottomFrameDivisions="0" topAnnotationPosition="1" gridStyle="0" topFrameDivisions="0" crossLength="3" leftAnnotationPosition="1" gridFramePenThickness="0.5" topAnnotationDirection="0" showAnnotation="0" rightAnnotationDisplay="0" bottomAnnotationDirection="0" leftAnnotationDirection="0" intervalX="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" bottomAnnotationPosition="1" gridFrameStyle="0" topAnnotationDisplay="0" show="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" rightFrameDivisions="0" offsetX="0" leftAnnotationDisplay="0" blendMode="0" leftFrameDivisions="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" annotationPrecision="3">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <symbol alpha="1" force_rhr="0" type="line" clip_to_extent="1" name="">
+              <layer locked="0" enabled="1" pass="0" class="SimpleLine">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol alpha="1" force_rhr="0" type="marker" clip_to_extent="1" name="">
+              <layer locked="0" enabled="1" pass="0" class="SimpleMarker">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -12674,48 +13007,48 @@ def my_form_open(dialog, layer, feature):
         <AtlasMap atlasDriven="1" scalingMode="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutItem size="142.117,187.018,mm" outlineWidthM="0.3,mm" opacity="1" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" sectionY="0" sectionHeight="187.018" hideBackgroundIfEmpty="0" positionOnPage="290.617,6.0007,mm" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" frame="false" sectionX="0" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" blendMode="0" frameJoinStyle="round" background="false" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" hidePageIfEmpty="0" positionLock="true" type="65647" itemRotation="0" excludeFromExports="0" position="290.617,6.0007,mm" sectionWidth="142.117" groupUuid="" visibility="1" zValue="2" referencePoint="2" id="">
-        <FrameColor green="119" red="119" blue="119" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" sectionX="0" positionLock="true" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" hideBackgroundIfEmpty="0" position="290.617,6.0007,mm" sectionY="0" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" frameJoinStyle="round" id="" zValue="2" opacity="1" outlineWidthM="0.3,mm" positionOnPage="290.617,6.0007,mm" background="false" type="65647" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" sectionWidth="142.117" excludeFromExports="0" itemRotation="0" frame="false" sectionHeight="187.018" referencePoint="2" hidePageIfEmpty="0" visibility="1" size="142.117,187.018,mm" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" blendMode="0">
+        <FrameColor blue="119" alpha="255" red="119" green="119"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem size="47.1065,27.6,mm" mapUuid="" outlineWidthM="0.3,mm" opacity="1" positionOnPage="246.665,178.41,mm" resizeMode="0" northOffset="0" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" frame="false" pictureWidth="47.1065" anchorPoint="0" pictureHeight="27.561" pictureRotation="0" svgBorderColor="0,0,0,255" blendMode="0" svgFillColor="255,255,255,255" frameJoinStyle="miter" background="false" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" positionLock="true" svgBorderWidth="0.2" type="65640" itemRotation="0" excludeFromExports="0" position="246.665,178.41,mm" file="../Gun_Run_Logo.png" northMode="0" groupUuid="" visibility="1" zValue="1" referencePoint="0" id="">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" file="../Gun_Run_Logo.png" pictureHeight="27.561" resizeMode="0" svgFillColor="255,255,255,255" positionLock="true" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" position="246.665,178.41,mm" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" northMode="0" frameJoinStyle="miter" id="" northOffset="0" zValue="1" opacity="1" outlineWidthM="0.3,mm" positionOnPage="246.665,178.41,mm" background="false" pictureRotation="0" type="65640" excludeFromExports="0" itemRotation="0" frame="false" mapUuid="" referencePoint="0" svgBorderWidth="0.2" visibility="1" size="47.1065,27.6,mm" svgBorderColor="0,0,0,255" pictureWidth="47.1065" blendMode="0" anchorPoint="0">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value=""/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutMultiFrame uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" url="" evaluateExpressions="true" useSmartBreaks="true" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;tr>&lt;td>Name&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', &quot;csv_name&quot;, '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;/td>&lt;/tr>', '')%]&#xa;&lt;tr>&lt;td>Club&lt;/td>&lt;td>[%csv_club%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%csv_captain%]&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>VOC&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;tr>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&amp;nbsp;&lt;/td>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain_phone&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;/td>&lt;tr>')%]&#xa;&#xa;&lt;tr>&lt;td>Timothy Allen&lt;/td>&lt;td>072 703 9574&lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please return your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephen Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" type="65648" contentMode="1" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}" resizeMode="0" maxBreakDistance="12" stylesheetEnabled="true">
+      <LayoutMultiFrame html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;tr>&lt;td>Name&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', &quot;csv_name&quot;, '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;/td>&lt;/tr>', '')%]&#xa;&lt;tr>&lt;td>Club&lt;/td>&lt;td>[%csv_club%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%csv_captain%]&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>VOC&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;tr>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&amp;nbsp;&lt;/td>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain_phone&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;/td>&lt;tr>')%]&#xa;&#xa;&lt;tr>&lt;td>Timothy Allen&lt;/td>&lt;td>072 703 9574&lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please return your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephen Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>" type="65648" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}" contentMode="1" url="" resizeMode="0" evaluateExpressions="true" useSmartBreaks="true" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" maxBreakDistance="12" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" stylesheetEnabled="true">
         <childFrame uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
@@ -12741,43 +13074,43 @@ def my_form_open(dialog, layer, feature):
         <property key="resizeToContentsTopMargin" value="3.53"/>
         <property key="singleFile" value="false"/>
       </customproperties>
-      <Atlas coverageLayerName="marshal_positions" hideCoverage="0" sortFeatures="1" pageNameExpression="&quot;position&quot;" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" sortKey="position" filterFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" enabled="1" sortAscending="1" coverageLayerProvider="ogr"/>
+      <Atlas coverageLayerSource="/home/tim/Documents/GunRunMaps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" coverageLayerName="marshal_positions" sortAscending="1" enabled="1" sortKey="position" coverageLayerProvider="ogr" filterFeatures="0" hideCoverage="0" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" sortFeatures="1" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" pageNameExpression="&quot;position&quot;"/>
     </Layout>
     <Layout worldFileMap="" name="Marshal Plan" units="mm" printResolution="120">
-      <Snapper snapToItems="1" tolerance="5" snapToGrid="0" snapToGuides="1"/>
-      <Grid offsetY="0" resUnits="mm" offsetX="0" resolution="10" offsetUnits="mm"/>
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetUnits="mm" offsetY="0" offsetX="0" resolution="10"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol alpha="1" force_rhr="0" type="fill" clip_to_extent="1" name="">
+          <layer locked="0" enabled="1" pass="0" 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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="no"/>
+            <prop k="outline_width" v="0.26"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem size="297,420,mm" outlineWidthM="0.3,mm" opacity="1" positionOnPage="0,0,mm" templateUuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" frame="false" blendMode="0" frameJoinStyle="miter" background="true" uuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" positionLock="false" type="65638" itemRotation="0" excludeFromExports="0" position="0,0,mm" groupUuid="" visibility="1" zValue="0" referencePoint="0" id="">
-          <FrameColor green="0" red="0" blue="0" alpha="255"/>
-          <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+        <LayoutItem groupUuid="" positionLock="false" templateUuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" position="0,0,mm" uuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" frameJoinStyle="miter" id="" zValue="0" opacity="1" outlineWidthM="0.3,mm" positionOnPage="0,0,mm" background="true" type="65638" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" visibility="1" size="297,420,mm" blendMode="0">
+          <FrameColor blue="0" alpha="255" red="0" green="0"/>
+          <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
@@ -12785,15 +13118,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem title="" outlineWidthM="0.3,mm" blendMode="0" background="true" fontColor="#000000" referencePoint="0" itemRotation="0" size="21.6797,27,mm" frame="false" titleAlignment="1" opacity="1" columnCount="1" equalColumnWidth="1" templateUuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" rasterBorderColor="0,0,0,255" excludeFromExports="0" wmsLegendHeight="25" uuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" resizeToContents="1" map_uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" boxSpace="2" frameJoinStyle="miter" rasterBorderWidth="0" positionLock="true" wmsLegendWidth="50" symbolHeight="4" symbolWidth="7" type="65642" legendFilterByAtlas="0" splitLayer="0" rasterBorder="1" symbolAlignment="1" groupUuid="" visibility="1" zValue="8" lineSpacing="1" columnSpace="2" id="" wrapChar="" positionOnPage="15.6525,12.5708,mm" position="15.6525,12.5708,mm">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem title="" fontColor="#000000" lineSpacing="1" templateUuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" outlineWidthM="0.3,mm" symbolWidth="7" opacity="1" symbolAlignment="1" positionOnPage="15.6525,12.5708,mm" type="65642" position="15.6525,12.5708,mm" splitLayer="0" positionLock="true" rasterBorderWidth="0" wmsLegendHeight="25" id="" wmsLegendWidth="50" visibility="1" size="21.6797,27,mm" zValue="8" frameJoinStyle="miter" rasterBorderColor="0,0,0,255" itemRotation="0" wrapChar="" symbolHeight="4" columnCount="1" titleAlignment="1" equalColumnWidth="1" map_uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" boxSpace="2" rasterBorder="1" columnSpace="2" referencePoint="0" legendFilterByAtlas="0" groupUuid="" blendMode="0" uuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" frame="false" resizeToContents="1" background="true" excludeFromExports="0">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
@@ -12805,21 +13138,21 @@ def my_form_open(dialog, layer, feature):
           <style name="group" alignment="1">
             <styleFont description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
-          <style name="subgroup" marginTop="1" alignment="1">
+          <style name="subgroup" alignment="1" marginTop="1">
             <styleFont description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
-          <style name="symbol" marginTop="2" alignment="1">
+          <style name="symbol" alignment="1" marginTop="2">
             <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
           </style>
-          <style marginLeft="2" name="symbolLabel" marginTop="2" alignment="1">
+          <style name="symbolLabel" alignment="1" marginLeft="2" marginTop="2">
             <styleFont description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties/>
-          <layer-tree-group expanded="1" checked="Qt::Checked" name="Routes">
+          <layer-tree-group expanded="1" name="Routes" checked="Qt::Checked">
             <customproperties/>
-            <layer-tree-layer providerKey="ogr" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" checked="Qt::Checked" source="./all_routes.shp|layername=all_routes" name="all_routes">
+            <layer-tree-layer source="./all_routes.shp|layername=all_routes" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" name="all_routes" checked="Qt::Checked" providerKey="ogr">
               <customproperties>
                 <property key="legend/node-order" value="1,2,3"/>
                 <property key="legend/title-style" value="hidden"/>
@@ -12829,151 +13162,151 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem size="45.1194,7.36972,mm" valign="64" outlineWidthM="0.3,mm" opacity="1" positionOnPage="5.69321,399.106,mm" templateUuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="MARSHAL POSITIONS" position="5.69321,399.106,mm" groupUuid="" htmlState="0" visibility="1" zValue="7" referencePoint="0" marginY="1" id="" marginX="1" halign="1">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="true" templateUuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" valign="64" position="5.69321,399.106,mm" uuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" frameJoinStyle="miter" id="" zValue="7" opacity="1" outlineWidthM="0.3,mm" positionOnPage="5.69321,399.106,mm" background="false" halign="1" type="65641" marginX="1" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" visibility="1" size="45.1194,7.36972,mm" htmlState="0" labelText="MARSHAL POSITIONS" blendMode="0" marginY="1">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <FontColor blue="0" alpha="255" red="0" green="0"/>
       </LayoutItem>
-      <LayoutItem size="16.2476,7.80192,mm" valign="32" outlineWidthM="0.3,mm" opacity="1" positionOnPage="5.69321,406.988,mm" templateUuid="{619c5aac-2a47-4730-9726-57b172205ef7}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{619c5aac-2a47-4730-9726-57b172205ef7}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="Page [% &quot;page&quot; %]" position="5.69321,406.988,mm" groupUuid="" htmlState="0" visibility="1" zValue="6" referencePoint="0" marginY="1" id="" marginX="1" halign="1">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="true" templateUuid="{619c5aac-2a47-4730-9726-57b172205ef7}" valign="32" position="5.69321,406.988,mm" uuid="{619c5aac-2a47-4730-9726-57b172205ef7}" frameJoinStyle="miter" id="" zValue="6" opacity="1" outlineWidthM="0.3,mm" positionOnPage="5.69321,406.988,mm" background="false" halign="1" type="65641" marginX="1" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" visibility="1" size="16.2476,7.80192,mm" htmlState="0" labelText="Page [% &quot;page&quot; %]" blendMode="0" marginY="1">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <FontColor blue="0" alpha="255" red="0" green="0"/>
       </LayoutItem>
-      <LayoutItem size="27.7839,7.51682,mm" valign="32" outlineWidthM="0.3,mm" opacity="1" positionOnPage="214.292,406.988,mm" templateUuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="REVISION 1.2" position="214.292,406.988,mm" groupUuid="" htmlState="0" visibility="1" zValue="5" referencePoint="0" marginY="1" id="" marginX="1" halign="2">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="true" templateUuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" valign="32" position="214.292,406.988,mm" uuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" frameJoinStyle="miter" id="" zValue="5" opacity="1" outlineWidthM="0.3,mm" positionOnPage="214.292,406.988,mm" background="false" halign="2" type="65641" marginX="1" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" visibility="1" size="27.7839,7.51682,mm" htmlState="0" labelText="REVISION 1.2" blendMode="0" marginY="1">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <FontColor blue="0" alpha="255" red="0" green="0"/>
       </LayoutItem>
-      <LayoutItem size="56.3557,7.36902,mm" valign="64" outlineWidthM="0.3,mm" opacity="1" positionOnPage="185.72,399.107,mm" templateUuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="Sunday, 20 October 2019" position="185.72,399.107,mm" groupUuid="" htmlState="0" visibility="1" zValue="4" referencePoint="0" marginY="1" id="" marginX="1" halign="2">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="true" templateUuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" valign="64" position="185.72,399.107,mm" uuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" frameJoinStyle="miter" id="" zValue="4" opacity="1" outlineWidthM="0.3,mm" positionOnPage="185.72,399.107,mm" background="false" halign="2" type="65641" marginX="1" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" visibility="1" size="56.3557,7.36902,mm" htmlState="0" labelText="Sunday, 20 October 2019" blendMode="0" marginY="1">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <FontColor blue="0" alpha="255" red="0" green="0"/>
       </LayoutItem>
-      <LayoutItem size="49.3143,31.2967,mm" mapUuid="" outlineWidthM="0.3,mm" opacity="1" positionOnPage="243.319,382.696,mm" resizeMode="0" northOffset="0" templateUuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" frame="false" pictureWidth="49.3143" anchorPoint="8" pictureHeight="28.8527" pictureRotation="0" svgBorderColor="0,0,0,255" blendMode="0" svgFillColor="255,255,255,255" frameJoinStyle="miter" background="false" uuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" positionLock="true" svgBorderWidth="0.2" type="65640" itemRotation="0" excludeFromExports="0" position="243.319,382.696,mm" file="../Gun_Run_Logo.png" northMode="0" groupUuid="" visibility="1" zValue="3" referencePoint="0" id="">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" file="../Gun_Run_Logo.png" pictureHeight="28.8527" resizeMode="0" svgFillColor="255,255,255,255" positionLock="true" templateUuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" position="243.319,382.696,mm" uuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" northMode="0" frameJoinStyle="miter" id="" northOffset="0" zValue="3" opacity="1" outlineWidthM="0.3,mm" positionOnPage="243.319,382.696,mm" background="false" pictureRotation="0" type="65640" excludeFromExports="0" itemRotation="0" frame="false" mapUuid="" referencePoint="0" svgBorderWidth="0.2" visibility="1" size="49.3143,31.2967,mm" svgBorderColor="0,0,0,255" pictureWidth="49.3143" blendMode="0" anchorPoint="8">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value=""/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem size="236.083,0.14328,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" cornerRadiusMeasure="0,mm" positionOnPage="5.84321,406.626,mm" templateUuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" positionLock="true" type="65643" itemRotation="0" excludeFromExports="0" position="5.84321,406.626,mm" groupUuid="" visibility="1" zValue="2" referencePoint="0" id="">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="true" templateUuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" position="5.84321,406.626,mm" uuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" frameJoinStyle="miter" id="" zValue="2" opacity="1" outlineWidthM="0.3,mm" positionOnPage="5.84321,406.626,mm" shapeType="1" background="false" type="65643" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" cornerRadiusMeasure="0,mm" visibility="1" size="236.083,0.14328,mm" blendMode="0">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol alpha="1" force_rhr="0" type="fill" clip_to_extent="1" name="">
+          <layer locked="0" enabled="1" pass="0" 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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="solid"/>
+            <prop k="outline_width" v="0.3"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem size="286.94,392.396,mm" outlineWidthM="0.3,mm" opacity="1" positionOnPage="5.03,5.9483,mm" templateUuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" frame="false" blendMode="0" frameJoinStyle="miter" labelMargin="0,mm" background="true" uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" mapFlags="0" positionLock="true" followPresetName="Marshal overview" type="65639" itemRotation="0" excludeFromExports="0" position="5.03,5.9483,mm" groupUuid="" visibility="1" zValue="1" referencePoint="0" drawCanvasItems="false" mapRotation="0" id="" keepLayerSet="false" followPreset="true">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="true" templateUuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" mapRotation="0" position="5.03,5.9483,mm" uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" frameJoinStyle="miter" id="" zValue="1" opacity="1" outlineWidthM="0.3,mm" positionOnPage="5.03,5.9483,mm" keepLayerSet="false" followPresetName="Marshal overview" mapFlags="0" background="true" type="65639" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" drawCanvasItems="false" visibility="1" size="286.94,392.396,mm" followPreset="true" labelMargin="0,mm" blendMode="0">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="field" value=""/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="field" value=""/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="field" value=""/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
@@ -12990,43 +13323,43 @@ def my_form_open(dialog, layer, feature):
         <property key="pdfIncludeMetadata" value="1"/>
         <property key="pdfTextFormat" value="0"/>
       </customproperties>
-      <Atlas coverageLayerName="marshal_overviews" hideCoverage="1" sortFeatures="1" pageNameExpression="&quot;page&quot;" filenamePattern="'output_'||@atlas_featurenumber" sortKey="page" filterFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" enabled="1" sortAscending="1" coverageLayerProvider="ogr"/>
+      <Atlas coverageLayerSource="/home/tim/Documents/GunRunMaps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" coverageLayerName="marshal_overviews" sortAscending="1" enabled="1" sortKey="page" coverageLayerProvider="ogr" filterFeatures="0" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" pageNameExpression="&quot;page&quot;"/>
     </Layout>
     <Layout worldFileMap="" name="Start &amp; Finish Backgrounds" units="mm" printResolution="300">
-      <Snapper snapToItems="1" tolerance="5" snapToGrid="0" snapToGuides="1"/>
-      <Grid offsetY="0" resUnits="mm" offsetX="0" resolution="10" offsetUnits="mm"/>
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetUnits="mm" offsetY="0" offsetX="0" resolution="10"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol alpha="1" force_rhr="0" type="fill" clip_to_extent="1" name="">
+          <layer locked="0" enabled="1" pass="0" 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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="no"/>
+            <prop k="outline_width" v="0.26"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem size="297,210,mm" outlineWidthM="0.3,mm" opacity="1" positionOnPage="0,0,mm" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" frame="false" blendMode="0" frameJoinStyle="miter" background="true" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" positionLock="false" type="65638" itemRotation="0" excludeFromExports="0" position="0,0,mm" groupUuid="" visibility="1" zValue="0" referencePoint="0" id="">
-          <FrameColor green="0" red="0" blue="0" alpha="255"/>
-          <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+        <LayoutItem groupUuid="" positionLock="false" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" position="0,0,mm" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" frameJoinStyle="miter" id="" zValue="0" opacity="1" outlineWidthM="0.3,mm" positionOnPage="0,0,mm" background="true" type="65638" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" visibility="1" size="297,210,mm" blendMode="0">
+          <FrameColor blue="0" alpha="255" red="0" green="0"/>
+          <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
@@ -13034,151 +13367,151 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem size="9.45865,11,mm" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" outlineWidthM="0.3,mm" opacity="1" positionOnPage="286.027,2,mm" resizeMode="0" northOffset="0" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" frame="false" pictureWidth="6.31767" anchorPoint="0" pictureHeight="7.97477" pictureRotation="330" svgBorderColor="0,0,0,255" blendMode="0" svgFillColor="255,255,255,255" frameJoinStyle="miter" background="false" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" positionLock="true" svgBorderWidth="0.2" type="65640" itemRotation="0" excludeFromExports="0" position="286.027,2,mm" file="arrows/NorthArrow_11.svg" northMode="0" groupUuid="" visibility="1" zValue="4" referencePoint="0" id="">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" file="arrows/NorthArrow_11.svg" pictureHeight="7.97477" resizeMode="0" svgFillColor="255,255,255,255" positionLock="true" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" position="286.027,2,mm" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" northMode="0" frameJoinStyle="miter" id="" northOffset="0" zValue="4" opacity="1" outlineWidthM="0.3,mm" positionOnPage="286.027,2,mm" background="false" pictureRotation="330" type="65640" excludeFromExports="0" itemRotation="0" frame="false" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" referencePoint="0" svgBorderWidth="0.2" visibility="1" size="9.45865,11,mm" svgBorderColor="0,0,0,255" pictureWidth="6.31767" blendMode="0" anchorPoint="0">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value=""/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem size="142.543,10.3185,mm" valign="64" outlineWidthM="0.3,mm" opacity="1" positionOnPage="285.027,205.886,mm" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" positionLock="true" type="65641" itemRotation="270" excludeFromExports="0" labelText="[%upper( &quot;area&quot; )%]" position="285.027,205.886,mm" groupUuid="" htmlState="0" visibility="1" zValue="3" referencePoint="0" marginY="1" id="" marginX="1" halign="1">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="true" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" valign="64" position="285.027,205.886,mm" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" frameJoinStyle="miter" id="" zValue="3" opacity="1" outlineWidthM="0.3,mm" positionOnPage="285.027,205.886,mm" background="false" halign="1" type="65641" marginX="1" excludeFromExports="0" itemRotation="270" frame="false" referencePoint="0" visibility="1" size="142.543,10.3185,mm" htmlState="0" labelText="[%upper( &quot;area&quot; )%]" blendMode="0" marginY="1">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <FontColor blue="0" alpha="255" red="0" green="0"/>
       </LayoutItem>
-      <LayoutItem height="3" outlineWidthM="0.3,mm" blendMode="0" background="false" minBarWidth="50" style="Single Box" referencePoint="0" itemRotation="0" lineJoinStyle="miter" size="155.102,16.2165,mm" unitType="meters" frame="false" opacity="1" segmentSizeMode="1" alignment="0" lineCapStyle="square" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" numSegments="4" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" excludeFromExports="0" boxContentSpace="1" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" labelBarSpace="3" frameJoinStyle="miter" positionLock="true" outlineWidth="0.3" maxBarWidth="150" type="65646" numMapUnitsPerScaleBarUnit="1" groupUuid="" visibility="1" zValue="2" numSegmentsLeft="2" numUnitsPerSegment="90" segmentMillimeters="28.5458" unitLabel="m" id="" positionOnPage="7,189.669,mm" position="7,189.669,mm">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" outlineWidthM="0.3,mm" numMapUnitsPerScaleBarUnit="1" numUnitsPerSegment="90" opacity="1" positionOnPage="7,189.669,mm" type="65646" minBarWidth="50" position="7,189.669,mm" alignment="0" numSegmentsLeft="2" positionLock="true" height="3" lineJoinStyle="miter" lineCapStyle="square" id="" visibility="1" segmentSizeMode="1" size="155.102,16.2165,mm" unitLabel="m" maxBarWidth="150" zValue="2" frameJoinStyle="miter" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" boxContentSpace="1" unitType="meters" itemRotation="0" style="Single Box" referencePoint="0" groupUuid="" numSegments="4" blendMode="0" outlineWidth="0.3" segmentMillimeters="28.5458" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" frame="false" background="false" excludeFromExports="0" labelBarSpace="3">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <text-style fontItalic="0" fontWeight="50" blendMode="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontCapitals="0" fontSize="12" textColor="0,0,0,255" multilineHeight="1" namedStyle="" fontLetterSpacing="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" fontStrikeout="0" fontFamily="Myriad Pro">
-          <text-buffer bufferOpacity="1" bufferJoinStyle="128" bufferSize="1" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255"/>
-          <background shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeType="0" shapeRadiiY="0" shapeBlendMode="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="0" shapeRadiiX="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-          <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+        <text-style fontSizeUnit="Point" fontWordSpacing="0" textOpacity="1" fontStrikeout="0" fontFamily="Myriad Pro" fontItalic="0" fontWeight="50" fontSize="12" textColor="0,0,0,255" fontLetterSpacing="0" multilineHeight="1" namedStyle="" fontUnderline="0" fontCapitals="0" blendMode="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+          <text-buffer bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0"/>
+          <background shapeSizeType="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeType="0" shapeDraw="0" shapeBorderColor="128,128,128,255" shapeOpacity="1" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetX="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeBlendMode="0" shapeJoinStyle="64" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowUnder="0" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowDraw="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowScale="100"/>
         </text-style>
-        <fillColor green="0" red="0" blue="0" alpha="255"/>
-        <fillColor2 green="255" red="255" blue="255" alpha="255"/>
-        <strokeColor green="0" red="0" blue="0" alpha="255"/>
+        <fillColor blue="0" alpha="255" red="0" green="0"/>
+        <fillColor2 blue="255" alpha="255" red="255" green="255"/>
+        <strokeColor blue="0" alpha="255" red="0" green="0"/>
       </LayoutItem>
-      <LayoutItem size="278.027,180.318,mm" outlineWidthM="0.3,mm" opacity="1" positionOnPage="7,5.5,mm" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" frame="false" blendMode="0" frameJoinStyle="miter" labelMargin="0,mm" background="false" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" mapFlags="0" positionLock="true" followPresetName="Start/Finish" type="65639" itemRotation="0" excludeFromExports="0" position="7,5.5,mm" groupUuid="" visibility="1" zValue="1" referencePoint="0" drawCanvasItems="false" mapRotation="330" id="" keepLayerSet="false" followPreset="true">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="true" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" mapRotation="330" position="7,5.5,mm" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" frameJoinStyle="miter" id="" zValue="1" opacity="1" outlineWidthM="0.3,mm" positionOnPage="7,5.5,mm" keepLayerSet="false" followPresetName="Start/Finish" mapFlags="0" background="false" type="65639" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" drawCanvasItems="false" visibility="1" size="278.027,180.318,mm" followPreset="true" labelMargin="0,mm" blendMode="0">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapRotation">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="rotation" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="field" value="rotation"/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="id" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="field" value="id"/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
                 <Option type="Map" name="dataDefinedRotation">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="angle" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="field" value="angle"/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <Extent ymin="-33.90494830469008747" xmin="18.40843143571575169" xmax="18.41790915398017958" ymax="-33.89880140828828559"/>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" topAnnotationPosition="1" rightFrameDivisions="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" gridFramePenThickness="0.5" unit="1" rightAnnotationPosition="1" leftAnnotationDirection="0" topAnnotationDisplay="3" gridFrameSideFlags="15" leftAnnotationDisplay="3" crossLength="3" topFrameDivisions="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" bottomAnnotationDisplay="3" gridFrameMargin="0" gridFramePenColor="0,0,0,255" show="0" showAnnotation="0" intervalX="5" topAnnotationDirection="0" frameAnnotationDistance="1" leftFrameDivisions="0" frameFillColor2="0,0,0,255" annotationFormat="4" intervalY="5" rightAnnotationDisplay="3" annotationFontColor="0,0,0,255" gridFrameStyle="0" gridFrameWidth="2" gridStyle="0" rightAnnotationDirection="0" annotationExpression="" offsetX="0" bottomAnnotationPosition="1" annotationPrecision="3" name="Grid 1" offsetY="0" leftAnnotationPosition="1" position="3">
+        <ComposerMapGrid unit="1" gridFrameSideFlags="15" bottomAnnotationDisplay="3" frameFillColor2="0,0,0,255" offsetY="0" gridFrameWidth="2" annotationFontColor="0,0,0,255" intervalY="5" frameAnnotationDistance="1" annotationFormat="4" position="3" rightAnnotationDirection="0" name="Grid 1" annotationExpression="" bottomFrameDivisions="0" topAnnotationPosition="1" gridStyle="0" topFrameDivisions="0" crossLength="3" leftAnnotationPosition="1" gridFramePenThickness="0.5" topAnnotationDirection="0" showAnnotation="0" rightAnnotationDisplay="3" bottomAnnotationDirection="0" leftAnnotationDirection="0" intervalX="5" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" bottomAnnotationPosition="1" gridFrameStyle="0" topAnnotationDisplay="3" show="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" rightFrameDivisions="0" offsetX="0" leftAnnotationDisplay="3" blendMode="0" leftFrameDivisions="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" annotationPrecision="3">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="195,195,195,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <symbol alpha="1" force_rhr="0" type="line" clip_to_extent="1" name="">
+              <layer locked="0" enabled="1" pass="0" class="SimpleLine">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="195,195,195,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol alpha="1" force_rhr="0" type="marker" clip_to_extent="1" name="">
+              <layer locked="0" enabled="1" pass="0" class="SimpleMarker">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -13222,43 +13555,43 @@ def my_form_open(dialog, layer, feature):
         <property key="svgIncludeMetadata" value="1"/>
         <property key="svgTextFormat" value="0"/>
       </customproperties>
-      <Atlas coverageLayerName="start_finish_area" hideCoverage="1" sortFeatures="1" pageNameExpression="&quot;area&quot;" filenamePattern="'output_'||@atlas_featurenumber" sortKey="area" filterFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/start_finish_area.shp" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" enabled="1" sortAscending="1" coverageLayerProvider="ogr"/>
+      <Atlas coverageLayerSource="/home/tim/Documents/GunRunMaps/GIS Base Map/start_finish_area.shp" coverageLayerName="start_finish_area" sortAscending="1" enabled="1" sortKey="area" coverageLayerProvider="ogr" filterFeatures="0" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" pageNameExpression="&quot;area&quot;"/>
     </Layout>
     <Layout worldFileMap="" name="Fencing" units="mm" printResolution="300">
-      <Snapper snapToItems="1" tolerance="5" snapToGrid="0" snapToGuides="1"/>
-      <Grid offsetY="0" resUnits="mm" offsetX="0" resolution="10" offsetUnits="mm"/>
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetUnits="mm" offsetY="0" offsetX="0" resolution="10"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol alpha="1" force_rhr="0" type="fill" clip_to_extent="1" name="">
+          <layer locked="0" enabled="1" pass="0" 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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="no"/>
+            <prop k="outline_width" v="0.26"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem size="297,210,mm" outlineWidthM="0.3,mm" opacity="1" positionOnPage="0,0,mm" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" frame="false" blendMode="0" frameJoinStyle="miter" background="true" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" positionLock="false" type="65638" itemRotation="0" excludeFromExports="0" position="0,0,mm" groupUuid="" visibility="1" zValue="0" referencePoint="0" id="">
-          <FrameColor green="0" red="0" blue="0" alpha="255"/>
-          <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+        <LayoutItem groupUuid="" positionLock="false" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" position="0,0,mm" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" frameJoinStyle="miter" id="" zValue="0" opacity="1" outlineWidthM="0.3,mm" positionOnPage="0,0,mm" background="true" type="65638" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" visibility="1" size="297,210,mm" blendMode="0">
+          <FrameColor blue="0" alpha="255" red="0" green="0"/>
+          <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
@@ -13266,189 +13599,189 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem size="148.46,7.36972,mm" valign="64" outlineWidthM="0.3,mm" opacity="1" positionOnPage="6.76779,190.27,mm" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="FENCING: [% &quot;name&quot; %]" position="6.76779,190.27,mm" groupUuid="" htmlState="0" visibility="1" zValue="11" referencePoint="0" marginY="1" id="" marginX="1" halign="1">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="true" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" valign="64" position="6.76779,190.27,mm" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" frameJoinStyle="miter" id="" zValue="11" opacity="1" outlineWidthM="0.3,mm" positionOnPage="6.76779,190.27,mm" background="false" halign="1" type="65641" marginX="1" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" visibility="1" size="148.46,7.36972,mm" htmlState="0" labelText="FENCING: [% &quot;name&quot; %]" blendMode="0" marginY="1">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <FontColor blue="0" alpha="255" red="0" green="0"/>
       </LayoutItem>
-      <LayoutItem size="27.7839,7.51682,mm" valign="32" outlineWidthM="0.3,mm" opacity="1" positionOnPage="211.295,197.64,mm" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="REVISION 2.6" position="211.295,197.64,mm" groupUuid="" htmlState="0" visibility="1" zValue="10" referencePoint="0" marginY="1" id="" marginX="1" halign="2">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="true" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" valign="32" position="211.295,197.64,mm" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" frameJoinStyle="miter" id="" zValue="10" opacity="1" outlineWidthM="0.3,mm" positionOnPage="211.295,197.64,mm" background="false" halign="2" type="65641" marginX="1" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" visibility="1" size="27.7839,7.51682,mm" htmlState="0" labelText="REVISION 2.7" blendMode="0" marginY="1">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <FontColor blue="0" alpha="255" red="0" green="0"/>
       </LayoutItem>
-      <LayoutItem size="67.0856,7.80192,mm" valign="32" outlineWidthM="0.3,mm" opacity="1" positionOnPage="115.637,198.083,mm" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" position="115.637,198.083,mm" groupUuid="" htmlState="0" visibility="1" zValue="9" referencePoint="0" marginY="1" id="" marginX="1" halign="1">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="true" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" valign="32" position="115.637,198.083,mm" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" frameJoinStyle="miter" id="" zValue="9" opacity="1" outlineWidthM="0.3,mm" positionOnPage="115.637,198.083,mm" background="false" halign="1" type="65641" marginX="1" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" visibility="1" size="67.0856,7.80192,mm" htmlState="0" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" blendMode="0" marginY="1">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <FontColor blue="0" alpha="255" red="0" green="0"/>
       </LayoutItem>
-      <LayoutItem size="53.0017,7.80192,mm" valign="32" outlineWidthM="0.3,mm" opacity="1" positionOnPage="59.5581,198.083,mm" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" position="59.5581,198.083,mm" groupUuid="" htmlState="0" visibility="1" zValue="8" referencePoint="0" marginY="1" id="" marginX="1" halign="1">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="true" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" valign="32" position="59.5581,198.083,mm" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" frameJoinStyle="miter" id="" zValue="8" opacity="1" outlineWidthM="0.3,mm" positionOnPage="59.5581,198.083,mm" background="false" halign="1" type="65641" marginX="1" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" visibility="1" size="53.0017,7.80192,mm" htmlState="0" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" blendMode="0" marginY="1">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <FontColor blue="0" alpha="255" red="0" green="0"/>
       </LayoutItem>
-      <LayoutItem size="52.7903,7.80192,mm" valign="32" outlineWidthM="0.3,mm" opacity="1" positionOnPage="6.76779,198.083,mm" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="Page [% @atlas_featurenumber %]" position="6.76779,198.083,mm" groupUuid="" htmlState="0" visibility="1" zValue="7" referencePoint="0" marginY="1" id="" marginX="1" halign="1">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="true" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" valign="32" position="6.76779,198.083,mm" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" frameJoinStyle="miter" id="" zValue="7" opacity="1" outlineWidthM="0.3,mm" positionOnPage="6.76779,198.083,mm" background="false" halign="1" type="65641" marginX="1" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" visibility="1" size="52.7903,7.80192,mm" htmlState="0" labelText="Page [% @atlas_featurenumber %]" blendMode="0" marginY="1">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <FontColor blue="0" alpha="255" red="0" green="0"/>
       </LayoutItem>
-      <LayoutItem size="49.3143,29.8354,mm" mapUuid="" outlineWidthM="0.3,mm" opacity="1" positionOnPage="243.098,175.353,mm" resizeMode="0" northOffset="0" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" frame="false" pictureWidth="49.3143" anchorPoint="8" pictureHeight="28.8527" pictureRotation="0" svgBorderColor="0,0,0,255" blendMode="0" svgFillColor="255,255,255,255" frameJoinStyle="miter" background="false" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" positionLock="true" svgBorderWidth="0.2" type="65640" itemRotation="0" excludeFromExports="0" position="243.098,175.353,mm" file="../Gun_Run_Logo.png" northMode="0" groupUuid="" visibility="1" zValue="6" referencePoint="0" id="">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" file="../Gun_Run_Logo.png" pictureHeight="28.8527" resizeMode="0" svgFillColor="255,255,255,255" positionLock="true" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" position="243.098,175.353,mm" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" northMode="0" frameJoinStyle="miter" id="" northOffset="0" zValue="6" opacity="1" outlineWidthM="0.3,mm" positionOnPage="243.098,175.353,mm" background="false" pictureRotation="0" type="65640" excludeFromExports="0" itemRotation="0" frame="false" mapUuid="" referencePoint="0" svgBorderWidth="0.2" visibility="1" size="49.3143,29.8354,mm" svgBorderColor="0,0,0,255" pictureWidth="49.3143" blendMode="0" anchorPoint="8">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value=""/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem size="56.3557,7.36902,mm" valign="64" outlineWidthM="0.3,mm" opacity="1" positionOnPage="182.723,190.271,mm" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="Sunday, 20 October 2019" position="182.723,190.271,mm" groupUuid="" htmlState="0" visibility="1" zValue="5" referencePoint="0" marginY="1" id="" marginX="1" halign="2">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="true" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" valign="64" position="182.723,190.271,mm" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" frameJoinStyle="miter" id="" zValue="5" opacity="1" outlineWidthM="0.3,mm" positionOnPage="182.723,190.271,mm" background="false" halign="2" type="65641" marginX="1" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" visibility="1" size="56.3557,7.36902,mm" htmlState="0" labelText="Sunday, 20 October 2019" blendMode="0" marginY="1">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <FontColor blue="0" alpha="255" red="0" green="0"/>
       </LayoutItem>
-      <LayoutItem size="232.01,0.14328,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" cornerRadiusMeasure="0,mm" positionOnPage="6.91779,197.79,mm" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" positionLock="true" type="65643" itemRotation="0" excludeFromExports="0" position="6.91779,197.79,mm" groupUuid="" visibility="1" zValue="4" referencePoint="0" id="">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="true" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" position="6.91779,197.79,mm" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" frameJoinStyle="miter" id="" zValue="4" opacity="1" outlineWidthM="0.3,mm" positionOnPage="6.91779,197.79,mm" shapeType="1" background="false" type="65643" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" cornerRadiusMeasure="0,mm" visibility="1" size="232.01,0.14328,mm" blendMode="0">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol alpha="1" force_rhr="0" type="fill" clip_to_extent="1" name="">
+          <layer locked="0" enabled="1" pass="0" 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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="solid"/>
+            <prop k="outline_width" v="0.3"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem height="2" outlineWidthM="0.3,mm" blendMode="0" background="false" minBarWidth="25" style="Double Box" referencePoint="0" itemRotation="0" lineJoinStyle="round" size="100.798,15.8378,mm" unitType="meters" frame="false" opacity="1" segmentSizeMode="1" alignment="0" lineCapStyle="square" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" numSegments="2" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" excludeFromExports="0" boxContentSpace="0.2" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" labelBarSpace="1" frameJoinStyle="miter" positionLock="true" outlineWidth="0.2" maxBarWidth="100" type="65646" numMapUnitsPerScaleBarUnit="1" groupUuid="" visibility="1" zValue="3" numSegmentsLeft="2" numUnitsPerSegment="9" segmentMillimeters="30.7927" unitLabel="m" id="" positionOnPage="6.76779,2.8482,mm" position="6.76779,2.8482,mm">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" outlineWidthM="0.3,mm" numMapUnitsPerScaleBarUnit="1" numUnitsPerSegment="20" opacity="1" positionOnPage="6.76779,2.8482,mm" type="65646" minBarWidth="25" position="6.76779,2.8482,mm" alignment="0" numSegmentsLeft="2" positionLock="true" height="2" lineJoinStyle="round" lineCapStyle="square" id="" visibility="1" segmentSizeMode="1" size="78.3053,15.8378,mm" unitLabel="m" maxBarWidth="100" zValue="3" frameJoinStyle="miter" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" boxContentSpace="0.2" unitType="meters" itemRotation="0" style="Double Box" referencePoint="0" groupUuid="" numSegments="2" blendMode="0" outlineWidth="0.2" segmentMillimeters="22.9361" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" frame="false" background="false" excludeFromExports="0" labelBarSpace="1">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <text-style fontItalic="0" fontWeight="50" blendMode="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontCapitals="0" fontSize="12" textColor="0,0,0,255" multilineHeight="1" namedStyle="" fontLetterSpacing="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" fontStrikeout="0" fontFamily="Myriad Pro">
-          <text-buffer bufferOpacity="1" bufferJoinStyle="128" bufferSize="1" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255"/>
-          <background shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeType="0" shapeRadiiY="0" shapeBlendMode="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="0" shapeRadiiX="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-          <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+        <text-style fontSizeUnit="Point" fontWordSpacing="0" textOpacity="1" fontStrikeout="0" fontFamily="Myriad Pro" fontItalic="0" fontWeight="50" fontSize="12" textColor="0,0,0,255" fontLetterSpacing="0" multilineHeight="1" namedStyle="" fontUnderline="0" fontCapitals="0" blendMode="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+          <text-buffer bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0"/>
+          <background shapeSizeType="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeType="0" shapeDraw="0" shapeBorderColor="128,128,128,255" shapeOpacity="1" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetX="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeBlendMode="0" shapeJoinStyle="64" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowUnder="0" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowDraw="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowScale="100"/>
         </text-style>
-        <fillColor green="0" red="0" blue="0" alpha="255"/>
-        <fillColor2 green="255" red="255" blue="255" alpha="255"/>
-        <strokeColor green="0" red="0" blue="0" alpha="255"/>
+        <fillColor blue="0" alpha="255" red="0" green="0"/>
+        <fillColor2 blue="255" alpha="255" red="255" green="255"/>
+        <strokeColor blue="0" alpha="255" red="0" green="0"/>
       </LayoutItem>
-      <LayoutItem title="" outlineWidthM="0.3,mm" blendMode="0" background="true" fontColor="#000000" referencePoint="0" itemRotation="0" size="38.1563,54.9504,mm" frame="true" titleAlignment="1" opacity="1" columnCount="1" equalColumnWidth="1" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" rasterBorderColor="0,0,0,255" excludeFromExports="0" wmsLegendHeight="25" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" resizeToContents="0" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" boxSpace="2" frameJoinStyle="miter" rasterBorderWidth="0" positionLock="true" wmsLegendWidth="50" symbolHeight="4" symbolWidth="7" type="65642" legendFilterByAtlas="0" splitLayer="0" rasterBorder="1" symbolAlignment="1" groupUuid="" visibility="1" zValue="2" lineSpacing="1" columnSpace="2" id="" wrapChar="" positionOnPage="256.808,2.9982,mm" position="256.808,2.9982,mm">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem title="" fontColor="#000000" lineSpacing="1" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" outlineWidthM="0.3,mm" symbolWidth="7" opacity="1" symbolAlignment="1" positionOnPage="256.808,2.9982,mm" type="65642" position="256.808,2.9982,mm" splitLayer="0" positionLock="true" rasterBorderWidth="0" wmsLegendHeight="25" id="" wmsLegendWidth="50" visibility="1" size="38.1563,54.9504,mm" zValue="2" frameJoinStyle="miter" rasterBorderColor="0,0,0,255" itemRotation="0" wrapChar="" symbolHeight="4" columnCount="1" titleAlignment="1" equalColumnWidth="1" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" boxSpace="2" rasterBorder="1" columnSpace="2" referencePoint="0" legendFilterByAtlas="0" groupUuid="" blendMode="0" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" frame="true" resizeToContents="0" background="true" excludeFromExports="0">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
@@ -13457,24 +13790,24 @@ def my_form_open(dialog, layer, feature):
           <style name="title" alignment="1">
             <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" style="Bold"/>
           </style>
-          <style name="group" marginTop="3" alignment="1">
+          <style name="group" alignment="1" marginTop="3">
             <styleFont description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
-          <style name="subgroup" marginTop="3" alignment="1">
+          <style name="subgroup" alignment="1" marginTop="3">
             <styleFont description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
-          <style name="symbol" marginTop="2.5" alignment="1">
+          <style name="symbol" alignment="1" marginTop="2.5">
             <styleFont description="Myriad Pro,9,-1,5,50,0,0,0,0,0" style=""/>
           </style>
-          <style marginLeft="2" name="symbolLabel" marginTop="2" alignment="1">
+          <style name="symbolLabel" alignment="1" marginLeft="2" marginTop="2">
             <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties/>
-          <layer-tree-group expanded="1" checked="Qt::Checked" name="Fencing and Cones">
+          <layer-tree-group expanded="1" name="Fencing and Cones" checked="Qt::Checked">
             <customproperties/>
-            <layer-tree-layer providerKey="ogr" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" checked="Qt::Checked" source="./fencing.shp|layername=fencing" name="fencing">
+            <layer-tree-layer source="./fencing.shp|layername=fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" name="fencing" checked="Qt::Checked" providerKey="ogr">
               <customproperties>
                 <property key="expandedLegendNodes" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
                 <property key="legend/expressionFilter" value=""/>
@@ -13484,9 +13817,9 @@ def my_form_open(dialog, layer, feature):
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group expanded="1" checked="Qt::Checked" name="Routes">
+          <layer-tree-group expanded="1" name="Routes" checked="Qt::Checked">
             <customproperties/>
-            <layer-tree-layer providerKey="ogr" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" checked="Qt::Checked" source="./all_routes.shp|layername=all_routes" name="all_routes">
+            <layer-tree-layer source="./all_routes.shp|layername=all_routes" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" name="all_routes" checked="Qt::Checked" providerKey="ogr">
               <customproperties>
                 <property key="expandedLegendNodes"/>
                 <property key="legend/node-order" value="1,2,3"/>
@@ -13494,48 +13827,45 @@ def my_form_open(dialog, layer, feature):
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <custom-order enabled="0">
-            <item>fencing_70522fe0_a771_4170_98b2_d5843f62a7ab</item>
-            <item>all_routes_5833accf_77da_42ef_a24a_197208cd2190</item>
-          </custom-order>
+          <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem size="283.418,180.92,mm" outlineWidthM="0.3,mm" opacity="0.9" positionOnPage="6.76779,9.35102,mm" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" frame="false" blendMode="0" frameJoinStyle="miter" labelMargin="0,mm" background="false" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" mapFlags="0" positionLock="true" followPresetName="Fencing" type="65639" itemRotation="0" excludeFromExports="0" position="6.76779,9.35102,mm" groupUuid="" visibility="1" zValue="1" referencePoint="0" drawCanvasItems="false" mapRotation="0" id="" keepLayerSet="false" followPreset="true">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="true" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" mapRotation="0" position="6.76779,9.35102,mm" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" frameJoinStyle="miter" id="" zValue="1" opacity="0.9" outlineWidthM="0.3,mm" positionOnPage="6.76779,9.35102,mm" keepLayerSet="false" followPresetName="Fencing" mapFlags="0" background="false" type="65639" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" drawCanvasItems="false" visibility="1" size="283.418,180.92,mm" followPreset="true" labelMargin="0,mm" blendMode="0">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapRotation">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="expression"/>
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value=""/>
                   <Option type="Map" name="transformer">
                     <Option type="Map" name="d">
-                      <Option type="double" value="1" name="exponent"/>
-                      <Option type="double" value="360" name="maxOutput"/>
-                      <Option type="double" value="0" name="maxValue"/>
-                      <Option type="double" value="0" name="minOutput"/>
-                      <Option type="double" value="0" name="minValue"/>
-                      <Option type="double" value="0" name="nullOutput"/>
+                      <Option type="double" name="exponent" value="1"/>
+                      <Option type="double" name="maxOutput" value="360"/>
+                      <Option type="double" name="maxValue" value="0"/>
+                      <Option type="double" name="minOutput" value="0"/>
+                      <Option type="double" name="minValue" value="0"/>
+                      <Option type="double" name="nullOutput" value="0"/>
                     </Option>
-                    <Option type="int" value="0" name="t"/>
+                    <Option type="int" name="t" value="0"/>
                   </Option>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
                 <Option type="Map" name="dataDefinedRotation">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="angle" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="field" value="angle"/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent ymin="-33.90421228789515595" xmin="18.41635400827249569" xmax="18.41724965096048194" ymax="-33.90364055490629625"/>
+        <Extent ymin="-33.90700438237571035" xmin="18.40867869996568729" xmax="18.41135087214374622" ymax="-33.90529860282031649"/>
         <crs>
           <spatialrefsys>
             <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
@@ -13549,62 +13879,62 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" topAnnotationPosition="1" rightFrameDivisions="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" gridFramePenThickness="0.5" unit="1" rightAnnotationPosition="1" leftAnnotationDirection="0" topAnnotationDisplay="3" gridFrameSideFlags="15" leftAnnotationDisplay="3" crossLength="3" topFrameDivisions="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" bottomAnnotationDisplay="3" gridFrameMargin="0" gridFramePenColor="0,0,0,255" show="0" showAnnotation="0" intervalX="5" topAnnotationDirection="0" frameAnnotationDistance="1" leftFrameDivisions="0" frameFillColor2="0,0,0,255" annotationFormat="4" intervalY="5" rightAnnotationDisplay="3" annotationFontColor="0,0,0,255" gridFrameStyle="0" gridFrameWidth="2" gridStyle="0" rightAnnotationDirection="0" annotationExpression="" offsetX="0" bottomAnnotationPosition="1" annotationPrecision="3" name="Grid 1" offsetY="0" leftAnnotationPosition="1" position="3">
+        <ComposerMapGrid unit="1" gridFrameSideFlags="15" bottomAnnotationDisplay="3" frameFillColor2="0,0,0,255" offsetY="0" gridFrameWidth="2" annotationFontColor="0,0,0,255" intervalY="5" frameAnnotationDistance="1" annotationFormat="4" position="3" rightAnnotationDirection="0" name="Grid 1" annotationExpression="" bottomFrameDivisions="0" topAnnotationPosition="1" gridStyle="0" topFrameDivisions="0" crossLength="3" leftAnnotationPosition="1" gridFramePenThickness="0.5" topAnnotationDirection="0" showAnnotation="0" rightAnnotationDisplay="3" bottomAnnotationDirection="0" leftAnnotationDirection="0" intervalX="5" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" bottomAnnotationPosition="1" gridFrameStyle="0" topAnnotationDisplay="3" show="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" rightFrameDivisions="0" offsetX="0" leftAnnotationDisplay="3" blendMode="0" leftFrameDivisions="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" annotationPrecision="3">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="195,195,195,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <symbol alpha="1" force_rhr="0" type="line" clip_to_extent="1" name="">
+              <layer locked="0" enabled="1" pass="0" class="SimpleLine">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="195,195,195,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol alpha="1" force_rhr="0" type="marker" clip_to_extent="1" name="">
+              <layer locked="0" enabled="1" pass="0" class="SimpleMarker">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -13639,93 +13969,93 @@ def my_form_open(dialog, layer, feature):
         <property key="pdfTextFormat" value="0"/>
         <property key="rasterize" value="true"/>
       </customproperties>
-      <Atlas coverageLayerName="fence_groups" hideCoverage="1" sortFeatures="1" pageNameExpression="&quot;name&quot;" filenamePattern="'output_'||@atlas_featurenumber" sortKey="group" filterFeatures="0" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" coverageLayer="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" enabled="1" sortAscending="1" coverageLayerProvider="virtual"/>
+      <Atlas coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" coverageLayerName="fence_groups" sortAscending="1" enabled="1" sortKey="group" coverageLayerProvider="virtual" filterFeatures="0" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1" coverageLayer="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" pageNameExpression="&quot;name&quot;"/>
     </Layout>
     <Layout worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" name="Ask Me" units="mm" printResolution="144">
-      <Snapper snapToItems="1" tolerance="5" snapToGrid="0" snapToGuides="1"/>
-      <Grid offsetY="0" resUnits="mm" offsetX="0" resolution="9" offsetUnits="mm"/>
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetUnits="mm" offsetY="0" offsetX="0" resolution="9"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol alpha="1" force_rhr="0" type="fill" clip_to_extent="1" name="">
+          <layer locked="0" enabled="1" pass="0" 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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="no"/>
+            <prop k="outline_width" v="0.26"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem size="297,210,mm" outlineWidthM="0.3,mm" opacity="1" positionOnPage="0,0,mm" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" frame="false" blendMode="0" frameJoinStyle="miter" background="true" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" positionLock="false" type="65638" itemRotation="0" excludeFromExports="0" position="0,0,mm" groupUuid="" visibility="1" zValue="0" referencePoint="0" id="">
-          <FrameColor green="0" red="0" blue="0" alpha="255"/>
-          <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+        <LayoutItem groupUuid="" positionLock="false" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" position="0,0,mm" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" frameJoinStyle="miter" id="" zValue="0" opacity="1" outlineWidthM="0.3,mm" positionOnPage="0,0,mm" background="true" type="65638" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" visibility="1" size="297,210,mm" blendMode="0">
+          <FrameColor blue="0" alpha="255" red="0" green="0"/>
+          <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
           </LayoutObject>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" page="0" units="mm" position="0"/>
+          <Guide position="0" page="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem size="83.9998,10.4638,mm" valign="64" outlineWidthM="0.3,mm" opacity="1" positionOnPage="4.43449,186.634,mm" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" positionLock="false" type="65641" itemRotation="0" excludeFromExports="0" labelText="Directions to Start of Race" position="4.43449,186.634,mm" groupUuid="" htmlState="0" visibility="1" zValue="8" referencePoint="0" marginY="1" id="" marginX="1" halign="1">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="false" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" valign="64" position="4.43449,186.634,mm" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" frameJoinStyle="miter" id="" zValue="8" opacity="1" outlineWidthM="0.3,mm" positionOnPage="4.43449,186.634,mm" background="false" halign="1" type="65641" marginX="1" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" visibility="1" size="83.9998,10.4638,mm" htmlState="0" labelText="Directions to Start of Race" blendMode="0" marginY="1">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <FontColor blue="0" alpha="255" red="0" green="0"/>
       </LayoutItem>
-      <LayoutItem size="48.2923,9.511,mm" valign="32" outlineWidthM="0.3,mm" opacity="1" positionOnPage="4.43449,197.498,mm" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" positionLock="false" type="65641" itemRotation="0" excludeFromExports="0" labelText="Gun Run" position="4.43449,197.498,mm" groupUuid="" htmlState="0" visibility="1" zValue="7" referencePoint="0" marginY="1" id="" marginX="1" halign="1">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="false" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" valign="32" position="4.43449,197.498,mm" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" frameJoinStyle="miter" id="" zValue="7" opacity="1" outlineWidthM="0.3,mm" positionOnPage="4.43449,197.498,mm" background="false" halign="1" type="65641" marginX="1" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" visibility="1" size="48.2923,9.511,mm" htmlState="0" labelText="Gun Run" blendMode="0" marginY="1">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <FontColor blue="0" alpha="255" red="0" green="0"/>
       </LayoutItem>
-      <LayoutItem title="" outlineWidthM="0.3,mm" blendMode="0" background="true" fontColor="#000000" referencePoint="0" itemRotation="0" size="59.0766,76,mm" frame="true" titleAlignment="1" opacity="1" columnCount="1" equalColumnWidth="0" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" rasterBorderColor="0,0,0,255" excludeFromExports="0" wmsLegendHeight="25" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" resizeToContents="1" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" boxSpace="2" frameJoinStyle="round" rasterBorderWidth="0" positionLock="false" wmsLegendWidth="50" symbolHeight="5" symbolWidth="9" type="65642" legendFilterByAtlas="0" splitLayer="0" rasterBorder="1" symbolAlignment="1" groupUuid="" visibility="1" zValue="6" lineSpacing="2" legendFilterByMap="1" columnSpace="0" id="" wrapChar="" positionOnPage="10.096,10.8563,mm" position="10.096,10.8563,mm">
-        <FrameColor green="139" red="139" blue="139" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem title="" fontColor="#000000" lineSpacing="2" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" outlineWidthM="0.3,mm" symbolWidth="9" opacity="1" symbolAlignment="1" positionOnPage="10.096,10.8563,mm" type="65642" position="10.096,10.8563,mm" splitLayer="0" positionLock="false" rasterBorderWidth="0" wmsLegendHeight="25" id="" wmsLegendWidth="50" visibility="1" size="59.0766,76,mm" zValue="6" frameJoinStyle="round" rasterBorderColor="0,0,0,255" itemRotation="0" wrapChar="" symbolHeight="5" columnCount="1" titleAlignment="1" equalColumnWidth="0" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" legendFilterByMap="1" boxSpace="2" rasterBorder="1" columnSpace="0" referencePoint="0" legendFilterByAtlas="0" groupUuid="" blendMode="0" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" frame="true" resizeToContents="1" background="true" excludeFromExports="0">
+        <FrameColor blue="139" alpha="255" red="139" green="139"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
@@ -13740,20 +14070,20 @@ def my_form_open(dialog, layer, feature):
           <style name="subgroup" alignment="1">
             <styleFont description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
-          <style name="symbol" marginTop="2.5" alignment="1">
+          <style name="symbol" alignment="1" marginTop="2.5">
             <styleFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0" style=""/>
           </style>
-          <style marginLeft="3" name="symbolLabel" marginTop="2.5" alignment="1">
+          <style name="symbolLabel" alignment="1" marginLeft="3" marginTop="2.5">
             <styleFont description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties/>
-          <layer-tree-group expanded="1" checked="Qt::Checked" name="Ask Me">
+          <layer-tree-group expanded="1" name="Ask Me" checked="Qt::Checked">
             <customproperties>
               <property key="legend/title-style" value="hidden"/>
             </customproperties>
-            <layer-tree-layer providerKey="ogr" expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" checked="Qt::Checked" source="./poi_labels.shp|layername=poi_labels" name="poi_labels">
+            <layer-tree-layer source="./poi_labels.shp|layername=poi_labels" expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" name="poi_labels" checked="Qt::Checked" providerKey="ogr">
               <customproperties>
                 <property key="legend/label-0" value="Start/Finish"/>
                 <property key="legend/label-1" value="Toilets"/>
@@ -13764,7 +14094,7 @@ def my_form_open(dialog, layer, feature):
                 <property key="legend/title-style" value="hidden"/>
               </customproperties>
             </layer-tree-layer>
-            <layer-tree-layer providerKey="ogr" expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" checked="Qt::Checked" source="./directions_to_start.shp|layername=directions_to_start" name="directions_to_start">
+            <layer-tree-layer source="./directions_to_start.shp|layername=directions_to_start" expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" name="directions_to_start" checked="Qt::Checked" providerKey="ogr">
               <customproperties>
                 <property key="legend/label-0" value="To 21KM Start (06:30)"/>
                 <property key="legend/label-1" value="To 10KM Start (07:30)"/>
@@ -13776,119 +14106,119 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem size="27.7839,6.871,mm" valign="32" outlineWidthM="0.3,mm" opacity="1" positionOnPage="221.862,190.027,mm" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" positionLock="false" type="65641" itemRotation="0" excludeFromExports="0" labelText="REVISION 1.0" position="221.862,190.027,mm" groupUuid="" htmlState="0" visibility="1" zValue="5" referencePoint="0" marginY="1" id="" marginX="1" halign="2">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="false" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" valign="32" position="221.862,190.027,mm" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" frameJoinStyle="miter" id="" zValue="5" opacity="1" outlineWidthM="0.3,mm" positionOnPage="221.862,190.027,mm" background="false" halign="2" type="65641" marginX="1" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" visibility="1" size="27.7839,6.871,mm" htmlState="0" labelText="REVISION 1.0" blendMode="0" marginY="1">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <FontColor blue="0" alpha="255" red="0" green="0"/>
       </LayoutItem>
-      <LayoutItem size="51.6706,6.60801,mm" valign="64" outlineWidthM="0.3,mm" opacity="1" positionOnPage="197.975,197.498,mm" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" positionLock="false" type="65641" itemRotation="0" excludeFromExports="0" labelText="Sunday, 20 October 2019" position="197.975,197.498,mm" groupUuid="" htmlState="0" visibility="1" zValue="4" referencePoint="0" marginY="1" id="" marginX="1" halign="2">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="false" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" valign="64" position="197.975,197.498,mm" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" frameJoinStyle="miter" id="" zValue="4" opacity="1" outlineWidthM="0.3,mm" positionOnPage="197.975,197.498,mm" background="false" halign="2" type="65641" marginX="1" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" visibility="1" size="51.6706,6.60801,mm" htmlState="0" labelText="Sunday, 20 October 2019" blendMode="0" marginY="1">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <FontColor blue="0" alpha="255" red="0" green="0"/>
       </LayoutItem>
-      <LayoutItem size="42.9838,24.3824,mm" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" outlineWidthM="0.3,mm" opacity="1" positionOnPage="249.646,179.724,mm" resizeMode="0" northOffset="0" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" frame="false" pictureWidth="41.6737" anchorPoint="4" pictureHeight="24.3824" pictureRotation="0" svgBorderColor="0,0,0,255" blendMode="0" svgFillColor="255,255,255,255" frameJoinStyle="miter" background="false" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" positionLock="false" svgBorderWidth="0.2" type="65640" itemRotation="0" excludeFromExports="0" position="249.646,179.724,mm" file="../Gun_Run_Logo.png" northMode="0" groupUuid="" visibility="1" zValue="3" referencePoint="0" id="">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" file="../Gun_Run_Logo.png" pictureHeight="24.3824" resizeMode="0" svgFillColor="255,255,255,255" positionLock="false" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" position="249.646,179.724,mm" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" northMode="0" frameJoinStyle="miter" id="" northOffset="0" zValue="3" opacity="1" outlineWidthM="0.3,mm" positionOnPage="249.646,179.724,mm" background="false" pictureRotation="0" type="65640" excludeFromExports="0" itemRotation="0" frame="false" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" referencePoint="0" svgBorderWidth="0.2" visibility="1" size="42.9838,24.3824,mm" svgBorderColor="0,0,0,255" pictureWidth="41.6737" blendMode="0" anchorPoint="4">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value=""/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem size="244.912,0.1,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" cornerRadiusMeasure="0,mm" positionOnPage="4.58449,197.248,mm" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" positionLock="false" type="65643" itemRotation="0" excludeFromExports="0" position="4.58449,197.248,mm" groupUuid="" visibility="1" zValue="2" referencePoint="0" id="">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="false" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" position="4.58449,197.248,mm" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" frameJoinStyle="miter" id="" zValue="2" opacity="1" outlineWidthM="0.3,mm" positionOnPage="4.58449,197.248,mm" shapeType="1" background="false" type="65643" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" cornerRadiusMeasure="0,mm" visibility="1" size="244.912,0.1,mm" blendMode="0">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol alpha="1" force_rhr="0" type="fill" clip_to_extent="1" name="">
+          <layer locked="0" enabled="1" pass="0" 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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="solid"/>
+            <prop k="outline_width" v="0.3"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem size="288.007,183.616,mm" outlineWidthM="0.3,mm" opacity="1" positionOnPage="4.43449,6.411,mm" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" frame="false" blendMode="0" frameJoinStyle="miter" labelMargin="0,mm" background="true" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" mapFlags="0" positionLock="false" followPresetName="Ask Me" type="65639" itemRotation="0" excludeFromExports="0" position="4.43449,6.411,mm" groupUuid="" visibility="1" zValue="1" referencePoint="0" drawCanvasItems="false" mapRotation="0" id="" keepLayerSet="false" followPreset="true">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="false" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" mapRotation="0" position="4.43449,6.411,mm" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" frameJoinStyle="miter" id="" zValue="1" opacity="1" outlineWidthM="0.3,mm" positionOnPage="4.43449,6.411,mm" keepLayerSet="false" followPresetName="Ask Me" mapFlags="0" background="true" type="65639" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" drawCanvasItems="false" visibility="1" size="288.007,183.616,mm" followPreset="true" labelMargin="0,mm" blendMode="0">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="int" value="1" name="type"/>
-                  <Option type="QString" value="" name="val"/>
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="int" name="type" value="1"/>
+                  <Option type="QString" name="val" value=""/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="int" value="1" name="type"/>
-                  <Option type="QString" value="" name="val"/>
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="int" name="type" value="1"/>
+                  <Option type="QString" name="val" value=""/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="int" value="1" name="type"/>
-                  <Option type="QString" value="" name="val"/>
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="int" name="type" value="1"/>
+                  <Option type="QString" name="val" value=""/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
@@ -13907,62 +14237,62 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" topAnnotationPosition="1" rightFrameDivisions="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" gridFramePenThickness="0.5" unit="0" rightAnnotationPosition="1" leftAnnotationDirection="0" topAnnotationDisplay="0" gridFrameSideFlags="15" leftAnnotationDisplay="0" crossLength="3" topFrameDivisions="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" bottomAnnotationDisplay="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" show="0" showAnnotation="0" intervalX="0" topAnnotationDirection="0" frameAnnotationDistance="1" leftFrameDivisions="0" frameFillColor2="0,0,0,255" annotationFormat="0" intervalY="0" rightAnnotationDisplay="0" annotationFontColor="0,0,0,255" gridFrameStyle="0" gridFrameWidth="2" gridStyle="0" rightAnnotationDirection="0" annotationExpression="" offsetX="0" bottomAnnotationPosition="1" annotationPrecision="3" name="Grid 1" offsetY="0" leftAnnotationPosition="1" position="3">
+        <ComposerMapGrid unit="0" gridFrameSideFlags="15" bottomAnnotationDisplay="0" frameFillColor2="0,0,0,255" offsetY="0" gridFrameWidth="2" annotationFontColor="0,0,0,255" intervalY="0" frameAnnotationDistance="1" annotationFormat="0" position="3" rightAnnotationDirection="0" name="Grid 1" annotationExpression="" bottomFrameDivisions="0" topAnnotationPosition="1" gridStyle="0" topFrameDivisions="0" crossLength="3" leftAnnotationPosition="1" gridFramePenThickness="0.5" topAnnotationDirection="0" showAnnotation="0" rightAnnotationDisplay="0" bottomAnnotationDirection="0" leftAnnotationDirection="0" intervalX="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" bottomAnnotationPosition="1" gridFrameStyle="0" topAnnotationDisplay="0" show="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" rightFrameDivisions="0" offsetX="0" leftAnnotationDisplay="0" blendMode="0" leftFrameDivisions="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" annotationPrecision="3">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <symbol alpha="1" force_rhr="0" type="line" clip_to_extent="1" name="">
+              <layer locked="0" enabled="1" pass="0" class="SimpleLine">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol alpha="1" force_rhr="0" type="marker" clip_to_extent="1" name="">
+              <layer locked="0" enabled="1" pass="0" class="SimpleMarker">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -13987,242 +14317,242 @@ def my_form_open(dialog, layer, feature):
         <property key="pdfTextFormat" value="0"/>
         <property key="singleFile" value="true"/>
       </customproperties>
-      <Atlas hideCoverage="0" sortFeatures="0" pageNameExpression="" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" filterFeatures="0" coverageLayer="" enabled="0"/>
+      <Atlas enabled="0" filterFeatures="0" hideCoverage="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" sortFeatures="0" coverageLayer="" pageNameExpression=""/>
     </Layout>
     <Layout worldFileMap="" name="All Routes" units="mm" printResolution="144">
-      <Snapper snapToItems="1" tolerance="5" snapToGrid="0" snapToGuides="1"/>
-      <Grid offsetY="0" resUnits="mm" offsetX="0" resolution="10" offsetUnits="mm"/>
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetUnits="mm" offsetY="0" offsetX="0" resolution="10"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol alpha="1" force_rhr="0" type="fill" clip_to_extent="1" name="">
+          <layer locked="0" enabled="1" pass="0" 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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="no"/>
+            <prop k="outline_width" v="0.26"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem size="297,210,mm" outlineWidthM="0.3,mm" opacity="1" positionOnPage="0,0,mm" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" frame="false" blendMode="0" frameJoinStyle="miter" background="true" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" positionLock="false" type="65638" itemRotation="0" excludeFromExports="0" position="0,0,mm" groupUuid="" visibility="1" zValue="0" referencePoint="0" id="">
-          <FrameColor green="0" red="0" blue="0" alpha="255"/>
-          <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+        <LayoutItem groupUuid="" positionLock="false" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" position="0,0,mm" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" frameJoinStyle="miter" id="" zValue="0" opacity="1" outlineWidthM="0.3,mm" positionOnPage="0,0,mm" background="true" type="65638" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" visibility="1" size="297,210,mm" blendMode="0">
+          <FrameColor blue="0" alpha="255" red="0" green="0"/>
+          <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
           </LayoutObject>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" page="0" units="mm" position="0"/>
+          <Guide position="0" page="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem size="57.4836,6.8714,mm" valign="64" outlineWidthM="0.3,mm" opacity="1" positionOnPage="204.225,191.81,mm" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="REVISION 1.6" position="204.225,191.81,mm" groupUuid="" htmlState="0" visibility="1" zValue="6" referencePoint="0" marginY="1" id="" marginX="1" halign="2">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="true" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" valign="64" position="204.225,191.81,mm" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" frameJoinStyle="miter" id="" zValue="6" opacity="1" outlineWidthM="0.3,mm" positionOnPage="204.225,191.81,mm" background="false" halign="2" type="65641" marginX="1" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" visibility="1" size="57.4836,6.8714,mm" htmlState="0" labelText="REVISION 1.6" blendMode="0" marginY="1">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <FontColor blue="0" alpha="255" red="0" green="0"/>
       </LayoutItem>
-      <LayoutItem size="51.6706,6.60801,mm" valign="64" outlineWidthM="0.3,mm" opacity="1" positionOnPage="210.038,199.082,mm" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="Sunday, 20 October 2019" position="210.038,199.082,mm" groupUuid="" htmlState="0" visibility="1" zValue="5" referencePoint="0" marginY="1" id="" marginX="1" halign="2">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="true" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" valign="64" position="210.038,199.082,mm" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" frameJoinStyle="miter" id="" zValue="5" opacity="1" outlineWidthM="0.3,mm" positionOnPage="210.038,199.082,mm" background="false" halign="2" type="65641" marginX="1" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" visibility="1" size="51.6706,6.60801,mm" htmlState="0" labelText="Sunday, 20 October 2019" blendMode="0" marginY="1">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <FontColor blue="0" alpha="255" red="0" green="0"/>
       </LayoutItem>
-      <LayoutItem size="29.7523,17.4718,mm" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" outlineWidthM="0.3,mm" opacity="1" positionOnPage="262.196,188.218,mm" resizeMode="0" northOffset="0" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" frame="false" pictureWidth="29.7523" anchorPoint="4" pictureHeight="17.4074" pictureRotation="0" svgBorderColor="0,0,0,255" blendMode="0" svgFillColor="255,255,255,255" frameJoinStyle="miter" background="false" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" positionLock="true" svgBorderWidth="0.2" type="65640" itemRotation="0" excludeFromExports="0" position="262.196,188.218,mm" file="../Gun_Run_Logo.png" northMode="0" groupUuid="" visibility="1" zValue="4" referencePoint="0" id="">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" file="../Gun_Run_Logo.png" pictureHeight="17.4074" resizeMode="0" svgFillColor="255,255,255,255" positionLock="true" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" position="262.196,188.218,mm" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" northMode="0" frameJoinStyle="miter" id="" northOffset="0" zValue="4" opacity="1" outlineWidthM="0.3,mm" positionOnPage="262.196,188.218,mm" background="false" pictureRotation="0" type="65640" excludeFromExports="0" itemRotation="0" frame="false" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" referencePoint="0" svgBorderWidth="0.2" visibility="1" size="29.7523,17.4718,mm" svgBorderColor="0,0,0,255" pictureWidth="29.7523" blendMode="0" anchorPoint="4">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value=""/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem size="251.959,0.1,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" cornerRadiusMeasure="0,mm" positionOnPage="9.59946,198.832,mm" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" positionLock="true" type="65643" itemRotation="0" excludeFromExports="0" position="9.59946,198.832,mm" groupUuid="" visibility="1" zValue="3" referencePoint="0" id="">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="true" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" position="9.59946,198.832,mm" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" frameJoinStyle="miter" id="" zValue="3" opacity="1" outlineWidthM="0.3,mm" positionOnPage="9.59946,198.832,mm" shapeType="1" background="false" type="65643" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" cornerRadiusMeasure="0,mm" visibility="1" size="251.959,0.1,mm" blendMode="0">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol alpha="1" force_rhr="0" type="fill" clip_to_extent="1" name="">
+          <layer locked="0" enabled="1" pass="0" 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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="solid"/>
+            <prop k="outline_width" v="0.3"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem size="67.7828,166.874,mm" outlineWidthM="0.3,mm" opacity="1" positionOnPage="5.86559,4.09761,mm" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" frame="true" blendMode="0" frameJoinStyle="miter" labelMargin="0,mm" background="true" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" mapFlags="0" positionLock="true" followPresetName="Routes" type="65639" itemRotation="0" excludeFromExports="0" position="5.86559,4.09761,mm" groupUuid="" visibility="1" zValue="2" referencePoint="0" drawCanvasItems="false" mapRotation="0" id="" keepLayerSet="false" followPreset="false">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="true" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" mapRotation="0" position="5.86559,4.09761,mm" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" frameJoinStyle="miter" id="" zValue="2" opacity="1" outlineWidthM="0.3,mm" positionOnPage="5.86559,4.09761,mm" keepLayerSet="false" followPresetName="Routes" mapFlags="0" background="true" type="65639" excludeFromExports="0" itemRotation="0" frame="true" referencePoint="0" drawCanvasItems="false" visibility="1" size="67.7828,166.874,mm" followPreset="false" labelMargin="0,mm" blendMode="0">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMax">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMax">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <Extent ymin="-33.94652930000000168" xmin="18.37288570000000121" xmax="18.38563681624126289" ymax="-33.91513741583252539"/>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" topAnnotationPosition="1" rightFrameDivisions="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" gridFramePenThickness="0.5" unit="0" rightAnnotationPosition="1" leftAnnotationDirection="0" topAnnotationDisplay="0" gridFrameSideFlags="15" leftAnnotationDisplay="0" crossLength="3" topFrameDivisions="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" bottomAnnotationDisplay="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" show="0" showAnnotation="0" intervalX="0" topAnnotationDirection="0" frameAnnotationDistance="1" leftFrameDivisions="0" frameFillColor2="0,0,0,255" annotationFormat="0" intervalY="0" rightAnnotationDisplay="0" annotationFontColor="0,0,0,255" gridFrameStyle="0" gridFrameWidth="2" gridStyle="0" rightAnnotationDirection="0" annotationExpression="" offsetX="0" bottomAnnotationPosition="1" annotationPrecision="3" name="Grid 1" offsetY="0" leftAnnotationPosition="1" position="3">
+        <ComposerMapGrid unit="0" gridFrameSideFlags="15" bottomAnnotationDisplay="0" frameFillColor2="0,0,0,255" offsetY="0" gridFrameWidth="2" annotationFontColor="0,0,0,255" intervalY="0" frameAnnotationDistance="1" annotationFormat="0" position="3" rightAnnotationDirection="0" name="Grid 1" annotationExpression="" bottomFrameDivisions="0" topAnnotationPosition="1" gridStyle="0" topFrameDivisions="0" crossLength="3" leftAnnotationPosition="1" gridFramePenThickness="0.5" topAnnotationDirection="0" showAnnotation="0" rightAnnotationDisplay="0" bottomAnnotationDirection="0" leftAnnotationDirection="0" intervalX="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" bottomAnnotationPosition="1" gridFrameStyle="0" topAnnotationDisplay="0" show="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" rightFrameDivisions="0" offsetX="0" leftAnnotationDisplay="0" blendMode="0" leftFrameDivisions="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" annotationPrecision="3">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <symbol alpha="1" force_rhr="0" type="line" clip_to_extent="1" name="">
+              <layer locked="0" enabled="1" pass="0" class="SimpleLine">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol alpha="1" force_rhr="0" type="marker" clip_to_extent="1" name="">
+              <layer locked="0" enabled="1" pass="0" class="SimpleMarker">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -14233,93 +14563,93 @@ def my_form_open(dialog, layer, feature):
         <AtlasMap atlasDriven="0" scalingMode="2" margin="0.05"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutItem size="282.012,182.649,mm" outlineWidthM="0.15,mm" opacity="1" positionOnPage="9.44946,9.08557,mm" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" frame="true" blendMode="0" frameJoinStyle="round" labelMargin="0,mm" background="true" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" mapFlags="0" positionLock="true" followPresetName="Routes" type="65639" itemRotation="0" excludeFromExports="0" position="9.44946,9.08557,mm" groupUuid="" visibility="1" zValue="1" referencePoint="0" drawCanvasItems="false" mapRotation="0" id="" keepLayerSet="false" followPreset="false">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="true" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" mapRotation="0" position="9.44946,9.08557,mm" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" frameJoinStyle="round" id="" zValue="1" opacity="1" outlineWidthM="0.15,mm" positionOnPage="9.44946,9.08557,mm" keepLayerSet="false" followPresetName="Routes" mapFlags="0" background="true" type="65639" excludeFromExports="0" itemRotation="0" frame="true" referencePoint="0" drawCanvasItems="false" visibility="1" size="282.012,182.649,mm" followPreset="false" labelMargin="0,mm" blendMode="0">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.368'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.368'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <Extent ymin="-33.92999999999999972" xmin="18.36799999999999855" xmax="18.42103445111282056" ymax="-33.89565141814492932"/>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" topAnnotationPosition="1" rightFrameDivisions="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" gridFramePenThickness="0.5" unit="0" rightAnnotationPosition="1" leftAnnotationDirection="0" topAnnotationDisplay="0" gridFrameSideFlags="15" leftAnnotationDisplay="0" crossLength="3" topFrameDivisions="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" bottomAnnotationDisplay="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" show="0" showAnnotation="0" intervalX="0" topAnnotationDirection="0" frameAnnotationDistance="1" leftFrameDivisions="0" frameFillColor2="0,0,0,255" annotationFormat="0" intervalY="0" rightAnnotationDisplay="0" annotationFontColor="0,0,0,255" gridFrameStyle="0" gridFrameWidth="2" gridStyle="0" rightAnnotationDirection="0" annotationExpression="" offsetX="0" bottomAnnotationPosition="1" annotationPrecision="3" name="Grid 1" offsetY="0" leftAnnotationPosition="1" position="3">
+        <ComposerMapGrid unit="0" gridFrameSideFlags="15" bottomAnnotationDisplay="0" frameFillColor2="0,0,0,255" offsetY="0" gridFrameWidth="2" annotationFontColor="0,0,0,255" intervalY="0" frameAnnotationDistance="1" annotationFormat="0" position="3" rightAnnotationDirection="0" name="Grid 1" annotationExpression="" bottomFrameDivisions="0" topAnnotationPosition="1" gridStyle="0" topFrameDivisions="0" crossLength="3" leftAnnotationPosition="1" gridFramePenThickness="0.5" topAnnotationDirection="0" showAnnotation="0" rightAnnotationDisplay="0" bottomAnnotationDirection="0" leftAnnotationDirection="0" intervalX="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" bottomAnnotationPosition="1" gridFrameStyle="0" topAnnotationDisplay="0" show="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" rightFrameDivisions="0" offsetX="0" leftAnnotationDisplay="0" blendMode="0" leftFrameDivisions="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" annotationPrecision="3">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <symbol alpha="1" force_rhr="0" type="line" clip_to_extent="1" name="">
+              <layer locked="0" enabled="1" pass="0" class="SimpleLine">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol alpha="1" force_rhr="0" type="marker" clip_to_extent="1" name="">
+              <layer locked="0" enabled="1" pass="0" class="SimpleMarker">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -14344,43 +14674,43 @@ def my_form_open(dialog, layer, feature):
         <property key="pdfTextFormat" value="0"/>
         <property key="singleFile" value="true"/>
       </customproperties>
-      <Atlas hideCoverage="0" sortFeatures="1" pageNameExpression="&quot;Distance&quot;" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortKey="length_m" filterFeatures="1" coverageLayer="" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21)' )" enabled="0" sortAscending="0"/>
+      <Atlas sortAscending="0" enabled="0" sortKey="length_m" filterFeatures="1" hideCoverage="0" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortFeatures="1" coverageLayer="" pageNameExpression="&quot;Distance&quot;" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21)' )"/>
     </Layout>
     <Layout worldFileMap="" name="Marshal Plan A1" units="mm" printResolution="120">
-      <Snapper snapToItems="1" tolerance="5" snapToGrid="0" snapToGuides="1"/>
-      <Grid offsetY="0" resUnits="mm" offsetX="0" resolution="10" offsetUnits="mm"/>
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetUnits="mm" offsetY="0" offsetX="0" resolution="10"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol alpha="1" force_rhr="0" type="fill" clip_to_extent="1" name="">
+          <layer locked="0" enabled="1" pass="0" 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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="no"/>
+            <prop k="outline_width" v="0.26"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem size="594,841,mm" outlineWidthM="0.3,mm" opacity="1" positionOnPage="0,0,mm" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" frame="false" blendMode="0" frameJoinStyle="miter" background="true" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" positionLock="false" type="65638" itemRotation="0" excludeFromExports="0" position="0,0,mm" groupUuid="" visibility="1" zValue="0" referencePoint="0" id="">
-          <FrameColor green="0" red="0" blue="0" alpha="255"/>
-          <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+        <LayoutItem groupUuid="" positionLock="false" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" position="0,0,mm" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" frameJoinStyle="miter" id="" zValue="0" opacity="1" outlineWidthM="0.3,mm" positionOnPage="0,0,mm" background="true" type="65638" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" visibility="1" size="594,841,mm" blendMode="0">
+          <FrameColor blue="0" alpha="255" red="0" green="0"/>
+          <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
@@ -14388,15 +14718,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem title="" outlineWidthM="0.3,mm" blendMode="0" background="true" fontColor="#000000" referencePoint="0" itemRotation="0" size="18.6109,9,mm" frame="false" titleAlignment="1" opacity="1" columnCount="1" equalColumnWidth="1" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" rasterBorderColor="0,0,0,255" excludeFromExports="0" wmsLegendHeight="25" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" resizeToContents="1" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" boxSpace="2" frameJoinStyle="miter" rasterBorderWidth="0" positionLock="true" wmsLegendWidth="50" symbolHeight="4" symbolWidth="7" type="65642" legendFilterByAtlas="0" splitLayer="0" rasterBorder="1" symbolAlignment="1" groupUuid="" visibility="1" zValue="8" lineSpacing="1" columnSpace="2" id="" wrapChar="" positionOnPage="25.5925,18.7971,mm" position="25.5925,18.7971,mm">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem title="" fontColor="#000000" lineSpacing="1" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" outlineWidthM="0.3,mm" symbolWidth="7" opacity="1" symbolAlignment="1" positionOnPage="25.5925,18.7971,mm" type="65642" position="25.5925,18.7971,mm" splitLayer="0" positionLock="true" rasterBorderWidth="0" wmsLegendHeight="25" id="" wmsLegendWidth="50" visibility="1" size="18.6109,9,mm" zValue="8" frameJoinStyle="miter" rasterBorderColor="0,0,0,255" itemRotation="0" wrapChar="" symbolHeight="4" columnCount="1" titleAlignment="1" equalColumnWidth="1" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" boxSpace="2" rasterBorder="1" columnSpace="2" referencePoint="0" legendFilterByAtlas="0" groupUuid="" blendMode="0" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" frame="false" resizeToContents="1" background="true" excludeFromExports="0">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
@@ -14408,21 +14738,21 @@ def my_form_open(dialog, layer, feature):
           <style name="group" alignment="1">
             <styleFont description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
-          <style name="subgroup" marginTop="1" alignment="1">
+          <style name="subgroup" alignment="1" marginTop="1">
             <styleFont description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
-          <style name="symbol" marginTop="2" alignment="1">
+          <style name="symbol" alignment="1" marginTop="2">
             <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
           </style>
-          <style marginLeft="2" name="symbolLabel" marginTop="2" alignment="1">
+          <style name="symbolLabel" alignment="1" marginLeft="2" marginTop="2">
             <styleFont description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties/>
-          <layer-tree-group expanded="1" checked="Qt::Checked" name="Routes">
+          <layer-tree-group expanded="1" name="Routes" checked="Qt::Checked">
             <customproperties/>
-            <layer-tree-layer expanded="1" id="all_routes20170907054841602" checked="Qt::Checked" name="all_routes">
+            <layer-tree-layer expanded="1" id="all_routes20170907054841602" name="all_routes" checked="Qt::Checked">
               <customproperties>
                 <property key="expandedLegendNodes" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
                 <property key="legend/node-order" value="1,2,3"/>
@@ -14434,135 +14764,135 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem size="91.9494,15.0649,mm" valign="64" outlineWidthM="0.3,mm" opacity="1" positionOnPage="5.2963,808.939,mm" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="MARSHAL POSITIONS" position="5.2963,808.939,mm" groupUuid="" htmlState="0" visibility="1" zValue="7" referencePoint="0" marginY="1" id="" marginX="1" halign="1">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="true" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" valign="64" position="5.2963,808.939,mm" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" frameJoinStyle="miter" id="" zValue="7" opacity="1" outlineWidthM="0.3,mm" positionOnPage="5.2963,808.939,mm" background="false" halign="1" type="65641" marginX="1" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" visibility="1" size="91.9494,15.0649,mm" htmlState="0" labelText="MARSHAL POSITIONS" blendMode="0" marginY="1">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <FontColor blue="0" alpha="255" red="0" green="0"/>
       </LayoutItem>
-      <LayoutItem size="56.6212,15.3656,mm" valign="32" outlineWidthM="0.3,mm" opacity="1" positionOnPage="430.403,825.052,mm" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="REVISION 1.2" position="430.403,825.052,mm" groupUuid="" htmlState="0" visibility="1" zValue="5" referencePoint="0" marginY="1" id="" marginX="1" halign="2">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="true" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" valign="32" position="430.403,825.052,mm" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" frameJoinStyle="miter" id="" zValue="5" opacity="1" outlineWidthM="0.3,mm" positionOnPage="430.403,825.052,mm" background="false" halign="2" type="65641" marginX="1" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" visibility="1" size="56.6212,15.3656,mm" htmlState="0" labelText="REVISION 1.2" blendMode="0" marginY="1">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <FontColor blue="0" alpha="255" red="0" green="0"/>
       </LayoutItem>
-      <LayoutItem size="114.848,15.0635,mm" valign="64" outlineWidthM="0.3,mm" opacity="1" positionOnPage="372.175,808.942,mm" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{d177957c-7ab6-40ae-8769-347428500538}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="Sunday, 20 October 2019" position="372.175,808.942,mm" groupUuid="" htmlState="0" visibility="1" zValue="4" referencePoint="0" marginY="1" id="" marginX="1" halign="2">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="true" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" valign="64" position="372.175,808.942,mm" uuid="{d177957c-7ab6-40ae-8769-347428500538}" frameJoinStyle="miter" id="" zValue="4" opacity="1" outlineWidthM="0.3,mm" positionOnPage="372.175,808.942,mm" background="false" halign="2" type="65641" marginX="1" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" visibility="1" size="114.848,15.0635,mm" htmlState="0" labelText="Sunday, 20 October 2019" blendMode="0" marginY="1">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <FontColor blue="0" alpha="255" red="0" green="0"/>
       </LayoutItem>
-      <LayoutItem size="100.498,63.9757,mm" mapUuid="" outlineWidthM="0.3,mm" opacity="1" positionOnPage="489.557,775.395,mm" resizeMode="0" northOffset="0" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" frame="false" pictureWidth="100.498" anchorPoint="8" pictureHeight="58.7992" pictureRotation="0" svgBorderColor="0,0,0,255" blendMode="0" svgFillColor="255,255,255,255" frameJoinStyle="miter" background="false" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" positionLock="true" svgBorderWidth="0.2" type="65640" itemRotation="0" excludeFromExports="0" position="489.557,775.395,mm" file="../Gun_Run_Logo.png" northMode="0" groupUuid="" visibility="1" zValue="3" referencePoint="0" id="">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" file="../Gun_Run_Logo.png" pictureHeight="58.7992" resizeMode="0" svgFillColor="255,255,255,255" positionLock="true" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" position="489.557,775.395,mm" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" northMode="0" frameJoinStyle="miter" id="" northOffset="0" zValue="3" opacity="1" outlineWidthM="0.3,mm" positionOnPage="489.557,775.395,mm" background="false" pictureRotation="0" type="65640" excludeFromExports="0" itemRotation="0" frame="false" mapUuid="" referencePoint="0" svgBorderWidth="0.2" visibility="1" size="100.498,63.9757,mm" svgBorderColor="0,0,0,255" pictureWidth="100.498" blendMode="0" anchorPoint="8">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value=""/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem size="481.428,0.606138,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" cornerRadiusMeasure="0,mm" positionOnPage="5.4463,824.155,mm" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" positionLock="true" type="65643" itemRotation="0" excludeFromExports="0" position="5.4463,824.155,mm" groupUuid="" visibility="1" zValue="2" referencePoint="0" id="">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="true" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" position="5.4463,824.155,mm" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" frameJoinStyle="miter" id="" zValue="2" opacity="1" outlineWidthM="0.3,mm" positionOnPage="5.4463,824.155,mm" shapeType="1" background="false" type="65643" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" cornerRadiusMeasure="0,mm" visibility="1" size="481.428,0.606138,mm" blendMode="0">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol alpha="1" force_rhr="0" type="fill" clip_to_extent="1" name="">
+          <layer locked="0" enabled="1" pass="0" 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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="solid"/>
+            <prop k="outline_width" v="0.3"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem size="584.759,811.213,mm" outlineWidthM="0.3,mm" opacity="1" positionOnPage="3.94474,5.25965,mm" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" frame="true" blendMode="0" frameJoinStyle="miter" labelMargin="0,mm" background="true" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" mapFlags="0" positionLock="true" followPresetName="Marshal overview" type="65639" itemRotation="0" excludeFromExports="0" position="3.94474,5.25965,mm" groupUuid="" visibility="1" zValue="1" referencePoint="0" drawCanvasItems="false" mapRotation="0" id="" keepLayerSet="false" followPreset="true">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="true" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" mapRotation="0" position="3.94474,5.25965,mm" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" frameJoinStyle="miter" id="" zValue="1" opacity="1" outlineWidthM="0.3,mm" positionOnPage="3.94474,5.25965,mm" keepLayerSet="false" followPresetName="Marshal overview" mapFlags="0" background="true" type="65639" excludeFromExports="0" itemRotation="0" frame="true" referencePoint="0" drawCanvasItems="false" visibility="1" size="584.759,811.213,mm" followPreset="true" labelMargin="0,mm" blendMode="0">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="field" value=""/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="field" value=""/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="field" value=""/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
@@ -14579,61 +14909,61 @@ def my_form_open(dialog, layer, feature):
         <property key="pdfIncludeMetadata" value="1"/>
         <property key="pdfTextFormat" value="0"/>
       </customproperties>
-      <Atlas coverageLayerName="complete_marshal_overview" hideCoverage="1" sortFeatures="1" pageNameExpression="&quot;page&quot;" filenamePattern="'output_'||@atlas_featurenumber" sortKey="page" filterFeatures="0" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" enabled="1" sortAscending="1" coverageLayerProvider="virtual"/>
+      <Atlas coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" coverageLayerName="complete_marshal_overview" sortAscending="1" enabled="1" sortKey="page" coverageLayerProvider="virtual" filterFeatures="0" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" pageNameExpression="&quot;page&quot;"/>
     </Layout>
     <Layout worldFileMap="" name="Access Roads" units="mm" printResolution="144">
-      <Snapper snapToItems="1" tolerance="5" snapToGrid="0" snapToGuides="1"/>
-      <Grid offsetY="0" resUnits="mm" offsetX="0" resolution="10" offsetUnits="mm"/>
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetUnits="mm" offsetY="0" offsetX="0" resolution="10"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol alpha="1" force_rhr="0" type="fill" clip_to_extent="1" name="">
+          <layer locked="0" enabled="1" pass="0" 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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="no"/>
+            <prop k="outline_width" v="0.26"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem size="297,210,mm" outlineWidthM="0.3,mm" opacity="1" positionOnPage="0,0,mm" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" frame="false" blendMode="0" frameJoinStyle="miter" background="true" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" positionLock="false" type="65638" itemRotation="0" excludeFromExports="0" position="0,0,mm" groupUuid="" visibility="1" zValue="0" referencePoint="0" id="">
-          <FrameColor green="0" red="0" blue="0" alpha="255"/>
-          <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+        <LayoutItem groupUuid="" positionLock="false" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" position="0,0,mm" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" frameJoinStyle="miter" id="" zValue="0" opacity="1" outlineWidthM="0.3,mm" positionOnPage="0,0,mm" background="true" type="65638" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" visibility="1" size="297,210,mm" blendMode="0">
+          <FrameColor blue="0" alpha="255" red="0" green="0"/>
+          <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
           </LayoutObject>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" page="0" units="mm" position="0"/>
+          <Guide position="0" page="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem title="" outlineWidthM="0.3,mm" blendMode="0" background="true" fontColor="#000000" referencePoint="0" itemRotation="0" size="34.45,40.8,mm" frame="true" titleAlignment="1" opacity="1" columnCount="1" equalColumnWidth="0" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" rasterBorderColor="0,0,0,255" excludeFromExports="0" wmsLegendHeight="25" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" resizeToContents="1" boxSpace="2" frameJoinStyle="miter" rasterBorderWidth="0" positionLock="true" wmsLegendWidth="50" symbolHeight="4" symbolWidth="7" type="65642" legendFilterByAtlas="0" splitLayer="0" rasterBorder="1" symbolAlignment="1" groupUuid="" visibility="1" zValue="15" lineSpacing="1" columnSpace="2" id="" wrapChar="" positionOnPage="244.484,130.172,mm" position="244.484,130.172,mm">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="185"/>
+      <LayoutItem title="" fontColor="#000000" lineSpacing="1" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" outlineWidthM="0.3,mm" symbolWidth="7" opacity="1" symbolAlignment="1" positionOnPage="244.484,130.172,mm" type="65642" position="244.484,130.172,mm" splitLayer="0" positionLock="true" rasterBorderWidth="0" wmsLegendHeight="25" id="" wmsLegendWidth="50" visibility="1" size="34.45,40.8,mm" zValue="15" frameJoinStyle="miter" rasterBorderColor="0,0,0,255" itemRotation="0" wrapChar="" symbolHeight="4" columnCount="1" titleAlignment="1" equalColumnWidth="0" boxSpace="2" rasterBorder="1" columnSpace="2" referencePoint="0" legendFilterByAtlas="0" groupUuid="" blendMode="0" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" frame="true" resizeToContents="1" background="true" excludeFromExports="0">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="185" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
@@ -14642,24 +14972,24 @@ def my_form_open(dialog, layer, feature):
           <style name="title" alignment="1">
             <styleFont description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
-          <style name="group" marginTop="3" alignment="1">
+          <style name="group" alignment="1" marginTop="3">
             <styleFont description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
-          <style name="subgroup" marginTop="3" alignment="1">
+          <style name="subgroup" alignment="1" marginTop="3">
             <styleFont description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
-          <style name="symbol" marginTop="2.5" alignment="1">
+          <style name="symbol" alignment="1" marginTop="2.5">
             <styleFont description="Myriad Pro,9,-1,5,50,0,0,0,0,0" style=""/>
           </style>
-          <style marginLeft="2" name="symbolLabel" marginTop="2" alignment="1">
+          <style name="symbolLabel" alignment="1" marginLeft="2" marginTop="2">
             <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties/>
-          <layer-tree-group expanded="1" checked="Qt::Checked" name="Residents Access">
+          <layer-tree-group expanded="1" name="Residents Access" checked="Qt::Checked">
             <customproperties/>
-            <layer-tree-layer providerKey="ogr" expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" checked="Qt::Checked" source="./residents_access_roads.shp|layername=residents_access_roads" name="residents_access_roads">
+            <layer-tree-layer source="./residents_access_roads.shp|layername=residents_access_roads" expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" name="residents_access_roads" checked="Qt::Checked" providerKey="ogr">
               <customproperties>
                 <property key="expandedLegendNodes"/>
                 <property key="legend/title-style" value="hidden"/>
@@ -14669,150 +14999,150 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem size="194.851,7.272,mm" valign="64" outlineWidthM="0.3,mm" opacity="1" positionOnPage="9.37446,191.81,mm" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="ACCESS ROUTES FOR RESIDENTS" position="9.37446,191.81,mm" groupUuid="" htmlState="0" visibility="1" zValue="8" referencePoint="0" marginY="1" id="" marginX="0" halign="1">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="true" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" valign="64" position="9.37446,191.81,mm" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" frameJoinStyle="miter" id="" zValue="8" opacity="1" outlineWidthM="0.3,mm" positionOnPage="9.37446,191.81,mm" background="false" halign="1" type="65641" marginX="0" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" visibility="1" size="194.851,7.272,mm" htmlState="0" labelText="ACCESS ROUTES FOR RESIDENTS" blendMode="0" marginY="1">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <FontColor blue="0" alpha="255" red="0" green="0"/>
       </LayoutItem>
-      <LayoutItem size="57.4836,6.8714,mm" valign="64" outlineWidthM="0.3,mm" opacity="1" positionOnPage="204.225,191.81,mm" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="REVISION 1.1" position="204.225,191.81,mm" groupUuid="" htmlState="0" visibility="1" zValue="6" referencePoint="0" marginY="1" id="" marginX="1" halign="2">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="true" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" valign="64" position="204.225,191.81,mm" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" frameJoinStyle="miter" id="" zValue="6" opacity="1" outlineWidthM="0.3,mm" positionOnPage="204.225,191.81,mm" background="false" halign="2" type="65641" marginX="1" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" visibility="1" size="57.4836,6.8714,mm" htmlState="0" labelText="REVISION 1.1" blendMode="0" marginY="1">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <FontColor blue="0" alpha="255" red="0" green="0"/>
       </LayoutItem>
-      <LayoutItem size="51.6706,6.60801,mm" valign="64" outlineWidthM="0.3,mm" opacity="1" positionOnPage="210.038,199.082,mm" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="Sunday, 20 October 2019" position="210.038,199.082,mm" groupUuid="" htmlState="0" visibility="1" zValue="5" referencePoint="0" marginY="1" id="" marginX="1" halign="2">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="true" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" valign="64" position="210.038,199.082,mm" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" frameJoinStyle="miter" id="" zValue="5" opacity="1" outlineWidthM="0.3,mm" positionOnPage="210.038,199.082,mm" background="false" halign="2" type="65641" marginX="1" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" visibility="1" size="51.6706,6.60801,mm" htmlState="0" labelText="Sunday, 20 October 2019" blendMode="0" marginY="1">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <FontColor blue="0" alpha="255" red="0" green="0"/>
       </LayoutItem>
-      <LayoutItem size="29.7523,17.4718,mm" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" outlineWidthM="0.3,mm" opacity="1" positionOnPage="262.196,188.218,mm" resizeMode="0" northOffset="0" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" frame="false" pictureWidth="29.7523" anchorPoint="4" pictureHeight="17.4074" pictureRotation="0" svgBorderColor="0,0,0,255" blendMode="0" svgFillColor="255,255,255,255" frameJoinStyle="miter" background="false" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" positionLock="true" svgBorderWidth="0.2" type="65640" itemRotation="0" excludeFromExports="0" position="262.196,188.218,mm" file="../Gun_Run_Logo.png" northMode="0" groupUuid="" visibility="1" zValue="4" referencePoint="0" id="">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" file="../Gun_Run_Logo.png" pictureHeight="17.4074" resizeMode="0" svgFillColor="255,255,255,255" positionLock="true" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" position="262.196,188.218,mm" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" northMode="0" frameJoinStyle="miter" id="" northOffset="0" zValue="4" opacity="1" outlineWidthM="0.3,mm" positionOnPage="262.196,188.218,mm" background="false" pictureRotation="0" type="65640" excludeFromExports="0" itemRotation="0" frame="false" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" referencePoint="0" svgBorderWidth="0.2" visibility="1" size="29.7523,17.4718,mm" svgBorderColor="0,0,0,255" pictureWidth="29.7523" blendMode="0" anchorPoint="4">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value=""/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem size="251.959,0.1,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" cornerRadiusMeasure="0,mm" positionOnPage="9.59946,198.832,mm" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" positionLock="true" type="65643" itemRotation="0" excludeFromExports="0" position="9.59946,198.832,mm" groupUuid="" visibility="1" zValue="3" referencePoint="0" id="">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="true" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" position="9.59946,198.832,mm" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" frameJoinStyle="miter" id="" zValue="3" opacity="1" outlineWidthM="0.3,mm" positionOnPage="9.59946,198.832,mm" shapeType="1" background="false" type="65643" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" cornerRadiusMeasure="0,mm" visibility="1" size="251.959,0.1,mm" blendMode="0">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol alpha="1" force_rhr="0" type="fill" clip_to_extent="1" name="">
+          <layer locked="0" enabled="1" pass="0" 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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="solid"/>
+            <prop k="outline_width" v="0.3"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem size="67.7828,166.874,mm" outlineWidthM="0.3,mm" opacity="1" positionOnPage="5.86559,4.09761,mm" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" frame="true" blendMode="0" frameJoinStyle="miter" labelMargin="0,mm" background="true" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" mapFlags="0" positionLock="true" followPresetName="Access Routes" type="65639" itemRotation="0" excludeFromExports="0" position="5.86559,4.09761,mm" groupUuid="" visibility="1" zValue="2" referencePoint="0" drawCanvasItems="false" mapRotation="0" id="" keepLayerSet="false" followPreset="true">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="true" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" mapRotation="0" position="5.86559,4.09761,mm" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" frameJoinStyle="miter" id="" zValue="2" opacity="1" outlineWidthM="0.3,mm" positionOnPage="5.86559,4.09761,mm" keepLayerSet="false" followPresetName="Access Routes" mapFlags="0" background="true" type="65639" excludeFromExports="0" itemRotation="0" frame="true" referencePoint="0" drawCanvasItems="false" visibility="1" size="67.7828,166.874,mm" followPreset="true" labelMargin="0,mm" blendMode="0">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMax">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMax">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="int" value="1" name="type"/>
-                  <Option type="QString" value="" name="val"/>
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="int" name="type" value="1"/>
+                  <Option type="QString" name="val" value=""/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
@@ -14831,62 +15161,62 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" topAnnotationPosition="1" rightFrameDivisions="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" gridFramePenThickness="0.5" unit="0" rightAnnotationPosition="1" leftAnnotationDirection="0" topAnnotationDisplay="0" gridFrameSideFlags="15" leftAnnotationDisplay="0" crossLength="3" topFrameDivisions="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" bottomAnnotationDisplay="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" show="0" showAnnotation="0" intervalX="0" topAnnotationDirection="0" frameAnnotationDistance="1" leftFrameDivisions="0" frameFillColor2="0,0,0,255" annotationFormat="0" intervalY="0" rightAnnotationDisplay="0" annotationFontColor="0,0,0,255" gridFrameStyle="0" gridFrameWidth="2" gridStyle="0" rightAnnotationDirection="0" annotationExpression="" offsetX="0" bottomAnnotationPosition="1" annotationPrecision="3" name="Grid 1" offsetY="0" leftAnnotationPosition="1" position="3">
+        <ComposerMapGrid unit="0" gridFrameSideFlags="15" bottomAnnotationDisplay="0" frameFillColor2="0,0,0,255" offsetY="0" gridFrameWidth="2" annotationFontColor="0,0,0,255" intervalY="0" frameAnnotationDistance="1" annotationFormat="0" position="3" rightAnnotationDirection="0" name="Grid 1" annotationExpression="" bottomFrameDivisions="0" topAnnotationPosition="1" gridStyle="0" topFrameDivisions="0" crossLength="3" leftAnnotationPosition="1" gridFramePenThickness="0.5" topAnnotationDirection="0" showAnnotation="0" rightAnnotationDisplay="0" bottomAnnotationDirection="0" leftAnnotationDirection="0" intervalX="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" bottomAnnotationPosition="1" gridFrameStyle="0" topAnnotationDisplay="0" show="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" rightFrameDivisions="0" offsetX="0" leftAnnotationDisplay="0" blendMode="0" leftFrameDivisions="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" annotationPrecision="3">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <symbol alpha="1" force_rhr="0" type="line" clip_to_extent="1" name="">
+              <layer locked="0" enabled="1" pass="0" class="SimpleLine">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol alpha="1" force_rhr="0" type="marker" clip_to_extent="1" name="">
+              <layer locked="0" enabled="1" pass="0" class="SimpleMarker">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -14897,31 +15227,31 @@ def my_form_open(dialog, layer, feature):
         <AtlasMap atlasDriven="0" scalingMode="2" margin="0.05"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutItem size="282.012,175.592,mm" outlineWidthM="0.15,mm" opacity="1" positionOnPage="9.44946,9.08557,mm" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" frame="true" blendMode="0" frameJoinStyle="round" labelMargin="0,mm" background="true" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" mapFlags="0" positionLock="true" followPresetName="Access Routes" type="65639" itemRotation="0" excludeFromExports="0" position="9.44946,9.08557,mm" groupUuid="" visibility="1" zValue="1" referencePoint="0" drawCanvasItems="false" mapRotation="0" id="" keepLayerSet="false" followPreset="true">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="true" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" mapRotation="0" position="9.44946,9.08557,mm" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" frameJoinStyle="round" id="" zValue="1" opacity="1" outlineWidthM="0.15,mm" positionOnPage="9.44946,9.08557,mm" keepLayerSet="false" followPresetName="Access Routes" mapFlags="0" background="true" type="65639" excludeFromExports="0" itemRotation="0" frame="true" referencePoint="0" drawCanvasItems="false" visibility="1" size="282.012,175.592,mm" followPreset="true" labelMargin="0,mm" blendMode="0">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
@@ -14940,62 +15270,62 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" topAnnotationPosition="1" rightFrameDivisions="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" gridFramePenThickness="0.5" unit="0" rightAnnotationPosition="1" leftAnnotationDirection="0" topAnnotationDisplay="0" gridFrameSideFlags="15" leftAnnotationDisplay="0" crossLength="3" topFrameDivisions="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" bottomAnnotationDisplay="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" show="0" showAnnotation="0" intervalX="0" topAnnotationDirection="0" frameAnnotationDistance="1" leftFrameDivisions="0" frameFillColor2="0,0,0,255" annotationFormat="0" intervalY="0" rightAnnotationDisplay="0" annotationFontColor="0,0,0,255" gridFrameStyle="0" gridFrameWidth="2" gridStyle="0" rightAnnotationDirection="0" annotationExpression="" offsetX="0" bottomAnnotationPosition="1" annotationPrecision="3" name="Grid 1" offsetY="0" leftAnnotationPosition="1" position="3">
+        <ComposerMapGrid unit="0" gridFrameSideFlags="15" bottomAnnotationDisplay="0" frameFillColor2="0,0,0,255" offsetY="0" gridFrameWidth="2" annotationFontColor="0,0,0,255" intervalY="0" frameAnnotationDistance="1" annotationFormat="0" position="3" rightAnnotationDirection="0" name="Grid 1" annotationExpression="" bottomFrameDivisions="0" topAnnotationPosition="1" gridStyle="0" topFrameDivisions="0" crossLength="3" leftAnnotationPosition="1" gridFramePenThickness="0.5" topAnnotationDirection="0" showAnnotation="0" rightAnnotationDisplay="0" bottomAnnotationDirection="0" leftAnnotationDirection="0" intervalX="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" bottomAnnotationPosition="1" gridFrameStyle="0" topAnnotationDisplay="0" show="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" rightFrameDivisions="0" offsetX="0" leftAnnotationDisplay="0" blendMode="0" leftFrameDivisions="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" annotationPrecision="3">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <symbol alpha="1" force_rhr="0" type="line" clip_to_extent="1" name="">
+              <layer locked="0" enabled="1" pass="0" class="SimpleLine">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol alpha="1" force_rhr="0" type="marker" clip_to_extent="1" name="">
+              <layer locked="0" enabled="1" pass="0" class="SimpleMarker">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -15020,186 +15350,186 @@ def my_form_open(dialog, layer, feature):
         <property key="pdfTextFormat" value="0"/>
         <property key="singleFile" value="false"/>
       </customproperties>
-      <Atlas coverageLayerName="residents_access" hideCoverage="1" sortFeatures="0" pageNameExpression="&quot;FID&quot;" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" filterFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" enabled="1" coverageLayerProvider="ogr"/>
+      <Atlas coverageLayerSource="/home/tim/Documents/GunRunMaps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayerName="residents_access" enabled="1" coverageLayerProvider="ogr" filterFeatures="0" hideCoverage="1" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" sortFeatures="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" pageNameExpression="&quot;FID&quot;"/>
     </Layout>
     <Layout worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}" name="Golf Course Access" units="mm" printResolution="144">
-      <Snapper snapToItems="1" tolerance="5" snapToGrid="0" snapToGuides="1"/>
-      <Grid offsetY="0" resUnits="mm" offsetX="0" resolution="10" offsetUnits="mm"/>
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetUnits="mm" offsetY="0" offsetX="0" resolution="10"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol alpha="1" force_rhr="0" type="fill" clip_to_extent="1" name="">
+          <layer locked="0" enabled="1" pass="0" 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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="no"/>
+            <prop k="outline_width" v="0.26"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem size="297,210,mm" outlineWidthM="0.3,mm" opacity="1" positionOnPage="0,0,mm" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" frame="false" blendMode="0" frameJoinStyle="miter" background="true" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" positionLock="false" type="65638" itemRotation="0" excludeFromExports="0" position="0,0,mm" groupUuid="" visibility="1" zValue="0" referencePoint="0" id="">
-          <FrameColor green="0" red="0" blue="0" alpha="255"/>
-          <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+        <LayoutItem groupUuid="" positionLock="false" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" position="0,0,mm" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" frameJoinStyle="miter" id="" zValue="0" opacity="1" outlineWidthM="0.3,mm" positionOnPage="0,0,mm" background="true" type="65638" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" visibility="1" size="297,210,mm" blendMode="0">
+          <FrameColor blue="0" alpha="255" red="0" green="0"/>
+          <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
           </LayoutObject>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" page="0" units="mm" position="0"/>
+          <Guide position="0" page="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem size="194.851,7.272,mm" valign="64" outlineWidthM="0.3,mm" opacity="1" positionOnPage="9.37446,191.81,mm" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="Access to P9 Parking and Route to VIP Tent" position="9.37446,191.81,mm" groupUuid="" htmlState="0" visibility="1" zValue="8" referencePoint="0" marginY="1" id="" marginX="0" halign="1">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="true" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" valign="64" position="9.37446,191.81,mm" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" frameJoinStyle="miter" id="" zValue="8" opacity="1" outlineWidthM="0.3,mm" positionOnPage="9.37446,191.81,mm" background="false" halign="1" type="65641" marginX="0" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" visibility="1" size="194.851,7.272,mm" htmlState="0" labelText="Access to P9 Parking and VIP Tent" blendMode="0" marginY="1">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <FontColor blue="0" alpha="255" red="0" green="0"/>
       </LayoutItem>
-      <LayoutItem size="57.4836,6.8714,mm" valign="64" outlineWidthM="0.3,mm" opacity="1" positionOnPage="204.225,191.81,mm" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="REVISION 1.0" position="204.225,191.81,mm" groupUuid="" htmlState="0" visibility="1" zValue="6" referencePoint="0" marginY="1" id="" marginX="1" halign="2">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="true" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" valign="64" position="204.225,191.81,mm" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" frameJoinStyle="miter" id="" zValue="6" opacity="1" outlineWidthM="0.3,mm" positionOnPage="204.225,191.81,mm" background="false" halign="2" type="65641" marginX="1" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" visibility="1" size="57.4836,6.8714,mm" htmlState="0" labelText="REVISION 1.0" blendMode="0" marginY="1">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <FontColor blue="0" alpha="255" red="0" green="0"/>
       </LayoutItem>
-      <LayoutItem size="51.6706,6.60801,mm" valign="64" outlineWidthM="0.3,mm" opacity="1" positionOnPage="210.038,199.082,mm" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="Sunday, 20 October 2019" position="210.038,199.082,mm" groupUuid="" htmlState="0" visibility="1" zValue="5" referencePoint="0" marginY="1" id="" marginX="1" halign="2">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="true" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" valign="64" position="210.038,199.082,mm" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" frameJoinStyle="miter" id="" zValue="5" opacity="1" outlineWidthM="0.3,mm" positionOnPage="210.038,199.082,mm" background="false" halign="2" type="65641" marginX="1" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" visibility="1" size="51.6706,6.60801,mm" htmlState="0" labelText="Sunday, 20 October 2019" blendMode="0" marginY="1">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <FontColor blue="0" alpha="255" red="0" green="0"/>
       </LayoutItem>
-      <LayoutItem size="29.7523,17.4718,mm" mapUuid="" outlineWidthM="0.3,mm" opacity="1" positionOnPage="262.196,188.218,mm" resizeMode="0" northOffset="0" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" frame="false" pictureWidth="29.7523" anchorPoint="4" pictureHeight="17.4074" pictureRotation="0" svgBorderColor="0,0,0,255" blendMode="0" svgFillColor="255,255,255,255" frameJoinStyle="miter" background="false" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" positionLock="true" svgBorderWidth="0.2" type="65640" itemRotation="0" excludeFromExports="0" position="262.196,188.218,mm" file="../Gun_Run_Logo.png" northMode="0" groupUuid="" visibility="1" zValue="4" referencePoint="0" id="">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" file="../Gun_Run_Logo.png" pictureHeight="17.4074" resizeMode="0" svgFillColor="255,255,255,255" positionLock="true" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" position="262.196,188.218,mm" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" northMode="0" frameJoinStyle="miter" id="" northOffset="0" zValue="4" opacity="1" outlineWidthM="0.3,mm" positionOnPage="262.196,188.218,mm" background="false" pictureRotation="0" type="65640" excludeFromExports="0" itemRotation="0" frame="false" mapUuid="" referencePoint="0" svgBorderWidth="0.2" visibility="1" size="29.7523,17.4718,mm" svgBorderColor="0,0,0,255" pictureWidth="29.7523" blendMode="0" anchorPoint="4">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value=""/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem size="251.959,0.1,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" cornerRadiusMeasure="0,mm" positionOnPage="9.59946,198.832,mm" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" positionLock="true" type="65643" itemRotation="0" excludeFromExports="0" position="9.59946,198.832,mm" groupUuid="" visibility="1" zValue="3" referencePoint="0" id="">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="true" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" position="9.59946,198.832,mm" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" frameJoinStyle="miter" id="" zValue="3" opacity="1" outlineWidthM="0.3,mm" positionOnPage="9.59946,198.832,mm" shapeType="1" background="false" type="65643" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" cornerRadiusMeasure="0,mm" visibility="1" size="251.959,0.1,mm" blendMode="0">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol alpha="1" force_rhr="0" type="fill" clip_to_extent="1" name="">
+          <layer locked="0" enabled="1" pass="0" 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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="solid"/>
+            <prop k="outline_width" v="0.3"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem size="282.012,182.649,mm" outlineWidthM="0.15,mm" opacity="1" positionOnPage="9.44946,7.25098,mm" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" frame="false" blendMode="0" frameJoinStyle="round" labelMargin="0,mm" background="true" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" mapFlags="0" positionLock="false" followPresetName="" type="65639" itemRotation="0" excludeFromExports="0" position="9.44946,7.25098,mm" groupUuid="" visibility="1" zValue="1" referencePoint="0" drawCanvasItems="false" mapRotation="0" id="" keepLayerSet="false" followPreset="false">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem groupUuid="" positionLock="false" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" mapRotation="0" position="9.44946,7.25098,mm" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" frameJoinStyle="round" id="" zValue="1" opacity="1" outlineWidthM="0.15,mm" positionOnPage="9.44946,7.25098,mm" keepLayerSet="false" followPresetName="" mapFlags="0" background="true" type="65639" excludeFromExports="0" itemRotation="0" frame="false" referencePoint="0" drawCanvasItems="false" visibility="1" size="282.012,182.649,mm" followPreset="false" labelMargin="0,mm" blendMode="0">
+        <FrameColor blue="0" alpha="255" red="0" green="0"/>
+        <BackgroundColor blue="255" alpha="255" red="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent ymin="-33.90855529265061818" xmin="18.40084847922157607" xmax="18.40900667054944861" ymax="-33.90327151396082428"/>
+        <Extent ymin="-33.90848231674397084" xmin="18.40103928699269886" xmax="18.40919746780259914" ymax="-33.90319854486631357"/>
         <crs>
           <spatialrefsys>
             <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
@@ -15213,62 +15543,62 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" topAnnotationPosition="1" rightFrameDivisions="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" gridFramePenThickness="0.5" unit="0" rightAnnotationPosition="1" leftAnnotationDirection="0" topAnnotationDisplay="0" gridFrameSideFlags="15" leftAnnotationDisplay="0" crossLength="3" topFrameDivisions="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" bottomAnnotationDisplay="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" show="0" showAnnotation="0" intervalX="0" topAnnotationDirection="0" frameAnnotationDistance="1" leftFrameDivisions="0" frameFillColor2="0,0,0,255" annotationFormat="0" intervalY="0" rightAnnotationDisplay="0" annotationFontColor="0,0,0,255" gridFrameStyle="0" gridFrameWidth="2" gridStyle="0" rightAnnotationDirection="0" annotationExpression="" offsetX="0" bottomAnnotationPosition="1" annotationPrecision="3" name="Grid 1" offsetY="0" leftAnnotationPosition="1" position="3">
+        <ComposerMapGrid unit="0" gridFrameSideFlags="15" bottomAnnotationDisplay="0" frameFillColor2="0,0,0,255" offsetY="0" gridFrameWidth="2" annotationFontColor="0,0,0,255" intervalY="0" frameAnnotationDistance="1" annotationFormat="0" position="3" rightAnnotationDirection="0" name="Grid 1" annotationExpression="" bottomFrameDivisions="0" topAnnotationPosition="1" gridStyle="0" topFrameDivisions="0" crossLength="3" leftAnnotationPosition="1" gridFramePenThickness="0.5" topAnnotationDirection="0" showAnnotation="0" rightAnnotationDisplay="0" bottomAnnotationDirection="0" leftAnnotationDirection="0" intervalX="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" bottomAnnotationPosition="1" gridFrameStyle="0" topAnnotationDisplay="0" show="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" rightFrameDivisions="0" offsetX="0" leftAnnotationDisplay="0" blendMode="0" leftFrameDivisions="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" annotationPrecision="3">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <symbol alpha="1" force_rhr="0" type="line" clip_to_extent="1" name="">
+              <layer locked="0" enabled="1" pass="0" class="SimpleLine">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol alpha="1" force_rhr="0" type="marker" clip_to_extent="1" name="">
+              <layer locked="0" enabled="1" pass="0" class="SimpleMarker">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -15293,7 +15623,7 @@ def my_form_open(dialog, layer, feature):
         <property key="pdfTextFormat" value="0"/>
         <property key="singleFile" value="false"/>
       </customproperties>
-      <Atlas coverageLayerName="residents_access" hideCoverage="1" sortFeatures="0" pageNameExpression="&quot;FID&quot;" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" filterFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" enabled="0" coverageLayerProvider="ogr"/>
+      <Atlas coverageLayerSource="/home/tim/Documents/GunRunMaps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayerName="residents_access" enabled="0" coverageLayerProvider="ogr" filterFeatures="0" hideCoverage="1" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" sortFeatures="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" pageNameExpression="&quot;FID&quot;"/>
     </Layout>
   </Layouts>
 </qgis>
diff --git a/GIS Base Map/Gun Run.qgs~ b/GIS Base Map/Gun Run.qgs~
index b0a68bb..df5209c 100644
--- a/GIS Base Map/Gun Run.qgs~	
+++ b/GIS Base Map/Gun Run.qgs~	
@@ -19,146 +19,149 @@
   </projectCrs>
   <layer-tree-group>
     <customproperties/>
-    <layer-tree-group expanded="1" checked="Qt::Unchecked" name="Marshals">
+    <layer-tree-group name="Marshals" checked="Qt::Unchecked" expanded="1">
       <customproperties/>
-      <layer-tree-layer providerKey="ogr" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" checked="Qt::Unchecked" source="./marshal_positions.shp|layername=marshal_positions" name="marshal_positions">
+      <layer-tree-layer source="./marshal_positions.shp|layername=marshal_positions" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" name="marshal_positions" providerKey="ogr" checked="Qt::Unchecked" expanded="1">
         <customproperties>
           <property key="legend/expressionFilter" value=""/>
           <property key="legend/expressionFilterEnabled" value="false"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer providerKey="ogr" expanded="1" id="extra_security20170921130834191" checked="Qt::Unchecked" source="./extra_security.shp" name="extra_security">
+      <layer-tree-layer source="./extra_security.shp" id="extra_security20170921130834191" name="extra_security" providerKey="ogr" checked="Qt::Unchecked" expanded="1">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer providerKey="delimitedtext" expanded="1" id="marshals_by_position20161003112326575" checked="Qt::Unchecked" source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" name="marshals_by_position">
+      <layer-tree-layer source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" id="marshals_by_position20161003112326575" name="marshals_by_position" providerKey="delimitedtext" checked="Qt::Unchecked" expanded="1">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-layer providerKey="virtual" expanded="1" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" checked="Qt::Unchecked" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" name="complete_marshal_overview">
+      <layer-tree-layer source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" name="complete_marshal_overview" providerKey="virtual" checked="Qt::Unchecked" expanded="1">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-layer providerKey="ogr" expanded="0" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" checked="Qt::Unchecked" source="./marshal overviews.shp|layername=marshal overviews" name="marshal_overviews">
+      <layer-tree-layer source="./marshal overviews.shp|layername=marshal overviews" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" name="marshal_overviews" providerKey="ogr" checked="Qt::Unchecked" expanded="0">
         <customproperties>
           <property key="legend/expressionFilter" value=""/>
           <property key="legend/expressionFilterEnabled" value="false"/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" checked="Qt::Checked" name="Fencing and Cones">
+    <layer-tree-group name="Fencing and Cones" checked="Qt::Unchecked" expanded="1">
       <customproperties/>
-      <layer-tree-layer providerKey="ogr" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" checked="Qt::Checked" source="./fencing.shp|layername=fencing" name="fencing">
+      <layer-tree-layer source="./fencing.shp|layername=fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" name="fencing" providerKey="ogr" checked="Qt::Checked" expanded="1">
         <customproperties>
           <property key="expandedLegendNodes" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
           <property key="legend/expressionFilter" value=""/>
           <property key="legend/expressionFilterEnabled" value="false"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer providerKey="virtual" expanded="1" id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" checked="Qt::Unchecked" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" name="fence_groups">
+      <layer-tree-layer source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" name="fence_groups" providerKey="virtual" checked="Qt::Unchecked" expanded="1">
         <customproperties/>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" checked="Qt::Checked" name="Routes">
+    <layer-tree-group name="Routes" checked="Qt::Unchecked" expanded="1">
       <customproperties/>
-      <layer-tree-layer providerKey="ogr" expanded="0" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" checked="Qt::Unchecked" source="./timelapse.shp|layername=timelapse" name="timelapse">
+      <layer-tree-layer source="./timelapse.shp|layername=timelapse" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" name="timelapse" providerKey="ogr" checked="Qt::Unchecked" expanded="0">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-group expanded="1" checked="Qt::Unchecked" name="Markers">
+      <layer-tree-group name="Markers" checked="Qt::Unchecked" expanded="1">
         <customproperties/>
-        <layer-tree-layer providerKey="memory" expanded="1" id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" checked="Qt::Checked" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:Integer64(10,0)&amp;field=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={3d8e4e7b-efb1-4912-8f83-a6abd6543ea7}" name="route markers">
+        <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={4d2aecad-5e0a-42ca-a275-12b4d64e8964}" id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" name="route markers" providerKey="memory" checked="Qt::Checked" expanded="1">
           <customproperties>
             <property key="expandedLegendNodes"/>
             <property key="showFeatureCount" value="1"/>
           </customproperties>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-layer providerKey="ogr" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" checked="Qt::Checked" source="./all_routes.shp|layername=all_routes" name="all_routes">
+      <layer-tree-layer source="./all_routes.shp|layername=all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" name="all_routes" providerKey="ogr" checked="Qt::Checked" expanded="1">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" checked="Qt::Checked" name="Feeding Stations">
+    <layer-tree-group name="Feeding Stations" checked="Qt::Unchecked" expanded="1">
       <customproperties/>
-      <layer-tree-layer providerKey="ogr" expanded="1" id="water_tables20170921142016467" checked="Qt::Checked" source="./water_tables.shp" name="water_tables">
+      <layer-tree-layer source="./water_tables.shp" id="water_tables20170921142016467" name="water_tables" providerKey="ogr" checked="Qt::Checked" expanded="1">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Ask Me">
+    <layer-tree-group name="Ask Me" checked="Qt::Unchecked" expanded="0">
       <customproperties/>
-      <layer-tree-layer providerKey="ogr" expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" checked="Qt::Unchecked" source="./poi_labels.shp|layername=poi_labels" name="poi_labels">
+      <layer-tree-layer source="./poi_labels.shp|layername=poi_labels" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" name="poi_labels" providerKey="ogr" checked="Qt::Unchecked" expanded="1">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-layer providerKey="ogr" expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" checked="Qt::Unchecked" source="./directions_to_start.shp|layername=directions_to_start" name="directions_to_start">
+      <layer-tree-layer source="./directions_to_start.shp|layername=directions_to_start" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" name="directions_to_start" providerKey="ogr" checked="Qt::Unchecked" expanded="1">
         <customproperties/>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Residents Access">
+    <layer-tree-group name="Residents Access" checked="Qt::Unchecked" expanded="0">
       <customproperties/>
-      <layer-tree-layer providerKey="ogr" expanded="1" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" checked="Qt::Unchecked" source="./viplabels.shp" name="viplabels">
+      <layer-tree-layer source="./mayor.shp" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" name="mayor" providerKey="ogr" checked="Qt::Unchecked" expanded="1">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-layer providerKey="ogr" expanded="1" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" checked="Qt::Unchecked" source="./vipaccess.shp" name="vipaccess">
+      <layer-tree-layer source="./viplabels.shp" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" name="viplabels" providerKey="ogr" checked="Qt::Checked" expanded="1">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-layer providerKey="ogr" expanded="0" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" checked="Qt::Unchecked" source="./golfaccess.shp" name="golfaccess">
+      <layer-tree-layer source="./vipaccess.shp" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" name="vipaccess" providerKey="ogr" checked="Qt::Checked" expanded="1">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-layer providerKey="ogr" expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" checked="Qt::Unchecked" source="./residents_access_roads.shp|layername=residents_access_roads" name="residents_access_roads">
+      <layer-tree-layer source="./golfaccess.shp" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" name="golfaccess" providerKey="ogr" checked="Qt::Unchecked" expanded="0">
+        <customproperties/>
+      </layer-tree-layer>
+      <layer-tree-layer source="./residents_access_roads.shp|layername=residents_access_roads" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" name="residents_access_roads" providerKey="ogr" checked="Qt::Unchecked" expanded="1">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer providerKey="ogr" expanded="1" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" checked="Qt::Unchecked" source="./residents_access.shp|layername=residents_access" name="residents_access">
+      <layer-tree-layer source="./residents_access.shp|layername=residents_access" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" name="residents_access" providerKey="ogr" checked="Qt::Unchecked" expanded="1">
         <customproperties/>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" checked="Qt::Checked" name="OSM data">
+    <layer-tree-group name="OSM data" checked="Qt::Checked" expanded="1">
       <customproperties/>
-      <layer-tree-layer providerKey="ogr" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" checked="Qt::Checked" source="./osm_roads.shp" name="osm_roads">
+      <layer-tree-layer source="./osm_roads.shp" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" name="osm_roads" providerKey="ogr" checked="Qt::Checked" expanded="0">
         <customproperties>
           <property key="expandedLegendNodes"/>
           <property key="showFeatureCount" value="1"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer providerKey="ogr" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" checked="Qt::Checked" source="./osm_places.shp|layername=osm_places" name="osm_places">
+      <layer-tree-layer source="./osm_places.shp|layername=osm_places" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" name="osm_places" providerKey="ogr" checked="Qt::Checked" expanded="1">
         <customproperties>
           <property key="expandedLegendNodes"/>
           <property key="showFeatureCount" value="1"/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Start and Finish pages">
+    <layer-tree-group name="Start and Finish pages" checked="Qt::Unchecked" expanded="0">
       <customproperties/>
-      <layer-tree-layer providerKey="ogr" expanded="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" checked="Qt::Unchecked" source="./data-comments.shp" name="data-comments">
+      <layer-tree-layer source="./data-comments.shp" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" name="data-comments" providerKey="ogr" checked="Qt::Unchecked" expanded="1">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer providerKey="ogr" expanded="1" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" checked="Qt::Unchecked" source="./start_finish_area.shp" name="start_finish_area">
+      <layer-tree-layer source="./start_finish_area.shp" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" name="start_finish_area" providerKey="ogr" checked="Qt::Unchecked" expanded="1">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Elevation">
+    <layer-tree-group name="Elevation" checked="Qt::Unchecked" expanded="0">
       <customproperties/>
-      <layer-tree-layer providerKey="ogr" expanded="1" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" checked="Qt::Unchecked" source="./capetownelevation-1m.shp" name="capetownelevation-1m">
+      <layer-tree-layer source="./capetownelevation-1m.shp" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" name="capetownelevation-1m" providerKey="ogr" checked="Qt::Unchecked" expanded="1">
         <customproperties>
           <property key="showFeatureCount" value="1"/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" checked="Qt::Checked" name="Map">
+    <layer-tree-group name="Map" checked="Qt::Checked" expanded="1">
       <customproperties/>
-      <layer-tree-layer providerKey="gdal" expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" checked="Qt::Checked" source="./GDAL-City of Cape Town 2015 Aerial.xml" name="GDAL-City of Cape Town 2015 Aerial">
+      <layer-tree-layer source="./GDAL-City of Cape Town 2015 Aerial.xml" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" name="GDAL-City of Cape Town 2015 Aerial" providerKey="gdal" checked="Qt::Checked" expanded="1">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer providerKey="wms" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" checked="Qt::Unchecked" 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" name="Outlines">
+      <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" name="Outlines" providerKey="wms" checked="Qt::Unchecked" expanded="1">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
@@ -189,42 +192,44 @@
       <item>vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea</item>
       <item>viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0</item>
       <item>fence_groups_cbaea960_3348_4aea_b155_46e5d310f792</item>
+      <item>mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings unit="1" tolerance="10" type="1" intersection-snapping="1" enabled="0" mode="3">
+  <snapping-settings enabled="0" unit="1" type="1" tolerance="10" mode="3" intersection-snapping="1">
     <individual-layer-settings>
-      <layer-setting id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" tolerance="12" type="1" enabled="0" units="1"/>
-      <layer-setting id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" tolerance="12" type="2" enabled="0" units="1"/>
-      <layer-setting id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" tolerance="12" type="1" enabled="0" units="1"/>
-      <layer-setting id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" tolerance="12" type="2" enabled="0" units="1"/>
-      <layer-setting id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" tolerance="12" type="2" enabled="0" units="1"/>
-      <layer-setting id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" tolerance="12" type="2" enabled="0" units="1"/>
-      <layer-setting id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" tolerance="12" type="1" enabled="0" units="1"/>
-      <layer-setting id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" tolerance="12" type="2" enabled="0" units="1"/>
-      <layer-setting id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" tolerance="12" type="2" enabled="0" units="1"/>
-      <layer-setting id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" tolerance="12" type="2" enabled="0" units="1"/>
-      <layer-setting id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" tolerance="12" type="1" enabled="0" units="1"/>
-      <layer-setting id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" tolerance="12" type="2" enabled="0" units="1"/>
-      <layer-setting id="water_tables20170921142016467" tolerance="0" type="2" enabled="0" units="2"/>
-      <layer-setting id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" tolerance="12" type="2" enabled="0" units="1"/>
-      <layer-setting id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" tolerance="12" type="2" enabled="0" units="1"/>
-      <layer-setting id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" tolerance="12" type="2" enabled="0" units="1"/>
-      <layer-setting id="extra_security20170921130834191" tolerance="0" type="2" enabled="0" units="2"/>
-      <layer-setting id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" tolerance="12" type="2" enabled="0" units="1"/>
-      <layer-setting id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" tolerance="20" type="2" enabled="1" units="1"/>
-      <layer-setting id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" tolerance="12" type="2" enabled="0" units="1"/>
-      <layer-setting id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" tolerance="12" type="2" enabled="0" units="1"/>
-      <layer-setting id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" tolerance="12" type="2" enabled="0" units="1"/>
+      <layer-setting enabled="0" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" type="2" tolerance="12" units="1"/>
+      <layer-setting enabled="0" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" type="1" tolerance="12" units="1"/>
+      <layer-setting enabled="0" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" type="2" tolerance="12" units="1"/>
+      <layer-setting enabled="0" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" type="1" tolerance="12" units="1"/>
+      <layer-setting enabled="0" id="water_tables20170921142016467" type="2" tolerance="0" units="2"/>
+      <layer-setting enabled="0" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" type="1" tolerance="12" units="1"/>
+      <layer-setting enabled="0" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" type="1" tolerance="12" units="1"/>
+      <layer-setting enabled="0" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" type="2" tolerance="12" units="1"/>
+      <layer-setting enabled="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" type="2" tolerance="12" units="1"/>
+      <layer-setting enabled="0" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" type="2" tolerance="12" units="1"/>
+      <layer-setting enabled="0" id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" type="2" tolerance="12" units="1"/>
+      <layer-setting enabled="0" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" type="2" tolerance="12" units="1"/>
+      <layer-setting enabled="0" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" type="2" tolerance="12" units="1"/>
+      <layer-setting enabled="0" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" type="2" tolerance="12" units="1"/>
+      <layer-setting enabled="0" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" type="2" tolerance="12" units="1"/>
+      <layer-setting enabled="0" id="extra_security20170921130834191" type="2" tolerance="0" units="2"/>
+      <layer-setting enabled="0" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" type="2" tolerance="12" units="1"/>
+      <layer-setting enabled="0" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" type="2" tolerance="12" units="1"/>
+      <layer-setting enabled="0" id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" type="1" tolerance="12" units="1"/>
+      <layer-setting enabled="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" type="2" tolerance="12" units="1"/>
+      <layer-setting enabled="0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" type="2" tolerance="12" units="1"/>
+      <layer-setting enabled="0" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" type="2" tolerance="12" units="1"/>
+      <layer-setting enabled="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" type="2" tolerance="20" units="1"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
-  <mapcanvas annotationsVisible="1" name="theMapCanvas">
+  <mapcanvas name="theMapCanvas" annotationsVisible="1">
     <units>degrees</units>
     <extent>
-      <xmin>18.41692767498590655</xmin>
-      <ymin>-33.90411869074364404</ymin>
-      <xmax>18.4171160058941652</xmax>
-      <ymax>-33.90401241322751957</ymax>
+      <xmin>18.40827367082285093</xmin>
+      <ymin>-33.90790565674178936</ymin>
+      <xmax>18.41115303973960948</xmax>
+      <ymax>-33.90628079218919311</ymax>
     </extent>
     <rotation>0</rotation>
     <destinationsrs>
@@ -244,150 +249,155 @@
   </mapcanvas>
   <projectModels/>
   <legend updateDrawingOrder="true">
-    <legendgroup checked="Qt::Unchecked" open="true" name="Marshals">
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="true" name="marshal_positions">
+    <legendgroup name="Marshals" open="true" checked="Qt::Unchecked">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" name="marshal_positions" open="true" checked="Qt::Unchecked">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="true" name="extra_security">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" name="extra_security" open="true" checked="Qt::Unchecked">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="extra_security20170921130834191" visible="0"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="extra_security20170921130834191"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="true" name="marshals_by_position">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" name="marshals_by_position" open="true" checked="Qt::Unchecked">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="marshals_by_position20161003112326575" visible="0"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="marshals_by_position20161003112326575"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="true" name="complete_marshal_overview">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" name="complete_marshal_overview" open="true" checked="Qt::Unchecked">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" visible="0"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="false" name="marshal_overviews">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" name="marshal_overviews" open="false" checked="Qt::Unchecked">
         <filegroup hidden="false" open="false">
-          <legendlayerfile isInOverview="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" visible="0"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Checked" open="true" name="Fencing and Cones">
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" showFeatureCount="0" open="true" name="fencing">
+    <legendgroup name="Fencing and Cones" open="true" checked="Qt::Unchecked">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" name="fencing" open="true" checked="Qt::Checked">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="true" name="fence_groups">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" name="fence_groups" open="true" checked="Qt::Unchecked">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" visible="0"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Checked" open="true" name="Routes">
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="false" name="timelapse">
+    <legendgroup name="Routes" open="true" checked="Qt::Unchecked">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" name="timelapse" open="false" checked="Qt::Unchecked">
         <filegroup hidden="false" open="false">
-          <legendlayerfile isInOverview="0" layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" visible="0"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f"/>
         </filegroup>
       </legendlayer>
-      <legendgroup checked="Qt::Unchecked" open="true" name="Markers">
-        <legendlayer checked="Qt::Checked" drawingOrder="-1" showFeatureCount="1" open="true" name="route markers">
+      <legendgroup name="Markers" open="true" checked="Qt::Unchecked">
+        <legendlayer drawingOrder="-1" showFeatureCount="1" name="route markers" open="true" checked="Qt::Checked">
           <filegroup hidden="false" open="true">
-            <legendlayerfile isInOverview="0" layerid="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" visible="0"/>
+            <legendlayerfile isInOverview="0" visible="0" layerid="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" showFeatureCount="0" open="true" name="all_routes">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" name="all_routes" open="true" checked="Qt::Checked">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Checked" open="true" name="Feeding Stations">
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" showFeatureCount="0" open="true" name="water_tables">
+    <legendgroup name="Feeding Stations" open="true" checked="Qt::Unchecked">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" name="water_tables" open="true" checked="Qt::Checked">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="water_tables20170921142016467" visible="1"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="water_tables20170921142016467"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" open="false" name="Ask Me">
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="true" name="poi_labels">
+    <legendgroup name="Ask Me" open="false" checked="Qt::Unchecked">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" name="poi_labels" open="true" checked="Qt::Unchecked">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" visible="0"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="true" name="directions_to_start">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" name="directions_to_start" open="true" checked="Qt::Unchecked">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="0"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" open="false" name="Residents Access">
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="true" name="viplabels">
+    <legendgroup name="Residents Access" open="false" checked="Qt::Unchecked">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" name="mayor" open="true" checked="Qt::Unchecked">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" visible="0"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="true" name="vipaccess">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" name="viplabels" open="true" checked="Qt::Checked">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" visible="0"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="false" name="golfaccess">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" name="vipaccess" open="true" checked="Qt::Checked">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" visible="0" layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
+        </filegroup>
+      </legendlayer>
+      <legendlayer drawingOrder="-1" showFeatureCount="0" name="golfaccess" open="false" checked="Qt::Unchecked">
         <filegroup hidden="false" open="false">
-          <legendlayerfile isInOverview="0" layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" visible="0"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="true" name="residents_access_roads">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" name="residents_access_roads" open="true" checked="Qt::Unchecked">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="0"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="true" name="residents_access">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" name="residents_access" open="true" checked="Qt::Unchecked">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" visible="0"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Checked" open="true" name="OSM data">
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" showFeatureCount="1" open="false" name="osm_roads">
+    <legendgroup name="OSM data" open="true" checked="Qt::Checked">
+      <legendlayer drawingOrder="-1" showFeatureCount="1" name="osm_roads" open="false" checked="Qt::Checked">
         <filegroup hidden="false" open="false">
-          <legendlayerfile isInOverview="0" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
+          <legendlayerfile isInOverview="0" visible="1" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" showFeatureCount="1" open="true" name="osm_places">
+      <legendlayer drawingOrder="-1" showFeatureCount="1" name="osm_places" open="true" checked="Qt::Checked">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1"/>
+          <legendlayerfile isInOverview="0" visible="1" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" open="false" name="Start and Finish pages">
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="true" name="data-comments">
+    <legendgroup name="Start and Finish pages" open="false" checked="Qt::Unchecked">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" name="data-comments" open="true" checked="Qt::Unchecked">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" visible="0"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="true" name="start_finish_area">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" name="start_finish_area" open="true" checked="Qt::Unchecked">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" visible="0"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" open="false" name="Elevation">
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="1" open="true" name="capetownelevation-1m">
+    <legendgroup name="Elevation" open="false" checked="Qt::Unchecked">
+      <legendlayer drawingOrder="-1" showFeatureCount="1" name="capetownelevation-1m" open="true" checked="Qt::Unchecked">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" visible="0"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Checked" open="true" name="Map">
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" showFeatureCount="0" open="true" name="GDAL-City of Cape Town 2015 Aerial">
+    <legendgroup name="Map" open="true" checked="Qt::Checked">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" name="GDAL-City of Cape Town 2015 Aerial" open="true" checked="Qt::Checked">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1"/>
+          <legendlayerfile isInOverview="0" visible="1" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="true" name="Outlines">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" name="Outlines" open="true" checked="Qt::Unchecked">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="0"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
@@ -395,7 +405,7 @@
   <mapViewDocks/>
   <mapViewDocks3D/>
   <projectlayers>
-    <maplayer autoRefreshEnabled="0" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="100000" type="raster" minScale="1e+08" refreshOnNotifyMessage="" autoRefreshTime="0" styleCategories="AllStyleCategories">
+    <maplayer minScale="1e+08" hasScaleBasedVisibilityFlag="0" type="raster" autoRefreshTime="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" autoRefreshEnabled="0" maxScale="100000" refreshOnNotifyMessage="">
       <extent>
         <xmin>-20037508.33999999985098839</xmin>
         <ymin>-20037508.33999999985098839</ymin>
@@ -452,7 +462,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" miny="0" crs="" dimensions="2" maxy="0" maxz="0" maxx="0"/>
+          <spatial maxx="0" maxz="0" minz="0" minx="0" maxy="0" crs="" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -482,7 +492,7 @@
         <property key="identify/format" value="Value"/>
       </customproperties>
       <pipe>
-        <rasterrenderer type="multibandcolor" greenBand="2" alphaBand="-1" opacity="0.6" redBand="1" blueBand="3">
+        <rasterrenderer redBand="1" greenBand="2" type="multibandcolor" opacity="0.5" blueBand="3" alphaBand="-1">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -493,13 +503,13 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast brightness="0" contrast="0"/>
-        <huesaturation colorizeGreen="128" grayscaleMode="0" colorizeRed="255" colorizeBlue="128" saturation="0" colorizeOn="0" colorizeStrength="100"/>
+        <brightnesscontrast contrast="0" brightness="0"/>
+        <huesaturation colorizeOn="0" colorizeRed="255" saturation="0" colorizeBlue="128" colorizeGreen="128" colorizeStrength="100" grayscaleMode="0"/>
         <rasterresampler maxOversampling="2"/>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="0" type="raster" minScale="1e+08" refreshOnNotifyMessage="" autoRefreshTime="0" styleCategories="AllStyleCategories">
+    <maplayer minScale="1e+08" hasScaleBasedVisibilityFlag="0" type="raster" autoRefreshTime="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" autoRefreshEnabled="0" maxScale="0" refreshOnNotifyMessage="">
       <extent>
         <xmin>-20037508.34278924390673637</xmin>
         <ymin>-20037508.62692910060286522</ymin>
@@ -556,7 +566,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" miny="0" crs="" dimensions="2" maxy="0" maxz="0" maxx="0"/>
+          <spatial maxx="0" maxz="0" minz="0" minx="0" maxy="0" crs="" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -584,7 +594,7 @@
         <property key="identify/format" value="Undefined"/>
       </customproperties>
       <pipe>
-        <rasterrenderer type="singlebandcolordata" band="1" alphaBand="-1" opacity="0.75">
+        <rasterrenderer type="singlebandcolordata" band="1" opacity="0.75" alphaBand="-1">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -595,13 +605,13 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast brightness="0" contrast="0"/>
-        <huesaturation colorizeGreen="128" grayscaleMode="0" colorizeRed="255" colorizeBlue="128" saturation="0" colorizeOn="0" colorizeStrength="100"/>
+        <brightnesscontrast contrast="0" brightness="0"/>
+        <huesaturation colorizeOn="0" colorizeRed="255" saturation="0" colorizeBlue="128" colorizeGreen="128" colorizeStrength="100" grayscaleMode="0"/>
         <rasterresampler maxOversampling="2"/>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer simplifyDrawingHints="0" readOnly="0" simplifyAlgorithm="0" autoRefreshTime="0" geometry="Line" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="100000" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" type="vector" simplifyLocal="1" refreshOnNotifyMessage="" minScale="1e+08" refreshOnNotifyEnabled="0" labelsEnabled="1" wkbType="MultiLineString">
+    <maplayer wkbType="MultiLineString" readOnly="0" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" simplifyDrawingHints="0" simplifyLocal="1" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" autoRefreshTime="0" minScale="1e+08" geometry="Line" simplifyDrawingTol="1" simplifyMaxScale="1" autoRefreshEnabled="0" styleCategories="AllStyleCategories" type="vector" maxScale="100000">
       <extent>
         <xmin>18.37527226735897301</xmin>
         <ymin>-33.94586066151139647</ymin>
@@ -658,7 +668,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" miny="0" crs="" dimensions="2" maxy="0" maxz="0" maxx="0"/>
+          <spatial maxx="0" maxz="0" minz="0" minx="0" maxy="0" crs="" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -673,8 +683,8 @@
       <dataDependencies/>
       <legend type="default-vector"/>
       <expressionfields>
-        <field comment="" type="2" subType="0" expression="$length" name="length_m" precision="0" length="6" typeName="integer"/>
-        <field comment="" type="6" subType="0" expression="$length / 1000" name="length_km" precision="0" length="-1" typeName="double precision"/>
+        <field typeName="integer" name="length_m" type="2" length="6" subType="0" expression="$length" comment="" precision="0"/>
+        <field typeName="double precision" name="length_km" type="6" length="-1" subType="0" expression="$length / 1000" comment="" precision="0"/>
       </expressionfields>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -685,96 +695,96 @@
         <Removable>0</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="RuleRenderer" enableorderby="0" symbollevels="0" forceraster="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule label="Active Routes" description="Only show when active in Atlas" checkstate="0" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" symbol="0" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )">
-            <rule label="21KM" description="This should be disabled, since it's only for legends" checkstate="0" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" symbol="1" filter="&quot;Distance&quot; = '21KM'"/>
-            <rule label="10KM" description="This should be disabled, since it's only for legends" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" symbol="2" filter="&quot;Distance&quot; = '10KM'"/>
-            <rule label="5KM" description="This should be disabled, since it's only for legends" checkstate="0" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" symbol="3" filter="&quot;Distance&quot; = '25'"/>
+          <rule key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" symbol="0" checkstate="0" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )" label="Active Routes" description="Only show when active in Atlas">
+            <rule key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" symbol="1" checkstate="0" filter="&quot;Distance&quot; = '21KM'" label="21KM" description="This should be disabled, since it's only for legends"/>
+            <rule key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" symbol="2" filter="&quot;Distance&quot; = '10KM'" label="10KM" description="This should be disabled, since it's only for legends"/>
+            <rule key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" symbol="3" checkstate="0" filter="&quot;Distance&quot; = '25'" label="5KM" description="This should be disabled, since it's only for legends"/>
           </rule>
-          <rule label="Always show" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" symbol="4"/>
+          <rule key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" symbol="4" label="Always show"/>
         </rules>
         <symbols>
-          <symbol type="line" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="250" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+          <symbol name="0" alpha="1" type="line" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" pass="0" locked="0" 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"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="250"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@0@0" clip_to_extent="1" force_rhr="0">
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="0,0,0,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@0@0" alpha="1" type="marker" clip_to_extent="1" force_rhr="0">
+                <layer enabled="1" pass="0" locked="0" class="FilledMarker">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="0,0,0,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option value="" name="name" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@0@0@0" clip_to_extent="1" force_rhr="0">
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="0,0,0,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="227,26,28,0" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol name="@@0@0@0" alpha="1" type="fill" clip_to_extent="1" force_rhr="0">
+                    <layer enabled="1" pass="0" locked="0" 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"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="227,26,28,0"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" value="true" name="active"/>
-                              <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
-                              <Option type="int" value="3" name="type"/>
+                          <Option value="" name="name" type="QString"/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option value="true" name="active" type="bool"/>
+                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
+                              <Option value="3" name="type" type="int"/>
                             </Option>
                           </Option>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option value="collection" name="type" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -782,236 +792,236 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MapUnit" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.5" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <layer enabled="1" pass="0" locked="0" class="SimpleLine">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MapUnit"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,0,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.5"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="lastvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer enabled="1" pass="0" locked="0" 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"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="lastvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@0@2" clip_to_extent="1" force_rhr="0">
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="0,0,0,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@0@2" alpha="1" type="marker" clip_to_extent="1" force_rhr="0">
+                <layer enabled="1" pass="0" locked="0" class="SimpleMarker">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="0,0,0,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" value="true" name="active"/>
-                          <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
-                          <Option type="int" value="3" name="type"/>
+                      <Option value="" name="name" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option value="true" name="active" type="bool"/>
+                          <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
+                          <Option value="3" name="type" type="int"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="firstvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer enabled="1" pass="0" locked="0" 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"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="firstvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@0@3" clip_to_extent="1" force_rhr="0">
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="0,0,0,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@0@3" alpha="1" type="marker" clip_to_extent="1" force_rhr="0">
+                <layer enabled="1" pass="0" locked="0" class="SimpleMarker">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="0,0,0,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" value="true" name="active"/>
-                          <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
-                          <Option type="int" value="3" name="type"/>
+                      <Option value="" name="name" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option value="true" name="active" type="bool"/>
+                          <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
+                          <Option value="3" name="type" type="int"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="1" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="250" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+          <symbol name="1" alpha="1" type="line" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" pass="0" locked="0" 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"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="250"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@1@0" clip_to_extent="1" force_rhr="0">
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="210,32,39,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@1@0" alpha="1" type="marker" clip_to_extent="1" force_rhr="0">
+                <layer enabled="1" pass="0" locked="0" class="FilledMarker">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="210,32,39,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option value="" name="name" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@1@0@0" clip_to_extent="1" force_rhr="0">
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="210,32,39,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="227,26,28,0" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol name="@@1@0@0" alpha="1" type="fill" clip_to_extent="1" force_rhr="0">
+                    <layer enabled="1" pass="0" locked="0" 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"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="227,26,28,0"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" value="false" name="active"/>
-                              <Option type="int" value="1" name="type"/>
-                              <Option type="QString" value="" name="val"/>
+                          <Option value="" name="name" type="QString"/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option value="false" name="active" type="bool"/>
+                              <Option value="1" name="type" type="int"/>
+                              <Option value="" name="val" type="QString"/>
                             </Option>
                           </Option>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option value="collection" name="type" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1019,236 +1029,236 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MapUnit" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="210,32,39,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.5" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <layer enabled="1" pass="0" locked="0" class="SimpleLine">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MapUnit"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="210,32,39,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.5"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="lastvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer enabled="1" pass="0" locked="0" 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"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="lastvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@1@2" clip_to_extent="1" force_rhr="0">
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="210,32,39,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@1@2" alpha="1" type="marker" clip_to_extent="1" force_rhr="0">
+                <layer enabled="1" pass="0" locked="0" class="SimpleMarker">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="210,32,39,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                      <Option value="" name="name" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option value="false" name="active" type="bool"/>
+                          <Option value="1" name="type" type="int"/>
+                          <Option value="" name="val" type="QString"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="firstvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer enabled="1" pass="0" locked="0" 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"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="firstvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@1@3" clip_to_extent="1" force_rhr="0">
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="210,32,39,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@1@3" alpha="1" type="marker" clip_to_extent="1" force_rhr="0">
+                <layer enabled="1" pass="0" locked="0" class="SimpleMarker">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="210,32,39,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                      <Option value="" name="name" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option value="false" name="active" type="bool"/>
+                          <Option value="1" name="type" type="int"/>
+                          <Option value="" name="val" type="QString"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="2" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="250" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+          <symbol name="2" alpha="1" type="line" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" pass="0" locked="0" 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"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="250"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@2@0" clip_to_extent="1" force_rhr="0">
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="103,34,144,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@2@0" alpha="1" type="marker" clip_to_extent="1" force_rhr="0">
+                <layer enabled="1" pass="0" locked="0" class="FilledMarker">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="103,34,144,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option value="" name="name" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@2@0@0" clip_to_extent="1" force_rhr="0">
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="103,34,144,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="227,26,28,0" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol name="@@2@0@0" alpha="1" type="fill" clip_to_extent="1" force_rhr="0">
+                    <layer enabled="1" pass="0" locked="0" 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"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="227,26,28,0"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" value="false" name="active"/>
-                              <Option type="int" value="1" name="type"/>
-                              <Option type="QString" value="" name="val"/>
+                          <Option value="" name="name" type="QString"/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option value="false" name="active" type="bool"/>
+                              <Option value="1" name="type" type="int"/>
+                              <Option value="" name="val" type="QString"/>
                             </Option>
                           </Option>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option value="collection" name="type" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1256,236 +1266,236 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MapUnit" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="103,34,144,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.5" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <layer enabled="1" pass="0" locked="0" class="SimpleLine">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MapUnit"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="103,34,144,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.5"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="lastvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer enabled="1" pass="0" locked="0" 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"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="lastvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@2@2" clip_to_extent="1" force_rhr="0">
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="103,34,144,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@2@2" alpha="1" type="marker" clip_to_extent="1" force_rhr="0">
+                <layer enabled="1" pass="0" locked="0" class="SimpleMarker">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="103,34,144,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                      <Option value="" name="name" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option value="false" name="active" type="bool"/>
+                          <Option value="1" name="type" type="int"/>
+                          <Option value="" name="val" type="QString"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="firstvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer enabled="1" pass="0" locked="0" 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"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="firstvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@2@3" clip_to_extent="1" force_rhr="0">
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="103,34,144,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@2@3" alpha="1" type="marker" clip_to_extent="1" force_rhr="0">
+                <layer enabled="1" pass="0" locked="0" class="SimpleMarker">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="103,34,144,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                      <Option value="" name="name" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option value="false" name="active" type="bool"/>
+                          <Option value="1" name="type" type="int"/>
+                          <Option value="" name="val" type="QString"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="3" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="250" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+          <symbol name="3" alpha="1" type="line" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" pass="0" locked="0" 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"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="250"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@3@0" clip_to_extent="1" force_rhr="0">
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="145,211,55,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@3@0" alpha="1" type="marker" clip_to_extent="1" force_rhr="0">
+                <layer enabled="1" pass="0" locked="0" class="FilledMarker">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="145,211,55,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option value="" name="name" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@3@0@0" clip_to_extent="1" force_rhr="0">
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="145,211,55,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="227,26,28,0" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol name="@@3@0@0" alpha="1" type="fill" clip_to_extent="1" force_rhr="0">
+                    <layer enabled="1" pass="0" locked="0" 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"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="227,26,28,0"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" value="false" name="active"/>
-                              <Option type="int" value="1" name="type"/>
-                              <Option type="QString" value="" name="val"/>
+                          <Option value="" name="name" type="QString"/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option value="false" name="active" type="bool"/>
+                              <Option value="1" name="type" type="int"/>
+                              <Option value="" name="val" type="QString"/>
                             </Option>
                           </Option>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option value="collection" name="type" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1493,243 +1503,243 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MapUnit" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="145,211,55,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.5" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <layer enabled="1" pass="0" locked="0" class="SimpleLine">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MapUnit"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="145,211,55,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.5"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="lastvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer enabled="1" pass="0" locked="0" 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"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="lastvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@3@2" clip_to_extent="1" force_rhr="0">
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="145,211,55,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@3@2" alpha="1" type="marker" clip_to_extent="1" force_rhr="0">
+                <layer enabled="1" pass="0" locked="0" class="SimpleMarker">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="145,211,55,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                      <Option value="" name="name" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option value="false" name="active" type="bool"/>
+                          <Option value="1" name="type" type="int"/>
+                          <Option value="" name="val" type="QString"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="firstvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer enabled="1" pass="0" locked="0" 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"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="firstvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@3@3" clip_to_extent="1" force_rhr="0">
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="145,211,55,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@3@3" alpha="1" type="marker" clip_to_extent="1" force_rhr="0">
+                <layer enabled="1" pass="0" locked="0" class="SimpleMarker">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="145,211,55,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                      <Option value="" name="name" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option value="false" name="active" type="bool"/>
+                          <Option value="1" name="type" type="int"/>
+                          <Option value="" name="val" type="QString"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="4" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.26" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol name="4" alpha="1" type="line" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" pass="0" locked="0" class="SimpleLine">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,0,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.26"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <orderby>
-          <orderByClause nullsFirst="0" asc="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
+          <orderByClause asc="0" nullsFirst="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 active="0" description="Active routes" key="{68d5cde2-f285-4651-b007-1511cc17bfbe}" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
+          <rule key="{68d5cde2-f285-4651-b007-1511cc17bfbe}" active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="Active routes">
             <settings>
-              <text-style fontItalic="0" fieldName="round($length / 1000, 0)" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="63" blendMode="0" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="10" multilineHeight="1" textOpacity="1" fontSizeUnit="Point" textColor="255,255,255,255" namedStyle="Semibold" fontFamily="Myriad Pro" isExpression="1">
-                <text-buffer bufferOpacity="1" bufferJoinStyle="64" bufferSize="1" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255"/>
-                <background shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeType="0" shapeRadiiY="1" shapeBlendMode="0" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="0,0,0,255" shapeJoinStyle="128" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="1" shapeRadiiX="1" shapeSizeX="1" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-                <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+              <text-style fontWordSpacing="0" fontSize="10" fontItalic="0" textOpacity="1" textColor="255,255,255,255" isExpression="1" fontStrikeout="0" fontCapitals="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWeight="63" fontSizeUnit="Point" fontUnderline="0" fontFamily="Myriad Pro" useSubstitutions="0" namedStyle="Semibold" fontLetterSpacing="0" previewBkgrdColor="#ffffff" multilineHeight="1" blendMode="0" fieldName="round($length / 1000, 0)">
+                <text-buffer bufferBlendMode="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="64" bufferDraw="0" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeDraw="1" shapeSizeUnit="MM" shapeOpacity="1" shapeSizeType="0" shapeSizeX="1" shapeBorderColor="0,0,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeJoinStyle="128" shapeOffsetX="0" shapeOffsetY="0" shapeType="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeRadiiX="1" shapeRotationType="0"/>
+                <shadow shadowRadius="1.5" shadowColor="0,0,0,255" shadowOpacity="0.7" shadowScale="100" shadowBlendMode="6" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" wrapChar="" placeDirectionSymbol="0" decimals="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="0" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-              <placement quadOffset="3" preserveRotation="1" geometryGenerator="km_marker()" placement="0" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" priority="10" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-20" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" offsetUnits="MapUnit" placementFlags="10" geometryGeneratorEnabled="1" dist="2" offsetType="0"/>
-              <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="1" fontLimitPixelSize="0" displayAll="1" obstacleFactor="2" obstacle="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="0" maxNumLabels="2000" scaleMax="10000000"/>
+              <text-format wrapChar="" autoWrapLength="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0" decimals="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0"/>
+              <placement xOffset="0" repeatDistance="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" geometryGeneratorType="PointGeometry" quadOffset="3" centroidWhole="0" geometryGeneratorEnabled="1" distUnits="MM" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" offsetUnits="MapUnit" preserveRotation="1" offsetType="0" centroidInside="0" repeatDistanceUnits="MM" geometryGenerator="km_marker()" dist="2" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" placement="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20"/>
+              <rendering minFeatureSize="0" scaleMax="10000000" maxNumLabels="2000" zIndex="0" drawLabels="1" limitNumLabels="0" scaleVisibility="0" fontLimitPixelSize="0" displayAll="1" obstacleType="0" obstacleFactor="2" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="1" upsidedownLabels="0" fontMinPixelSize="3" fontMaxPixelSize="10000"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <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 type="Map" name="PositionY">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <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 type="Map" name="PredefinedPositionOrder">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="quadrant" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                    <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 type="Map" name="Rotation">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="rotation" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                    <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 type="Map" name="ShapeBorderColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <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 type="Map" name="ShapeFillColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <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 type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </dd_properties>
             </settings>
@@ -1757,21 +1767,21 @@
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundColor="#ffffff" backgroundAlpha="255" labelPlacementMethod="XHeight" lineSizeType="MM" minimumSize="0" diagramOrientation="Up" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" barWidth="5" penWidth="0" penColor="#000000" width="15" scaleDependency="Area" minScaleDenominator="100000" height="15" scaleBasedVisibility="0" rotationOffset="270" enabled="0">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" color="#000000"/>
+        <DiagramCategory minimumSize="0" penAlpha="255" labelPlacementMethod="XHeight" width="15" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penWidth="0" barWidth="5" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" minScaleDenominator="100000" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" penColor="#000000" enabled="0" height="15" lineSizeType="MM" diagramOrientation="Up">
+          <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="2" zIndex="0" obstacle="0" linePlacementFlags="2" showAll="1">
+      <DiagramLayerSettings linePlacementFlags="2" dist="0" obstacle="0" showAll="1" priority="0" placement="2" zIndex="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option value="" name="name" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -1780,8 +1790,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -1790,8 +1800,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -1800,8 +1810,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -1810,8 +1820,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -1820,8 +1830,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -1830,8 +1840,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -1840,8 +1850,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -1850,8 +1860,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -1860,8 +1870,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -1870,24 +1880,24 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </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 name="" field="Name" index="0"/>
+        <alias name="" field="descriptio" index="1"/>
+        <alias name="" field="timestamp" index="2"/>
+        <alias name="" field="begin" index="3"/>
+        <alias name="" field="end" index="4"/>
+        <alias name="" field="Distance" index="5"/>
+        <alias name="" field="RouteLen" index="6"/>
+        <alias name="" field="Source" index="7"/>
+        <alias name="" field="length_m" index="8"/>
+        <alias name="" field="length_km" index="9"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -1904,16 +1914,16 @@
         <default field="length_km" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="Name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="descriptio" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="timestamp" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="begin" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="end" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Distance" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="RouteLen" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Source" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="length_m" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="length_km" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="Name" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="descriptio" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="timestamp" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="begin" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="end" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="Distance" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="RouteLen" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="Source" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="length_m" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="length_km" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="Name" exp="" desc=""/>
@@ -1928,25 +1938,25 @@
         <constraint field="length_km" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields>
-        <field comment="" type="2" subType="0" expression="$length" name="length_m" precision="0" length="6" typeName="integer"/>
-        <field comment="" type="6" subType="0" expression="$length / 1000" name="length_km" precision="0" length="-1" typeName="double precision"/>
+        <field typeName="integer" name="length_m" type="2" length="6" subType="0" expression="$length" comment="" precision="0"/>
+        <field typeName="double precision" name="length_km" type="6" length="-1" subType="0" expression="$length / 1000" comment="" precision="0"/>
       </expressionfields>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;Name&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;Name&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="Name"/>
-          <column hidden="0" type="field" width="-1" name="descriptio"/>
-          <column hidden="0" type="field" width="-1" name="timestamp"/>
-          <column hidden="0" type="field" width="163" name="begin"/>
-          <column hidden="0" type="field" width="-1" name="end"/>
-          <column hidden="0" type="field" width="-1" name="Distance"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="RouteLen"/>
-          <column hidden="0" type="field" width="-1" name="Source"/>
-          <column hidden="0" type="field" width="-1" name="length_m"/>
-          <column hidden="0" type="field" width="-1" name="length_km"/>
+          <column width="-1" hidden="0" name="Name" type="field"/>
+          <column width="-1" hidden="0" name="descriptio" type="field"/>
+          <column width="-1" hidden="0" name="timestamp" type="field"/>
+          <column width="163" hidden="0" name="begin" type="field"/>
+          <column width="-1" hidden="0" name="end" type="field"/>
+          <column width="-1" hidden="0" name="Distance" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="RouteLen" type="field"/>
+          <column width="-1" hidden="0" name="Source" type="field"/>
+          <column width="-1" hidden="0" name="length_m" type="field"/>
+          <column width="-1" hidden="0" name="length_km" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -1977,34 +1987,34 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Source"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="end"/>
-        <field editable="0" name="length_km"/>
-        <field editable="0" name="length_m"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="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"/>
       </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 simplifyDrawingHints="1" readOnly="0" simplifyAlgorithm="0" autoRefreshTime="0" geometry="Line" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" type="vector" simplifyLocal="1" refreshOnNotifyMessage="" minScale="1e+08" refreshOnNotifyEnabled="0" labelsEnabled="0" wkbType="MultiLineString">
+    <maplayer wkbType="MultiLineString" readOnly="0" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" simplifyDrawingHints="1" simplifyLocal="1" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" autoRefreshTime="0" minScale="1e+08" geometry="Line" simplifyDrawingTol="1" simplifyMaxScale="1" autoRefreshEnabled="0" styleCategories="AllStyleCategories" type="vector" maxScale="0">
       <extent>
         <xmin>17.99958333333333371</xmin>
         <ymin>-34.00041666666666629</ymin>
@@ -2068,31 +2078,31 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" enableorderby="0" symbollevels="0" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol type="line" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="183,72,75,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.26" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol name="0" alpha="1" type="line" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" pass="0" locked="0" class="SimpleLine">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="183,72,75,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.26"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -2105,7 +2115,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>
@@ -2133,9 +2143,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 name="" field="ID" index="0"/>
+        <alias name="" field="height" index="1"/>
+        <alias name="" field="elevation" index="2"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -2145,9 +2155,9 @@ def my_form_open(dialog, layer, feature):
         <default field="elevation" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="ID" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="height" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="elevation" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="ID" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="height" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="elevation" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="ID" exp="" desc=""/>
@@ -2158,7 +2168,7 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -2178,7 +2188,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="1" readOnly="0" simplifyAlgorithm="0" autoRefreshTime="0" geometry="Polygon" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" type="vector" simplifyLocal="1" refreshOnNotifyMessage="" minScale="1e+08" refreshOnNotifyEnabled="0" labelsEnabled="0" wkbType="Polygon">
+    <maplayer wkbType="Polygon" readOnly="0" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" simplifyDrawingHints="1" simplifyLocal="1" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" autoRefreshTime="0" minScale="1e+08" geometry="Polygon" simplifyDrawingTol="1" simplifyMaxScale="1" autoRefreshEnabled="0" styleCategories="AllStyleCategories" type="vector" maxScale="0">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.94678832168284544</ymin>
@@ -2244,26 +2254,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" enableorderby="0" symbollevels="0" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol type="fill" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="225,89,137,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
+          <symbol name="0" alpha="1" type="fill" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" pass="0" locked="0" 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"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="35,35,35,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0.26"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -2276,9 +2286,9 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
-          <Option type="QString" value=""/>
+          <Option value="" type="QString"/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
@@ -2306,9 +2316,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 name="" field="id" index="0"/>
+        <alias name="" field="type" index="1"/>
+        <alias name="" field="page" index="2"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -2318,9 +2328,9 @@ def my_form_open(dialog, layer, feature):
         <default field="page" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="page" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="type" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="page" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -2331,7 +2341,7 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -2351,7 +2361,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="1" readOnly="0" simplifyAlgorithm="0" autoRefreshTime="0" geometry="Line" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" type="vector" simplifyLocal="1" refreshOnNotifyMessage="" minScale="1e+08" refreshOnNotifyEnabled="0" labelsEnabled="1" wkbType="MultiLineString">
+    <maplayer wkbType="MultiLineString" readOnly="0" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" simplifyDrawingHints="1" simplifyLocal="1" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" autoRefreshTime="0" minScale="1e+08" geometry="Line" simplifyDrawingTol="1" simplifyMaxScale="1" autoRefreshEnabled="0" styleCategories="AllStyleCategories" type="vector" maxScale="0">
       <extent>
         <xmin>18.41275838185438474</xmin>
         <ymin>-33.90124710387746632</ymin>
@@ -2408,7 +2418,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" miny="0" crs="" dimensions="2" maxy="0" maxz="0" maxx="0"/>
+          <spatial maxx="0" maxz="0" minz="0" minx="0" maxy="0" crs="" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -2432,31 +2442,31 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" enableorderby="0" symbollevels="0" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol type="line" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,85,255,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="1" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol name="0" alpha="1" type="line" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" pass="0" locked="0" class="SimpleLine">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,85,255,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="1"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -2467,20 +2477,20 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings>
-          <text-style fontItalic="0" fieldName="Name" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="63" blendMode="0" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="10" multilineHeight="1" textOpacity="1" fontSizeUnit="Point" textColor="0,0,0,255" namedStyle="Semibold" fontFamily="Myriad Pro" isExpression="0">
-            <text-buffer bufferOpacity="1" bufferJoinStyle="128" bufferSize="1" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="1" bufferColor="255,255,255,255"/>
-            <background shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeType="0" shapeRadiiY="0" shapeBlendMode="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="0" shapeRadiiX="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-            <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+          <text-style fontWordSpacing="0" fontSize="10" fontItalic="0" textOpacity="1" textColor="0,0,0,255" isExpression="0" fontStrikeout="0" fontCapitals="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWeight="63" fontSizeUnit="Point" fontUnderline="0" fontFamily="Myriad Pro" useSubstitutions="0" namedStyle="Semibold" fontLetterSpacing="0" previewBkgrdColor="#ffffff" multilineHeight="1" blendMode="0" fieldName="Name">
+            <text-buffer bufferBlendMode="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128" bufferDraw="1" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeDraw="0" shapeSizeUnit="MM" shapeOpacity="1" shapeSizeType="0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeJoinStyle="64" shapeOffsetX="0" shapeOffsetY="0" shapeType="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeRadiiX="0" shapeRotationType="0"/>
+            <shadow shadowRadius="1.5" shadowColor="0,0,0,255" shadowOpacity="0.7" shadowScale="100" shadowBlendMode="6" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
             <substitutions/>
           </text-style>
-          <text-format rightDirectionSymbol=">" wrapChar="" placeDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="0" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-          <placement quadOffset="4" preserveRotation="1" geometryGenerator="" placement="2" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" priority="5" geometryGeneratorType="LineGeometry" repeatDistance="0" maxCurvedCharAngleOut="-25" maxCurvedCharAngleIn="25" repeatDistanceUnits="MM" offsetUnits="MM" placementFlags="10" geometryGeneratorEnabled="0" dist="2" offsetType="0"/>
-          <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="0" fontLimitPixelSize="0" displayAll="0" obstacleFactor="1" obstacle="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="0" maxNumLabels="2000" scaleMax="0"/>
+          <text-format wrapChar="" autoWrapLength="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0" decimals="3" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0"/>
+          <placement xOffset="0" repeatDistance="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" priority="5" geometryGeneratorType="LineGeometry" quadOffset="4" centroidWhole="0" geometryGeneratorEnabled="0" distUnits="MM" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" offsetUnits="MM" preserveRotation="1" offsetType="0" centroidInside="0" repeatDistanceUnits="MM" geometryGenerator="" dist="2" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" placement="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25"/>
+          <rendering minFeatureSize="0" scaleMax="0" maxNumLabels="2000" zIndex="0" drawLabels="1" limitNumLabels="0" scaleVisibility="0" fontLimitPixelSize="0" displayAll="0" obstacleType="0" obstacleFactor="1" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="0" upsidedownLabels="0" fontMinPixelSize="3" fontMaxPixelSize="10000"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dd_properties>
         </settings>
@@ -2495,21 +2505,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundColor="#ffffff" backgroundAlpha="255" labelPlacementMethod="XHeight" lineSizeType="MM" minimumSize="0" diagramOrientation="Up" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" barWidth="5" penWidth="0" penColor="#000000" width="15" scaleDependency="Area" minScaleDenominator="0" height="15" scaleBasedVisibility="0" rotationOffset="270" enabled="0">
-          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" color="#000000"/>
+        <DiagramCategory minimumSize="0" penAlpha="255" labelPlacementMethod="XHeight" width="15" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penWidth="0" barWidth="5" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" minScaleDenominator="0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" penColor="#000000" enabled="0" height="15" lineSizeType="MM" diagramOrientation="Up">
+          <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="2" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
+      <DiagramLayerSettings linePlacementFlags="18" dist="0" obstacle="0" showAll="1" priority="0" placement="2" zIndex="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option value="" name="name" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -2530,8 +2540,8 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="Name" index="1" name=""/>
+        <alias name="" field="id" index="0"/>
+        <alias name="" field="Name" index="1"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -2540,8 +2550,8 @@ def my_form_open(dialog, layer, feature):
         <default field="Name" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="Name" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -2551,11 +2561,11 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="0" type="field" width="-1" name="Name"/>
-          <column hidden="1" type="actions" width="-1"/>
+          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="0" name="Name" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -2586,18 +2596,18 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="id"/>
+        <field name="Name" editable="1"/>
+        <field name="id" editable="1"/>
       </editable>
       <labelOnTop>
-        <field 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 simplifyDrawingHints="0" readOnly="0" simplifyAlgorithm="0" autoRefreshTime="0" geometry="Line" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="100000" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" type="vector" simplifyLocal="1" refreshOnNotifyMessage="" minScale="1e+08" refreshOnNotifyEnabled="0" labelsEnabled="0" wkbType="MultiLineString">
+    <maplayer wkbType="MultiLineString" readOnly="0" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" simplifyDrawingHints="0" simplifyLocal="1" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" autoRefreshTime="0" minScale="1e+08" geometry="Line" simplifyDrawingTol="1" simplifyMaxScale="1" autoRefreshEnabled="0" styleCategories="AllStyleCategories" type="vector" maxScale="100000">
       <extent>
         <xmin>18.40814103070666974</xmin>
         <ymin>-33.90827185075657724</ymin>
@@ -2654,7 +2664,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" miny="0" crs="" dimensions="2" maxy="0" maxz="0" maxx="0"/>
+          <spatial maxx="0" maxz="0" minz="0" minx="0" maxy="0" crs="" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -2678,140 +2688,140 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="RuleRenderer" enableorderby="0" symbollevels="0" forceraster="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule label="21KM" description="Only show when active in Atlas" key="{85adf11b-f941-44b6-8847-c828ab845cdc}" symbol="0" filter="&quot;distance&quot; = '21KM'"/>
-          <rule label="10KM" description="Only show when active in Atlas" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" symbol="1" filter="&quot;distance&quot; = '10KM'"/>
-          <rule label="5KM" description="Only show when active in Atlas" key="{cf733f0f-ab72-441e-b213-841aa39c1671}" symbol="2" filter="&quot;distance&quot; = '5KM'"/>
+          <rule key="{85adf11b-f941-44b6-8847-c828ab845cdc}" symbol="0" filter="&quot;distance&quot; = '21KM'" label="21KM" description="Only show when active in Atlas"/>
+          <rule key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" symbol="1" filter="&quot;distance&quot; = '10KM'" label="10KM" description="Only show when active in Atlas"/>
+          <rule key="{cf733f0f-ab72-441e-b213-841aa39c1671}" symbol="2" filter="&quot;distance&quot; = '5KM'" label="5KM" description="Only show when active in Atlas"/>
         </rules>
         <symbols>
-          <symbol type="line" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="lastvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+          <symbol name="0" alpha="1" type="line" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" pass="0" locked="0" 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"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="placement" v="lastvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@0@0" clip_to_extent="1" force_rhr="0">
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="210,32,39,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="miter" k="joinstyle"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="210,32,39,255" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0.5" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="area" k="scale_method"/>
-                  <prop v="3" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@0@0" alpha="1" type="marker" clip_to_extent="1" force_rhr="0">
+                <layer enabled="1" pass="0" locked="0" class="SimpleMarker">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="210,32,39,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="miter"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="210,32,39,255"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0.5"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="area"/>
+                  <prop k="size" v="3"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option value="" name="name" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="250" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MapUnit" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="100" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer enabled="1" pass="0" locked="0" 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"/>
+              <prop k="interval" v="250"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MapUnit"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="100"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MapUnit"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@0@1" clip_to_extent="1" force_rhr="0">
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="210,32,39,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@0@1" alpha="1" type="marker" clip_to_extent="1" force_rhr="0">
+                <layer enabled="1" pass="0" locked="0" class="FilledMarker">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="210,32,39,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="3"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option value="" name="name" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@0@1@0" clip_to_extent="1" force_rhr="0">
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="210,32,39,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="26,0,201,0" k="outline_color"/>
-                      <prop v="no" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol name="@@0@1@0" alpha="1" type="fill" clip_to_extent="1" force_rhr="0">
+                    <layer enabled="1" pass="0" locked="0" 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"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="26,0,201,0"/>
+                      <prop k="outline_style" v="no"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option value="" name="name" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option value="collection" name="type" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2819,106 +2829,106 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-              <prop v="flat" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MapUnit" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="miter" k="joinstyle"/>
-              <prop v="210,32,39,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.75" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <layer enabled="1" pass="0" locked="0" 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"/>
+              <prop k="customdash_unit" v="MapUnit"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="miter"/>
+              <prop k="line_color" v="210,32,39,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.75"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="1" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="lastvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+          <symbol name="1" alpha="1" type="line" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" pass="0" locked="0" 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"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="lastvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@1@0" clip_to_extent="1" force_rhr="0">
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="103,34,144,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@1@0" alpha="1" type="marker" clip_to_extent="1" force_rhr="0">
+                <layer enabled="1" pass="0" locked="0" class="FilledMarker">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="103,34,144,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="3"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option value="" name="name" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@1@0@0" clip_to_extent="1" force_rhr="0">
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="103,34,144,255" k="color"/>
-                      <prop v="miter" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="103,34,144,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0.5" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol name="@@1@0@0" alpha="1" type="fill" clip_to_extent="1" force_rhr="0">
+                    <layer enabled="1" pass="0" locked="0" 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"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="103,34,144,255"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0.5"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option value="" name="name" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option value="collection" name="type" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2926,79 +2936,79 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="250" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="100" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer enabled="1" pass="0" locked="0" 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"/>
+              <prop k="interval" v="250"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="100"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@1@1" clip_to_extent="1" force_rhr="0">
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="103,34,144,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@1@1" alpha="1" type="marker" clip_to_extent="1" force_rhr="0">
+                <layer enabled="1" pass="0" locked="0" class="FilledMarker">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="103,34,144,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="3"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option value="" name="name" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@1@1@0" clip_to_extent="1" force_rhr="0">
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="103,34,144,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="26,0,201,0" k="outline_color"/>
-                      <prop v="no" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol name="@@1@1@0" alpha="1" type="fill" clip_to_extent="1" force_rhr="0">
+                    <layer enabled="1" pass="0" locked="0" 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"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="26,0,201,0"/>
+                      <prop k="outline_style" v="no"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option value="" name="name" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option value="collection" name="type" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3006,106 +3016,106 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-              <prop v="flat" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="miter" k="joinstyle"/>
-              <prop v="103,34,144,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.75" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <layer enabled="1" pass="0" locked="0" 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"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="miter"/>
+              <prop k="line_color" v="103,34,144,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.75"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="2" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MapUnit" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="lastvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+          <symbol name="2" alpha="1" type="line" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" pass="0" locked="0" 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"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MapUnit"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MapUnit"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="placement" v="lastvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@2@0" clip_to_extent="1" force_rhr="0">
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="69,100,25,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@2@0" alpha="1" type="marker" clip_to_extent="1" force_rhr="0">
+                <layer enabled="1" pass="0" locked="0" class="FilledMarker">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="69,100,25,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="3"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option value="" name="name" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@2@0@0" clip_to_extent="1" force_rhr="0">
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="69,100,25,255" k="color"/>
-                      <prop v="miter" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="69,100,25,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0.5" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol name="@@2@0@0" alpha="1" type="fill" clip_to_extent="1" force_rhr="0">
+                    <layer enabled="1" pass="0" locked="0" 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"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="69,100,25,255"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0.5"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option value="" name="name" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option value="collection" name="type" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3113,79 +3123,79 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="250" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MapUnit" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="100" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer enabled="1" pass="0" locked="0" 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"/>
+              <prop k="interval" v="250"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MapUnit"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="100"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MapUnit"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@2@1" clip_to_extent="1" force_rhr="0">
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="69,100,25,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@2@1" alpha="1" type="marker" clip_to_extent="1" force_rhr="0">
+                <layer enabled="1" pass="0" locked="0" class="FilledMarker">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="69,100,25,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="3"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option value="" name="name" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@2@1@0" clip_to_extent="1" force_rhr="0">
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="69,100,25,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="26,0,201,0" k="outline_color"/>
-                      <prop v="no" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol name="@@2@1@0" alpha="1" type="fill" clip_to_extent="1" force_rhr="0">
+                    <layer enabled="1" pass="0" locked="0" 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"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="26,0,201,0"/>
+                      <prop k="outline_style" v="no"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option value="" name="name" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option value="collection" name="type" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3193,35 +3203,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-              <prop v="flat" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MapUnit" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="miter" k="joinstyle"/>
-              <prop v="69,100,25,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.75" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <layer enabled="1" pass="0" locked="0" 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"/>
+              <prop k="customdash_unit" v="MapUnit"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="miter"/>
+              <prop k="line_color" v="69,100,25,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.75"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <orderby>
-          <orderByClause nullsFirst="0" asc="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
+          <orderByClause asc="0" nullsFirst="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
         </orderby>
       </renderer-v2>
       <customproperties>
@@ -3234,21 +3244,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundColor="#ffffff" backgroundAlpha="255" labelPlacementMethod="XHeight" lineSizeType="MM" minimumSize="0" diagramOrientation="Up" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" barWidth="5" penWidth="0" penColor="#000000" width="15" scaleDependency="Area" minScaleDenominator="100000" height="15" scaleBasedVisibility="0" rotationOffset="270" enabled="0">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" color="#000000"/>
+        <DiagramCategory minimumSize="0" penAlpha="255" labelPlacementMethod="XHeight" width="15" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penWidth="0" barWidth="5" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" minScaleDenominator="100000" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" penColor="#000000" enabled="0" height="15" lineSizeType="MM" diagramOrientation="Up">
+          <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="2" zIndex="0" obstacle="0" linePlacementFlags="2" showAll="1">
+      <DiagramLayerSettings linePlacementFlags="2" dist="0" obstacle="0" showAll="1" priority="0" placement="2" zIndex="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option value="" name="name" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -3264,16 +3274,16 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="Distance" index="1" name=""/>
+        <alias name="" field="id" index="0"/>
+        <alias name="" field="Distance" index="1"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -3282,8 +3292,8 @@ def my_form_open(dialog, layer, feature):
         <default field="Distance" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Distance" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="Distance" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -3293,11 +3303,11 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;Distance&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;Distance&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="Distance"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="id"/>
+          <column width="-1" hidden="0" name="Distance" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="id" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3328,36 +3338,36 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Source"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="end"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="length_km"/>
-        <field editable="1" name="length_m"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="begin" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="length_km" editable="1"/>
+        <field name="length_m" editable="1"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
-        <field 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 simplifyDrawingHints="0" readOnly="0" simplifyAlgorithm="0" autoRefreshTime="0" geometry="Point" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="100000" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" type="vector" simplifyLocal="1" refreshOnNotifyMessage="" minScale="1e+08" refreshOnNotifyEnabled="0" labelsEnabled="1" wkbType="Point">
+    <maplayer wkbType="Point" readOnly="0" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" simplifyDrawingHints="0" simplifyLocal="1" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" autoRefreshTime="0" minScale="1e+08" geometry="Point" simplifyDrawingTol="1" simplifyMaxScale="1" autoRefreshEnabled="0" styleCategories="AllStyleCategories" type="vector" maxScale="100000">
       <extent>
         <xmin>18.38517016505928936</xmin>
         <ymin>-33.91987011678683217</ymin>
@@ -3421,39 +3431,39 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" enableorderby="0" symbollevels="0" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol type="marker" alpha="0.796078" name="0" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-              <prop v="0" k="angle"/>
-              <prop v="227,0,185,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,0" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="1" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol name="0" alpha="0.796078" type="marker" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" pass="0" locked="0" class="SimpleMarker">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="227,0,185,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="circle"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="0,0,0,0"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="1"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -3464,89 +3474,89 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{de1ff1b5-a53a-4841-835f-57785b684a9d}">
-          <rule description="Show in marshal maps" key="{9ea624c1-7179-4746-8777-84b8008475a1}" filter="'marshal' = attribute( $atlasfeature , 'type' )">
+          <rule key="{9ea624c1-7179-4746-8777-84b8008475a1}" filter="'marshal' = attribute( $atlasfeature , 'type' )" description="Show in marshal maps">
             <settings>
-              <text-style fontItalic="0" fieldName="position" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="63" blendMode="0" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="8" multilineHeight="1" textOpacity="1" fontSizeUnit="Point" textColor="0,0,0,255" namedStyle="Semibold" fontFamily="Myriad Pro" isExpression="0">
-                <text-buffer bufferOpacity="1" bufferJoinStyle="64" bufferSize="1" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255"/>
-                <background shapeType="3" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeType="0" shapeRadiiY="0" shapeBlendMode="0" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.2" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="0.4" shapeRadiiX="0" shapeSizeX="0.2" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-                <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+              <text-style fontWordSpacing="0" fontSize="8" fontItalic="0" textOpacity="1" textColor="0,0,0,255" isExpression="0" fontStrikeout="0" fontCapitals="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWeight="63" fontSizeUnit="Point" fontUnderline="0" fontFamily="Myriad Pro" useSubstitutions="0" namedStyle="Semibold" fontLetterSpacing="0" previewBkgrdColor="#ffffff" multilineHeight="1" blendMode="0" fieldName="position">
+                <text-buffer bufferBlendMode="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="64" bufferDraw="0" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBorderWidth="0.4" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeDraw="1" shapeSizeUnit="MM" shapeOpacity="1" shapeSizeType="0" shapeSizeX="0.2" shapeBorderColor="0,0,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.2" shapeFillColor="255,255,255,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeJoinStyle="64" shapeOffsetX="0" shapeOffsetY="0" shapeType="3" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeRadiiX="0" shapeRotationType="0"/>
+                <shadow shadowRadius="1.5" shadowColor="0,0,0,255" shadowOpacity="0.7" shadowScale="100" shadowBlendMode="6" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" wrapChar="" placeDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="0" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-              <placement quadOffset="4" preserveRotation="1" geometryGenerator="" placement="1" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" priority="8" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-20" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" offsetUnits="MapUnit" placementFlags="10" geometryGeneratorEnabled="0" dist="0" offsetType="0"/>
-              <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="1" fontLimitPixelSize="0" displayAll="1" obstacleFactor="1" obstacle="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="0" maxNumLabels="2000" scaleMax="10000000"/>
+              <text-format wrapChar="" autoWrapLength="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0" decimals="3" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0"/>
+              <placement xOffset="0" repeatDistance="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" priority="8" geometryGeneratorType="PointGeometry" quadOffset="4" centroidWhole="0" geometryGeneratorEnabled="0" distUnits="MM" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" offsetUnits="MapUnit" preserveRotation="1" offsetType="0" centroidInside="0" repeatDistanceUnits="MM" geometryGenerator="" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" placement="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20"/>
+              <rendering minFeatureSize="0" scaleMax="10000000" maxNumLabels="2000" zIndex="0" drawLabels="1" limitNumLabels="0" scaleVisibility="0" fontLimitPixelSize="0" displayAll="1" obstacleType="0" obstacleFactor="1" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="1" upsidedownLabels="0" fontMinPixelSize="3" fontMaxPixelSize="10000"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="FontStyle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="FontStyle" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="ObstacleFactor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="ObstacleFactor" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="Priority">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="Priority" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="Size" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="ZIndex">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="ZIndex" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </dd_properties>
             </settings>
           </rule>
-          <rule description="Show in marshal overview" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}" filter="'marshal plan' = attribute( $atlasfeature , 'type' )">
+          <rule key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}" filter="'marshal plan' = attribute( $atlasfeature , 'type' )" description="Show in marshal overview">
             <settings>
-              <text-style fontItalic="0" fieldName="position" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="63" blendMode="0" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="4" multilineHeight="1" textOpacity="0.9" fontSizeUnit="Point" textColor="227,0,185,255" namedStyle="Semibold" fontFamily="Myriad Pro" isExpression="0">
-                <text-buffer bufferOpacity="1" bufferJoinStyle="64" bufferSize="1" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255"/>
-                <background shapeType="3" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.5" shapeSizeType="0" shapeRadiiY="0" shapeBlendMode="0" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="0.1" shapeRadiiX="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-                <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+              <text-style fontWordSpacing="0" fontSize="4" fontItalic="0" textOpacity="0.9" textColor="227,0,185,255" isExpression="0" fontStrikeout="0" fontCapitals="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWeight="63" fontSizeUnit="Point" fontUnderline="0" fontFamily="Myriad Pro" useSubstitutions="0" namedStyle="Semibold" fontLetterSpacing="0" previewBkgrdColor="#ffffff" multilineHeight="1" blendMode="0" fieldName="position">
+                <text-buffer bufferBlendMode="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="64" bufferDraw="0" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBorderWidth="0.1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeDraw="1" shapeSizeUnit="MM" shapeOpacity="0.5" shapeSizeType="0" shapeSizeX="0" shapeBorderColor="0,0,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeJoinStyle="64" shapeOffsetX="0" shapeOffsetY="0" shapeType="3" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeRadiiX="0" shapeRotationType="0"/>
+                <shadow shadowRadius="1.5" shadowColor="0,0,0,255" shadowOpacity="0.7" shadowScale="100" shadowBlendMode="6" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" wrapChar="" placeDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="0" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-              <placement quadOffset="4" preserveRotation="1" geometryGenerator="" placement="6" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" priority="10" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-20" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" offsetUnits="MapUnit" placementFlags="10" geometryGeneratorEnabled="0" dist="1" offsetType="0"/>
-              <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="1" fontLimitPixelSize="0" displayAll="1" obstacleFactor="1" obstacle="0" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="2" maxNumLabels="2000" scaleMax="10000000"/>
+              <text-format wrapChar="" autoWrapLength="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0" decimals="3" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0"/>
+              <placement xOffset="0" repeatDistance="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" geometryGeneratorType="PointGeometry" quadOffset="4" centroidWhole="0" geometryGeneratorEnabled="0" distUnits="MM" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" offsetUnits="MapUnit" preserveRotation="1" offsetType="0" centroidInside="0" repeatDistanceUnits="MM" geometryGenerator="" dist="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20"/>
+              <rendering minFeatureSize="0" scaleMax="10000000" maxNumLabels="2000" zIndex="2" drawLabels="1" limitNumLabels="0" scaleVisibility="0" fontLimitPixelSize="0" displayAll="1" obstacleType="0" obstacleFactor="1" labelPerPart="0" mergeLines="0" obstacle="0" scaleMin="1" upsidedownLabels="0" fontMinPixelSize="3" fontMaxPixelSize="10000"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="FontStyle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="FontStyle" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="Size" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </dd_properties>
             </settings>
@@ -3697,21 +3707,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundColor="#ffffff" backgroundAlpha="255" labelPlacementMethod="XHeight" lineSizeType="MM" minimumSize="0" diagramOrientation="Up" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" barWidth="5" penWidth="0" penColor="#000000" width="15" scaleDependency="Area" minScaleDenominator="100000" height="15" scaleBasedVisibility="0" rotationOffset="270" enabled="0">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" color="#000000"/>
+        <DiagramCategory minimumSize="0" penAlpha="255" labelPlacementMethod="XHeight" width="15" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penWidth="0" barWidth="5" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" minScaleDenominator="100000" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" penColor="#000000" enabled="0" height="15" lineSizeType="MM" diagramOrientation="Up">
+          <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="0" zIndex="0" obstacle="0" linePlacementFlags="10" showAll="1">
+      <DiagramLayerSettings linePlacementFlags="10" dist="0" obstacle="0" showAll="1" priority="0" placement="0" zIndex="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option value="" name="name" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -3720,8 +3730,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -3730,8 +3740,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -3740,17 +3750,17 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="position" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
+        <alias name="" field="id" index="0"/>
+        <alias name="" field="position" index="1"/>
+        <alias name="" field="type" index="2"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -3760,9 +3770,9 @@ def my_form_open(dialog, layer, feature):
         <default field="type" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="position" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="position" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="type" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -3773,12 +3783,12 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;position&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;position&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="position"/>
-          <column hidden="0" type="field" width="-1" name="type"/>
+          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="position" type="field"/>
+          <column width="-1" hidden="0" name="type" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3851,7 +3861,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="1" readOnly="0" simplifyAlgorithm="0" autoRefreshTime="0" geometry="Polygon" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" type="vector" simplifyLocal="1" refreshOnNotifyMessage="" minScale="1e+08" refreshOnNotifyEnabled="0" labelsEnabled="0" wkbType="Polygon">
+    <maplayer wkbType="Polygon" readOnly="0" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" simplifyDrawingHints="1" simplifyLocal="1" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" autoRefreshTime="0" minScale="1e+08" geometry="Polygon" simplifyDrawingTol="1" simplifyMaxScale="1" autoRefreshEnabled="0" styleCategories="AllStyleCategories" type="vector" maxScale="0">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -3917,26 +3927,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" enableorderby="0" symbollevels="0" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol type="fill" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="0,85,0,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,85,0,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="b_diagonal" k="style"/>
+          <symbol name="0" alpha="1" type="fill" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" pass="0" locked="0" class="SimpleFill">
+              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="color" v="0,85,0,255"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="0,85,0,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0.26"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="style" v="b_diagonal"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -3946,9 +3956,7 @@ def my_form_open(dialog, layer, feature):
         <sizescale/>
       </renderer-v2>
       <customproperties>
-        <property key="dualview/previewExpressions">
-          <value>name</value>
-        </property>
+        <property key="dualview/previewExpressions" value="name"/>
         <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
@@ -3957,21 +3965,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundColor="#ffffff" backgroundAlpha="255" labelPlacementMethod="XHeight" lineSizeType="MM" minimumSize="0" diagramOrientation="Up" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" barWidth="5" penWidth="0" penColor="#000000" width="15" scaleDependency="Area" minScaleDenominator="0" height="15" scaleBasedVisibility="0" rotationOffset="270" enabled="0">
-          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" color="#000000"/>
+        <DiagramCategory minimumSize="0" penAlpha="255" labelPlacementMethod="XHeight" width="15" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penWidth="0" barWidth="5" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" minScaleDenominator="0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" penColor="#000000" enabled="0" height="15" lineSizeType="MM" diagramOrientation="Up">
+          <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="1" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
+      <DiagramLayerSettings linePlacementFlags="18" dist="0" obstacle="0" showAll="1" priority="0" placement="1" zIndex="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option value="" name="name" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -4013,11 +4021,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="type" index="2" name=""/>
-        <alias field="cone_len" index="3" name=""/>
-        <alias field="fence_len" index="4" name=""/>
+        <alias name="" field="name" index="0"/>
+        <alias name="" field="group" index="1"/>
+        <alias name="" field="type" index="2"/>
+        <alias name="" field="cone_len" index="3"/>
+        <alias name="" field="fence_len" index="4"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -4029,11 +4037,11 @@ def my_form_open(dialog, layer, feature):
         <default field="fence_len" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="group" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="cone_len" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="fence_len" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="name" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="group" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="type" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="cone_len" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="fence_len" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="name" exp="" desc=""/>
@@ -4046,14 +4054,14 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="name"/>
-          <column hidden="0" type="field" width="-1" name="group"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="type"/>
-          <column hidden="0" type="field" width="-1" name="cone_len"/>
-          <column hidden="0" type="field" width="-1" name="fence_len"/>
+          <column width="-1" hidden="0" name="name" type="field"/>
+          <column width="-1" hidden="0" name="group" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="type" type="field"/>
+          <column width="-1" hidden="0" name="cone_len" type="field"/>
+          <column width="-1" hidden="0" name="fence_len" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -4084,18 +4092,18 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="group"/>
-        <field editable="1" name="name"/>
+        <field name="group" editable="1"/>
+        <field name="name" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="group"/>
-        <field labelOnTop="0" name="name"/>
+        <field name="group" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
       </labelOnTop>
       <widgets/>
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="1" readOnly="0" simplifyAlgorithm="0" autoRefreshTime="0" geometry="Line" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" type="vector" simplifyLocal="1" refreshOnNotifyMessage="" minScale="1e+08" refreshOnNotifyEnabled="0" labelsEnabled="1" wkbType="MultiLineString">
+    <maplayer wkbType="MultiLineString" readOnly="0" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" simplifyDrawingHints="1" simplifyLocal="1" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" autoRefreshTime="0" minScale="1e+08" geometry="Line" simplifyDrawingTol="1" simplifyMaxScale="1" autoRefreshEnabled="0" styleCategories="AllStyleCategories" type="vector" maxScale="0">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -4152,7 +4160,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" miny="0" crs="" dimensions="2" maxy="0" maxz="0" maxx="0"/>
+          <spatial maxx="0" maxz="0" minz="0" minx="0" maxy="0" crs="" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -4167,47 +4175,47 @@ def my_form_open(dialog, layer, feature):
       <dataDependencies/>
       <legend type="default-vector"/>
       <expressionfields>
-        <field comment="" type="6" subType="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" name="fence_len" precision="0" length="-1" typeName="double precision"/>
-        <field comment="" type="6" subType="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" name="fence_len" precision="0" length="-1" typeName="double precision"/>
-        <field comment="" type="6" subType="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" name="cone_len" precision="0" length="-1" typeName="double precision"/>
+        <field typeName="double precision" name="fence_len" type="6" length="-1" subType="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" comment="" precision="0"/>
+        <field typeName="double precision" name="fence_len" type="6" length="-1" subType="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" comment="" precision="0"/>
+        <field typeName="double precision" name="cone_len" type="6" length="-1" subType="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" comment="" precision="0"/>
       </expressionfields>
       <map-layer-style-manager current="Fencing">
         <map-layer-style name="Fencing"/>
         <map-layer-style name="Simple">
-          <qgis hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyAlgorithm="0" version="3.8.3-Zanzibar" simplifyDrawingHints="1" simplifyLocal="1" minScale="1e+08" labelsEnabled="1" simplifyDrawingTol="1" simplifyMaxScale="1" readOnly="0" styleCategories="AllStyleCategories">
+          <qgis simplifyAlgorithm="0" simplifyLocal="1" minScale="1e+08" simplifyDrawingTol="1" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" styleCategories="AllStyleCategories" version="3.8.3-Zanzibar" readOnly="0" maxScale="0" simplifyDrawingHints="1">
             <flags>
               <Identifiable>1</Identifiable>
               <Removable>1</Removable>
               <Searchable>1</Searchable>
             </flags>
-            <renderer-v2 type="RuleRenderer" enableorderby="0" symbollevels="1" forceraster="0">
+            <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="1" enableorderby="0">
               <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-                <rule label="Visible" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" symbol="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL"/>
+                <rule key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" symbol="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" label="Visible"/>
               </rules>
               <symbols>
-                <symbol type="line" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-                  <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-                    <prop v="square" k="capstyle"/>
-                    <prop v="5;2" k="customdash"/>
-                    <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                    <prop v="MM" k="customdash_unit"/>
-                    <prop v="0" k="draw_inside_polygon"/>
-                    <prop v="bevel" k="joinstyle"/>
-                    <prop v="255,255,0,255" k="line_color"/>
-                    <prop v="solid" k="line_style"/>
-                    <prop v="0.5" k="line_width"/>
-                    <prop v="MM" k="line_width_unit"/>
-                    <prop v="0" k="offset"/>
-                    <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                    <prop v="MM" k="offset_unit"/>
-                    <prop v="0" k="ring_filter"/>
-                    <prop v="0" k="use_custom_dash"/>
-                    <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+                <symbol name="0" alpha="1" type="line" clip_to_extent="1" force_rhr="0">
+                  <layer enabled="1" pass="0" locked="0" class="SimpleLine">
+                    <prop k="capstyle" v="square"/>
+                    <prop k="customdash" v="5;2"/>
+                    <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                    <prop k="customdash_unit" v="MM"/>
+                    <prop k="draw_inside_polygon" v="0"/>
+                    <prop k="joinstyle" v="bevel"/>
+                    <prop k="line_color" v="255,255,0,255"/>
+                    <prop k="line_style" v="solid"/>
+                    <prop k="line_width" v="0.5"/>
+                    <prop k="line_width_unit" v="MM"/>
+                    <prop k="offset" v="0"/>
+                    <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                    <prop k="offset_unit" v="MM"/>
+                    <prop k="ring_filter" v="0"/>
+                    <prop k="use_custom_dash" v="0"/>
+                    <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option value="" name="name" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
@@ -4218,62 +4226,62 @@ def my_form_open(dialog, layer, feature):
               <rules key="{7b0a59ec-9387-4d8e-badd-0d99ebc42174}">
                 <rule key="{4961744d-6387-45d0-90bf-01e48d575e6e}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
                   <settings>
-                    <text-style fontItalic="0" fieldName="comment" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="50" blendMode="0" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="11" multilineHeight="1" textOpacity="0.8" fontSizeUnit="Point" textColor="0,0,0,255" namedStyle="Regular" fontFamily="Myriad Pro" isExpression="0">
-                      <text-buffer bufferOpacity="1" bufferJoinStyle="128" bufferSize="1" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255"/>
-                      <background shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.6" shapeSizeType="0" shapeRadiiY="1" shapeBlendMode="0" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="255,255,0,255" shapeSizeY="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="128" shapeFillColor="255,255,255,255" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="0.6" shapeRadiiX="1" shapeSizeX="1" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-                      <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+                    <text-style fontWordSpacing="0" fontSize="11" fontItalic="0" textOpacity="0.8" textColor="0,0,0,255" isExpression="0" fontStrikeout="0" fontCapitals="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWeight="50" fontSizeUnit="Point" fontUnderline="0" fontFamily="Myriad Pro" useSubstitutions="0" namedStyle="Regular" previewBkgrdColor="#ffffff" fontLetterSpacing="0" multilineHeight="1" blendMode="0" fieldName="comment">
+                      <text-buffer bufferBlendMode="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128" bufferDraw="0" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                      <background shapeBorderWidth="0.6" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.6" shapeRadiiY="1" shapeDraw="1" shapeSizeUnit="MM" shapeSizeType="0" shapeBorderColor="255,255,0,255" shapeSizeX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeFillColor="255,255,255,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeJoinStyle="128" shapeOffsetX="0" shapeOffsetY="0" shapeType="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeRadiiX="1" shapeRotationType="0"/>
+                      <shadow shadowRadius="1.5" shadowColor="0,0,0,255" shadowOpacity="0.7" shadowScale="100" shadowBlendMode="6" shadowOffsetDist="1" shadowUnder="0" shadowOffsetGlobal="1" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
                       <substitutions/>
                     </text-style>
-                    <text-format rightDirectionSymbol=">" wrapChar="" placeDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="4294967295" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-                    <placement quadOffset="4" preserveRotation="1" geometryGenerator="" placement="4" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" priority="5" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-25" maxCurvedCharAngleIn="25" repeatDistanceUnits="MM" offsetUnits="MM" placementFlags="2" geometryGeneratorEnabled="0" dist="5" offsetType="0"/>
-                    <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="0" fontLimitPixelSize="0" displayAll="1" obstacleFactor="1" obstacle="1" mergeLines="1" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="0" maxNumLabels="2000" scaleMax="0"/>
+                    <text-format autoWrapLength="0" wrapChar="" plussign="0" placeDirectionSymbol="0" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0" decimals="3" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="4294967295" useMaxLineLengthForAutoWrap="1"/>
+                    <placement repeatDistance="0" xOffset="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" priority="5" geometryGeneratorType="PointGeometry" quadOffset="4" centroidWhole="0" geometryGeneratorEnabled="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" rotationAngle="0" placementFlags="2" offsetUnits="MM" preserveRotation="1" geometryGenerator="" offsetType="0" repeatDistanceUnits="MM" centroidInside="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" dist="5" maxCurvedCharAngleOut="-25" placement="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25"/>
+                    <rendering minFeatureSize="0" scaleMax="0" maxNumLabels="2000" zIndex="0" drawLabels="1" limitNumLabels="0" scaleVisibility="0" fontLimitPixelSize="0" displayAll="1" obstacleType="0" obstacleFactor="1" labelPerPart="0" mergeLines="1" obstacle="1" scaleMin="0" upsidedownLabels="0" fontMinPixelSize="3" fontMaxPixelSize="10000"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
-                        <Option type="Map" name="properties">
-                          <Option type="Map" name="PositionX">
-                            <Option type="bool" value="true" name="active"/>
-                            <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
-                            <Option type="int" value="2" name="type"/>
+                        <Option value="" name="name" type="QString"/>
+                        <Option name="properties" type="Map">
+                          <Option name="PositionX" type="Map">
+                            <Option value="true" name="active" type="bool"/>
+                            <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
+                            <Option value="2" name="type" type="int"/>
                           </Option>
-                          <Option type="Map" name="PositionY">
-                            <Option type="bool" value="true" name="active"/>
-                            <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
-                            <Option type="int" value="2" name="type"/>
+                          <Option name="PositionY" type="Map">
+                            <Option value="true" name="active" type="bool"/>
+                            <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
+                            <Option value="2" name="type" type="int"/>
                           </Option>
                         </Option>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </dd_properties>
                   </settings>
                 </rule>
                 <rule key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}" filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')">
                   <settings>
-                    <text-style fontItalic="0" fieldName="round( $length, 1) || 'm'" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="63" blendMode="0" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="12" multilineHeight="1" textOpacity="1" fontSizeUnit="Point" textColor="0,0,0,255" namedStyle="Semibold" fontFamily="Myriad Pro" isExpression="1">
-                      <text-buffer bufferOpacity="1" bufferJoinStyle="128" bufferSize="1" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="1" bufferColor="255,255,255,255"/>
-                      <background shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeType="0" shapeRadiiY="0" shapeBlendMode="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="0" shapeRadiiX="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-                      <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+                    <text-style fontWordSpacing="0" fontSize="12" fontItalic="0" textOpacity="1" textColor="0,0,0,255" isExpression="1" fontStrikeout="0" fontCapitals="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWeight="63" fontSizeUnit="Point" fontUnderline="0" fontFamily="Myriad Pro" useSubstitutions="0" namedStyle="Semibold" previewBkgrdColor="#ffffff" fontLetterSpacing="0" multilineHeight="1" blendMode="0" fieldName="round( $length, 1) || 'm'">
+                      <text-buffer bufferBlendMode="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128" bufferDraw="1" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                      <background shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeRadiiY="0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeJoinStyle="64" shapeOffsetX="0" shapeOffsetY="0" shapeType="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeRadiiX="0" shapeRotationType="0"/>
+                      <shadow shadowRadius="1.5" shadowColor="0,0,0,255" shadowOpacity="0.7" shadowScale="100" shadowBlendMode="6" shadowOffsetDist="1" shadowUnder="0" shadowOffsetGlobal="1" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
                       <substitutions/>
                     </text-style>
-                    <text-format rightDirectionSymbol=">" wrapChar="" placeDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="4294967295" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-                    <placement quadOffset="4" preserveRotation="1" geometryGenerator="" placement="2" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" priority="5" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-25" maxCurvedCharAngleIn="25" repeatDistanceUnits="MM" offsetUnits="MM" placementFlags="15" geometryGeneratorEnabled="0" dist="1" offsetType="0"/>
-                    <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="0" fontLimitPixelSize="0" displayAll="0" obstacleFactor="1" obstacle="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="0" maxNumLabels="2000" scaleMax="0"/>
+                    <text-format autoWrapLength="0" wrapChar="" plussign="0" placeDirectionSymbol="0" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0" decimals="3" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="4294967295" useMaxLineLengthForAutoWrap="1"/>
+                    <placement repeatDistance="0" xOffset="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" priority="5" geometryGeneratorType="PointGeometry" quadOffset="4" centroidWhole="0" geometryGeneratorEnabled="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" rotationAngle="0" placementFlags="15" offsetUnits="MM" preserveRotation="1" geometryGenerator="" offsetType="0" repeatDistanceUnits="MM" centroidInside="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" dist="1" maxCurvedCharAngleOut="-25" placement="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25"/>
+                    <rendering minFeatureSize="0" scaleMax="0" maxNumLabels="2000" zIndex="0" drawLabels="1" limitNumLabels="0" scaleVisibility="0" fontLimitPixelSize="0" displayAll="0" obstacleType="0" obstacleFactor="1" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="0" upsidedownLabels="0" fontMinPixelSize="3" fontMaxPixelSize="10000"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
-                        <Option type="Map" name="properties">
-                          <Option type="Map" name="PositionX">
-                            <Option type="bool" value="true" name="active"/>
-                            <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
-                            <Option type="int" value="2" name="type"/>
+                        <Option value="" name="name" type="QString"/>
+                        <Option name="properties" type="Map">
+                          <Option name="PositionX" type="Map">
+                            <Option value="true" name="active" type="bool"/>
+                            <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
+                            <Option value="2" name="type" type="int"/>
                           </Option>
-                          <Option type="Map" name="PositionY">
-                            <Option type="bool" value="true" name="active"/>
-                            <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
-                            <Option type="int" value="2" name="type"/>
+                          <Option name="PositionY" type="Map">
+                            <Option value="true" name="active" type="bool"/>
+                            <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
+                            <Option value="2" name="type" type="int"/>
                           </Option>
                         </Option>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </dd_properties>
                   </settings>
@@ -4290,21 +4298,21 @@ def my_form_open(dialog, layer, feature):
             <featureBlendMode>0</featureBlendMode>
             <layerOpacity>1</layerOpacity>
             <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-              <DiagramCategory sizeType="MM" opacity="1" backgroundColor="#ffffff" backgroundAlpha="255" labelPlacementMethod="XHeight" lineSizeType="MM" minimumSize="0" diagramOrientation="Up" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" barWidth="5" sizeScale="3x:0,0,0,0,0,0" penWidth="0" penColor="#000000" width="15" scaleDependency="Area" minScaleDenominator="0" height="15" scaleBasedVisibility="0" rotationOffset="270" enabled="0">
-                <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-                <attribute label="" field="" color="#000000"/>
+              <DiagramCategory minimumSize="0" penAlpha="255" labelPlacementMethod="XHeight" width="15" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penWidth="0" rotationOffset="270" barWidth="5" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" minScaleDenominator="0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" penColor="#000000" enabled="0" lineSizeType="MM" height="15" diagramOrientation="Up">
+                <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+                <attribute field="" color="#000000" label=""/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings priority="0" dist="0" placement="2" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
+            <DiagramLayerSettings linePlacementFlags="18" dist="0" obstacle="0" showAll="1" priority="0" placement="2" zIndex="0">
               <properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </properties>
             </DiagramLayerSettings>
-            <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+            <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
               <activeChecks/>
               <checkConfiguration/>
             </geometryOptions>
@@ -4388,17 +4396,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 name="" field="id" index="0"/>
+              <alias name="" field="group" index="1"/>
+              <alias name="" field="comment" index="2"/>
+              <alias name="" field="moveable" index="3"/>
+              <alias name="" field="type" index="4"/>
+              <alias name="" field="name" index="5"/>
+              <alias name="" field="hidden" index="6"/>
+              <alias name="" field="auxiliary_storage_labeling_positiony" index="7"/>
+              <alias name="" field="auxiliary_storage_labeling_positionx" index="8"/>
+              <alias name="" field="fence_len" index="9"/>
+              <alias name="" field="cone_len" index="10"/>
             </aliases>
             <excludeAttributesWMS/>
             <excludeAttributesWFS/>
@@ -4416,53 +4424,53 @@ def my_form_open(dialog, layer, feature):
               <default field="cone_len" expression="" applyOnUpdate="0"/>
             </defaults>
             <constraints>
-              <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="group" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="comment" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="moveable" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="hidden" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="auxiliary_storage_labeling_positiony" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="auxiliary_storage_labeling_positionx" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="fence_len" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="cone_len" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+              <constraint unique_strength="0" notnull_strength="0" field="id" exp_strength="0" constraints="0"/>
+              <constraint unique_strength="0" notnull_strength="0" field="group" exp_strength="0" constraints="0"/>
+              <constraint unique_strength="0" notnull_strength="0" field="comment" exp_strength="0" constraints="0"/>
+              <constraint unique_strength="0" notnull_strength="0" field="moveable" exp_strength="0" constraints="0"/>
+              <constraint unique_strength="0" notnull_strength="0" field="type" exp_strength="0" constraints="0"/>
+              <constraint unique_strength="0" notnull_strength="0" field="name" exp_strength="0" constraints="0"/>
+              <constraint unique_strength="0" notnull_strength="0" field="hidden" exp_strength="0" constraints="0"/>
+              <constraint unique_strength="0" notnull_strength="0" field="auxiliary_storage_labeling_positiony" exp_strength="0" constraints="0"/>
+              <constraint unique_strength="0" notnull_strength="0" field="auxiliary_storage_labeling_positionx" exp_strength="0" constraints="0"/>
+              <constraint unique_strength="0" notnull_strength="0" field="fence_len" exp_strength="0" constraints="0"/>
+              <constraint unique_strength="0" notnull_strength="0" field="cone_len" exp_strength="0" constraints="0"/>
             </constraints>
             <constraintExpressions>
-              <constraint field="id" exp="" desc=""/>
-              <constraint field="group" exp="" desc=""/>
-              <constraint field="comment" exp="" desc=""/>
-              <constraint field="moveable" exp="" desc=""/>
-              <constraint field="type" exp="" desc=""/>
-              <constraint field="name" exp="" desc=""/>
-              <constraint field="hidden" exp="" desc=""/>
-              <constraint field="auxiliary_storage_labeling_positiony" exp="" desc=""/>
-              <constraint field="auxiliary_storage_labeling_positionx" exp="" desc=""/>
-              <constraint field="fence_len" exp="" desc=""/>
-              <constraint field="cone_len" exp="" desc=""/>
+              <constraint field="id" desc="" exp=""/>
+              <constraint field="group" desc="" exp=""/>
+              <constraint field="comment" desc="" exp=""/>
+              <constraint field="moveable" desc="" exp=""/>
+              <constraint field="type" desc="" exp=""/>
+              <constraint field="name" desc="" exp=""/>
+              <constraint field="hidden" desc="" exp=""/>
+              <constraint field="auxiliary_storage_labeling_positiony" desc="" exp=""/>
+              <constraint field="auxiliary_storage_labeling_positionx" desc="" exp=""/>
+              <constraint field="fence_len" desc="" exp=""/>
+              <constraint field="cone_len" desc="" exp=""/>
             </constraintExpressions>
             <expressionfields>
-              <field comment="" type="6" subType="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" name="fence_len" precision="0" length="-1" typeName="double precision"/>
-              <field comment="" type="6" subType="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" name="fence_len" precision="0" length="-1" typeName="double precision"/>
-              <field comment="" type="6" subType="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" name="cone_len" precision="0" length="-1" typeName="double precision"/>
+              <field typeName="double precision" name="fence_len" type="6" length="-1" subType="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" comment="" precision="0"/>
+              <field typeName="double precision" name="fence_len" type="6" length="-1" subType="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" comment="" precision="0"/>
+              <field typeName="double precision" name="cone_len" type="6" length="-1" subType="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" comment="" precision="0"/>
             </expressionfields>
             <attributeactions>
               <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
             </attributeactions>
-            <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;group&quot;" sortOrder="0">
+            <attributetableconfig sortExpression="&quot;group&quot;" sortOrder="0" actionWidgetStyle="dropDown">
               <columns>
-                <column hidden="0" type="field" width="-1" name="id"/>
-                <column hidden="0" type="field" width="-1" name="group"/>
-                <column hidden="1" type="actions" width="-1"/>
-                <column hidden="0" type="field" width="223" name="comment"/>
-                <column hidden="0" type="field" width="-1" name="moveable"/>
-                <column hidden="0" type="field" width="-1" name="type"/>
-                <column hidden="0" type="field" width="414" name="name"/>
-                <column hidden="0" type="field" width="-1" name="hidden"/>
-                <column hidden="0" type="field" width="-1" name="fence_len"/>
-                <column hidden="0" type="field" width="-1" name="cone_len"/>
-                <column hidden="1" type="field" width="-1" name="auxiliary_storage_labeling_positiony"/>
-                <column hidden="1" type="field" width="-1" name="auxiliary_storage_labeling_positionx"/>
+                <column width="-1" hidden="0" name="id" type="field"/>
+                <column width="-1" hidden="0" name="group" type="field"/>
+                <column width="-1" hidden="1" type="actions"/>
+                <column width="223" hidden="0" name="comment" type="field"/>
+                <column width="-1" hidden="0" name="moveable" type="field"/>
+                <column width="-1" hidden="0" name="type" type="field"/>
+                <column width="414" hidden="0" name="name" type="field"/>
+                <column width="-1" hidden="0" name="hidden" type="field"/>
+                <column width="-1" hidden="0" name="fence_len" type="field"/>
+                <column width="-1" hidden="0" name="cone_len" type="field"/>
+                <column width="-1" hidden="1" name="auxiliary_storage_labeling_positiony" type="field"/>
+                <column width="-1" hidden="1" name="auxiliary_storage_labeling_positionx" type="field"/>
               </columns>
             </attributetableconfig>
             <conditionalstyles>
@@ -4493,32 +4501,32 @@ def my_form_open(dialog, layer, feature):
             <featformsuppress>0</featformsuppress>
             <editorlayout>generatedlayout</editorlayout>
             <editable>
-              <field editable="0" name="auxiliary_storage_labeling_positionx"/>
-              <field editable="0" name="auxiliary_storage_labeling_positiony"/>
-              <field editable="1" name="comment"/>
-              <field editable="0" name="cone_len"/>
-              <field editable="0" name="fence_len"/>
-              <field editable="1" name="group"/>
-              <field editable="1" name="hidden"/>
-              <field editable="1" name="id"/>
-              <field editable="0" name="length"/>
-              <field editable="1" name="moveable"/>
-              <field editable="1" name="name"/>
-              <field editable="1" name="type"/>
+              <field name="auxiliary_storage_labeling_positionx" editable="0"/>
+              <field name="auxiliary_storage_labeling_positiony" editable="0"/>
+              <field name="comment" editable="1"/>
+              <field name="cone_len" editable="0"/>
+              <field name="fence_len" editable="0"/>
+              <field name="group" editable="1"/>
+              <field name="hidden" editable="1"/>
+              <field name="id" editable="1"/>
+              <field name="length" editable="0"/>
+              <field name="moveable" editable="1"/>
+              <field name="name" editable="1"/>
+              <field name="type" editable="1"/>
             </editable>
             <labelOnTop>
-              <field 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>
@@ -4533,200 +4541,200 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="RuleRenderer" enableorderby="0" symbollevels="1" forceraster="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="1" enableorderby="0">
         <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-          <rule label="Show in fencing maps" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)')">
-            <rule label="Cones" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" symbol="0" filter="regexp_match(&quot;type&quot;, '^cone')"/>
-            <rule label="Moveable fences" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" symbol="1" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1'"/>
-            <rule label="Fixed fences" key="{070da3c0-926e-4be7-b593-17a3235a88fa}" symbol="2" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1'"/>
-            <rule label="Construction" checkstate="0" key="{7be11354-6d79-48d0-a650-aea5f58c1846}" symbol="3" filter="regexp_match(&quot;type&quot;, '^constr')"/>
+          <rule key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)')" label="Show in fencing maps">
+            <rule key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" symbol="0" filter="regexp_match(&quot;type&quot;, '^cone')" label="Cones"/>
+            <rule key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" symbol="1" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1'" label="Moveable fences"/>
+            <rule key="{070da3c0-926e-4be7-b593-17a3235a88fa}" symbol="2" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1'" label="Fixed fences"/>
+            <rule key="{7be11354-6d79-48d0-a650-aea5f58c1846}" symbol="3" checkstate="0" filter="regexp_match(&quot;type&quot;, '^constr')" label="Construction"/>
           </rule>
-          <rule label="Is Visible" checkstate="0" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" symbol="4" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL"/>
+          <rule key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" symbol="4" checkstate="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" label="Is Visible"/>
           <rule key="{29865286-9e35-459b-929c-beb87e7538de}" symbol="5"/>
         </rules>
         <symbols>
-          <symbol type="line" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-              <prop v="round" k="capstyle"/>
-              <prop v="1;4" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="Point" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="round" k="joinstyle"/>
-              <prop v="255,255,0,255" k="line_color"/>
-              <prop v="dot" k="line_style"/>
-              <prop v="1" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol name="0" alpha="1" type="line" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" pass="0" locked="0" 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"/>
+              <prop k="customdash_unit" v="Point"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="round"/>
+              <prop k="line_color" v="255,255,0,255"/>
+              <prop k="line_style" v="dot"/>
+              <prop k="line_width" v="1"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="1"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="1" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-              <prop v="round" k="capstyle"/>
-              <prop v="4;3" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="round" k="joinstyle"/>
-              <prop v="255,255,0,255" k="line_color"/>
-              <prop v="dash" k="line_style"/>
-              <prop v="1" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol name="1" alpha="1" type="line" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" pass="0" locked="0" 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"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="round"/>
+              <prop k="line_color" v="255,255,0,255"/>
+              <prop k="line_style" v="dash"/>
+              <prop k="line_width" v="1"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="2" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="255,255,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.8" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol name="2" alpha="1" type="line" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" pass="0" locked="0" class="SimpleLine">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="255,255,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.8"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="3" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0,255,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.8" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol name="3" alpha="1" type="line" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" pass="0" locked="0" class="SimpleLine">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,0,255,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.8"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="4" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="255,255,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.26" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol name="4" alpha="1" type="line" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" pass="0" locked="0" class="SimpleLine">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="255,255,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.26"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="5" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="213,180,60,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.26" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol name="5" alpha="1" type="line" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" pass="0" locked="0" class="SimpleLine">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="213,180,60,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.26"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -4737,67 +4745,67 @@ def my_form_open(dialog, layer, feature):
         <rules key="{75ef682c-4a85-4fe1-962a-6082490a3c19}">
           <rule key="{05a5f0dd-6b57-4866-8227-d1dd0f4dfdf5}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
             <settings>
-              <text-style fontItalic="0" fieldName="comment" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="50" blendMode="0" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="11" multilineHeight="1" textOpacity="0.8" fontSizeUnit="Point" textColor="0,0,0,255" namedStyle="Regular" fontFamily="Myriad Pro" isExpression="0">
-                <text-buffer bufferOpacity="1" bufferJoinStyle="128" bufferSize="1" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255"/>
-                <background shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.6" shapeSizeType="0" shapeRadiiY="1" shapeBlendMode="0" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeBorderColor="255,255,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="128" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="0.6" shapeRadiiX="1" shapeSizeX="1" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-                <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+              <text-style fontWordSpacing="0" fontSize="11" fontItalic="0" textOpacity="0.8" textColor="0,0,0,255" isExpression="0" fontStrikeout="0" fontCapitals="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWeight="50" fontSizeUnit="Point" fontUnderline="0" fontFamily="Myriad Pro" useSubstitutions="0" namedStyle="Regular" fontLetterSpacing="0" previewBkgrdColor="#ffffff" multilineHeight="1" blendMode="0" fieldName="comment">
+                <text-buffer bufferBlendMode="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128" bufferDraw="0" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBorderWidth="0.6" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeDraw="1" shapeSizeUnit="MM" shapeOpacity="0.6" shapeSizeType="0" shapeSizeX="1" shapeBorderColor="255,255,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeFillColor="255,255,255,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeJoinStyle="128" shapeOffsetX="0" shapeOffsetY="0" shapeType="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeRadiiX="1" shapeRotationType="0"/>
+                <shadow shadowRadius="1.5" shadowColor="0,0,0,255" shadowOpacity="0.7" shadowScale="100" shadowBlendMode="6" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" wrapChar="" placeDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="4294967295" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-              <placement quadOffset="4" preserveRotation="1" geometryGenerator="" placement="2" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" priority="5" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-25" maxCurvedCharAngleIn="25" repeatDistanceUnits="MM" offsetUnits="MM" placementFlags="14" geometryGeneratorEnabled="0" dist="5" offsetType="0"/>
-              <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="0" fontLimitPixelSize="0" displayAll="1" obstacleFactor="1.82" obstacle="1" mergeLines="1" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="0" maxNumLabels="2000" scaleMax="0"/>
+              <text-format wrapChar="" autoWrapLength="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0" decimals="3" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="4294967295"/>
+              <placement xOffset="0" repeatDistance="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" priority="5" geometryGeneratorType="PointGeometry" quadOffset="4" centroidWhole="0" geometryGeneratorEnabled="0" distUnits="MM" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="14" offsetUnits="MM" preserveRotation="1" offsetType="0" centroidInside="0" repeatDistanceUnits="MM" geometryGenerator="" dist="5" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" placement="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25"/>
+              <rendering minFeatureSize="0" scaleMax="0" maxNumLabels="2000" zIndex="0" drawLabels="1" limitNumLabels="0" scaleVisibility="0" fontLimitPixelSize="0" displayAll="1" obstacleType="0" obstacleFactor="1.82" labelPerPart="0" mergeLines="1" obstacle="1" scaleMin="0" upsidedownLabels="0" fontMinPixelSize="3" fontMaxPixelSize="10000"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="PositionX" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
+                      <Option value="2" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                    <Option name="PositionY" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
+                      <Option value="2" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </dd_properties>
             </settings>
           </rule>
           <rule key="{226e1338-ed15-4fc8-a035-fefee03c38d6}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^(fenc|cone)')">
             <settings>
-              <text-style fontItalic="0" fieldName="round( $length, 1) || 'm'" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="63" blendMode="0" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="11" multilineHeight="1" textOpacity="1" fontSizeUnit="Point" textColor="0,0,0,255" namedStyle="Semibold" fontFamily="Myriad Pro" isExpression="1">
-                <text-buffer bufferOpacity="1" bufferJoinStyle="128" bufferSize="1" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="1" bufferColor="255,255,255,255"/>
-                <background shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeType="0" shapeRadiiY="0" shapeBlendMode="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="0" shapeRadiiX="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-                <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+              <text-style fontWordSpacing="0" fontSize="11" fontItalic="0" textOpacity="1" textColor="0,0,0,255" isExpression="1" fontStrikeout="0" fontCapitals="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWeight="63" fontSizeUnit="Point" fontUnderline="0" fontFamily="Myriad Pro" useSubstitutions="0" namedStyle="Semibold" fontLetterSpacing="0" previewBkgrdColor="#ffffff" multilineHeight="1" blendMode="0" fieldName="round( $length, 1) || 'm'">
+                <text-buffer bufferBlendMode="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128" bufferDraw="1" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeDraw="0" shapeSizeUnit="MM" shapeOpacity="1" shapeSizeType="0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeJoinStyle="64" shapeOffsetX="0" shapeOffsetY="0" shapeType="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeRadiiX="0" shapeRotationType="0"/>
+                <shadow shadowRadius="1.5" shadowColor="0,0,0,255" shadowOpacity="0.7" shadowScale="100" shadowBlendMode="6" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" wrapChar="" placeDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="4294967295" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-              <placement quadOffset="4" preserveRotation="1" geometryGenerator="" placement="2" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" priority="6" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-25" maxCurvedCharAngleIn="25" repeatDistanceUnits="MM" offsetUnits="MM" placementFlags="14" geometryGeneratorEnabled="0" dist="1" offsetType="0"/>
-              <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="0" fontLimitPixelSize="0" displayAll="1" obstacleFactor="1" obstacle="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="0" maxNumLabels="2000" scaleMax="0"/>
+              <text-format wrapChar="" autoWrapLength="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0" decimals="3" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="4294967295"/>
+              <placement xOffset="0" repeatDistance="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" priority="6" geometryGeneratorType="PointGeometry" quadOffset="4" centroidWhole="0" geometryGeneratorEnabled="0" distUnits="MM" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="14" offsetUnits="MM" preserveRotation="1" offsetType="0" centroidInside="0" repeatDistanceUnits="MM" geometryGenerator="" dist="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" placement="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25"/>
+              <rendering minFeatureSize="0" scaleMax="0" maxNumLabels="2000" zIndex="0" drawLabels="1" limitNumLabels="0" scaleVisibility="0" fontLimitPixelSize="0" displayAll="1" obstacleType="0" obstacleFactor="1" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="0" upsidedownLabels="0" fontMinPixelSize="3" fontMaxPixelSize="10000"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="1" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <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="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                    <Option name="PositionX" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
+                      <Option value="2" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                    <Option name="PositionY" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
+                      <Option value="2" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </dd_properties>
             </settings>
@@ -4814,21 +4822,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundColor="#ffffff" backgroundAlpha="255" labelPlacementMethod="XHeight" lineSizeType="MM" minimumSize="0" diagramOrientation="Up" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" barWidth="5" penWidth="0" penColor="#000000" width="15" scaleDependency="Area" minScaleDenominator="0" height="15" scaleBasedVisibility="0" rotationOffset="270" enabled="0">
-          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" color="#000000"/>
+        <DiagramCategory minimumSize="0" penAlpha="255" labelPlacementMethod="XHeight" width="15" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penWidth="0" barWidth="5" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" minScaleDenominator="0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" penColor="#000000" enabled="0" height="15" lineSizeType="MM" diagramOrientation="Up">
+          <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="2" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
+      <DiagramLayerSettings linePlacementFlags="18" dist="0" obstacle="0" showAll="1" priority="0" placement="2" zIndex="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option value="" name="name" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -4898,15 +4906,15 @@ 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="fence_len" index="7" name=""/>
-        <alias field="cone_len" index="8" name=""/>
+        <alias name="" field="id" index="0"/>
+        <alias name="" field="group" index="1"/>
+        <alias name="" field="comment" index="2"/>
+        <alias name="" field="moveable" index="3"/>
+        <alias name="" field="type" index="4"/>
+        <alias name="" field="name" index="5"/>
+        <alias name="" field="hidden" index="6"/>
+        <alias name="" field="fence_len" index="7"/>
+        <alias name="" field="cone_len" index="8"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -4922,15 +4930,15 @@ def my_form_open(dialog, layer, feature):
         <default field="cone_len" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="group" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="comment" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="moveable" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="hidden" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="fence_len" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="cone_len" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="group" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="comment" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="moveable" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="type" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="name" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="hidden" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="fence_len" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="cone_len" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -4944,25 +4952,25 @@ def my_form_open(dialog, layer, feature):
         <constraint field="cone_len" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields>
-        <field comment="" type="6" subType="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" name="fence_len" precision="0" length="-1" typeName="double precision"/>
-        <field comment="" type="6" subType="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" name="fence_len" precision="0" length="-1" typeName="double precision"/>
-        <field comment="" type="6" subType="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" name="cone_len" precision="0" length="-1" typeName="double precision"/>
+        <field typeName="double precision" name="fence_len" type="6" length="-1" subType="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" comment="" precision="0"/>
+        <field typeName="double precision" name="fence_len" type="6" length="-1" subType="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" comment="" precision="0"/>
+        <field typeName="double precision" name="cone_len" type="6" length="-1" subType="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" comment="" precision="0"/>
       </expressionfields>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;group&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;group&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="0" type="field" width="-1" name="group"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="373" name="comment"/>
-          <column hidden="0" type="field" width="-1" name="moveable"/>
-          <column hidden="0" type="field" width="-1" name="type"/>
-          <column hidden="0" type="field" width="692" name="name"/>
-          <column hidden="0" type="field" width="-1" name="hidden"/>
-          <column hidden="0" type="field" width="-1" name="fence_len"/>
-          <column hidden="0" type="field" width="-1" name="cone_len"/>
+          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="0" name="group" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="373" hidden="0" name="comment" type="field"/>
+          <column width="-1" hidden="0" name="moveable" type="field"/>
+          <column width="-1" hidden="0" name="type" type="field"/>
+          <column width="692" hidden="0" name="name" type="field"/>
+          <column width="-1" hidden="0" name="hidden" type="field"/>
+          <column width="-1" hidden="0" name="fence_len" type="field"/>
+          <column width="-1" hidden="0" name="cone_len" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -4993,38 +5001,38 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="auxiliary_storage_labeling_positionx"/>
-        <field editable="0" name="auxiliary_storage_labeling_positiony"/>
-        <field editable="1" name="comment"/>
-        <field editable="0" name="cone_len"/>
-        <field editable="0" name="fence_len"/>
-        <field editable="1" name="group"/>
-        <field editable="1" name="hidden"/>
-        <field editable="1" name="id"/>
-        <field editable="0" name="length"/>
-        <field editable="1" name="moveable"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="type"/>
+        <field name="auxiliary_storage_labeling_positionx" editable="0"/>
+        <field name="auxiliary_storage_labeling_positiony" editable="0"/>
+        <field name="comment" editable="1"/>
+        <field name="cone_len" editable="0"/>
+        <field name="fence_len" editable="0"/>
+        <field name="group" editable="1"/>
+        <field name="hidden" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="length" editable="0"/>
+        <field name="moveable" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field 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 simplifyDrawingHints="1" readOnly="0" simplifyAlgorithm="0" autoRefreshTime="0" geometry="Line" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" type="vector" simplifyLocal="1" refreshOnNotifyMessage="" minScale="1e+08" refreshOnNotifyEnabled="0" labelsEnabled="0" wkbType="MultiLineString">
+    <maplayer wkbType="MultiLineString" readOnly="0" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" simplifyDrawingHints="1" simplifyLocal="1" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" autoRefreshTime="0" minScale="1e+08" geometry="Line" simplifyDrawingTol="1" simplifyMaxScale="1" autoRefreshEnabled="0" styleCategories="AllStyleCategories" type="vector" maxScale="0">
       <extent>
         <xmin>18.39891270000000034</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -5088,31 +5096,31 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" enableorderby="0" symbollevels="0" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol type="line" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,178,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="1" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol name="0" alpha="1" type="line" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" pass="0" locked="0" class="SimpleLine">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,178,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="1"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -5131,21 +5139,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundColor="#ffffff" backgroundAlpha="255" labelPlacementMethod="XHeight" lineSizeType="MM" minimumSize="0" diagramOrientation="Up" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" barWidth="5" penWidth="0" penColor="#000000" width="15" scaleDependency="Area" minScaleDenominator="0" height="15" scaleBasedVisibility="0" rotationOffset="270" enabled="0">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0" style="0"/>
-          <attribute label="" field="" color="#000000"/>
+        <DiagramCategory minimumSize="0" penAlpha="255" labelPlacementMethod="XHeight" width="15" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penWidth="0" barWidth="5" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" minScaleDenominator="0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" penColor="#000000" enabled="0" height="15" lineSizeType="MM" diagramOrientation="Up">
+          <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="2" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
+      <DiagramLayerSettings linePlacementFlags="18" dist="0" obstacle="0" showAll="1" priority="0" placement="2" zIndex="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option value="" name="name" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -5159,7 +5167,7 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
+        <alias name="" field="id" index="0"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -5167,7 +5175,7 @@ def my_form_open(dialog, layer, feature):
         <default field="id" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -5176,10 +5184,10 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="1" type="actions" width="-1"/>
+          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5210,16 +5218,16 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
+        <field name="id" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
+        <field name="id" labelOnTop="0"/>
       </labelOnTop>
       <widgets/>
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="1" readOnly="0" simplifyAlgorithm="0" autoRefreshTime="0" geometry="Polygon" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="100000" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" type="vector" simplifyLocal="1" refreshOnNotifyMessage="" minScale="1e+08" refreshOnNotifyEnabled="0" labelsEnabled="0" wkbType="MultiPolygon">
+    <maplayer wkbType="MultiPolygon" readOnly="0" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" simplifyDrawingHints="1" simplifyLocal="1" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" autoRefreshTime="0" minScale="1e+08" geometry="Polygon" simplifyDrawingTol="1" simplifyMaxScale="1" autoRefreshEnabled="0" styleCategories="AllStyleCategories" type="vector" maxScale="100000">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.94678832168284544</ymin>
@@ -5283,26 +5291,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" enableorderby="0" symbollevels="0" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol type="fill" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="26,0,201,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="dot" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="b_diagonal" k="style"/>
+          <symbol name="0" alpha="1" type="fill" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" pass="0" locked="0" 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"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="0,0,0,255"/>
+              <prop k="outline_style" v="dot"/>
+              <prop k="outline_width" v="0.26"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="style" v="b_diagonal"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -5321,27 +5329,27 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundColor="#ffffff" backgroundAlpha="255" labelPlacementMethod="XHeight" lineSizeType="MM" minimumSize="0" diagramOrientation="Up" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" barWidth="5" penWidth="0" penColor="#000000" width="15" scaleDependency="Area" minScaleDenominator="100000" height="15" scaleBasedVisibility="0" rotationOffset="270" enabled="0">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" color="#000000"/>
+        <DiagramCategory minimumSize="0" penAlpha="255" labelPlacementMethod="XHeight" width="15" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penWidth="0" barWidth="5" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" minScaleDenominator="100000" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" penColor="#000000" enabled="0" height="15" lineSizeType="MM" diagramOrientation="Up">
+          <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="0" zIndex="0" obstacle="0" linePlacementFlags="2" showAll="1">
+      <DiagramLayerSettings linePlacementFlags="2" dist="0" obstacle="0" showAll="1" priority="0" placement="0" zIndex="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
-            <Option type="Map" name="properties">
-              <Option type="Map" name="show">
-                <Option type="bool" value="true" name="active"/>
-                <Option type="QString" value="id" name="field"/>
-                <Option type="int" value="2" name="type"/>
+            <Option value="" name="name" type="QString"/>
+            <Option name="properties" type="Map">
+              <Option name="show" type="Map">
+                <Option value="true" name="active" type="bool"/>
+                <Option value="id" name="field" type="QString"/>
+                <Option value="2" name="type" type="int"/>
               </Option>
             </Option>
-            <Option type="QString" value="collection" name="type"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -5350,8 +5358,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -5360,8 +5368,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -5370,17 +5378,17 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="page" index="2" name=""/>
+        <alias name="" field="id" index="0"/>
+        <alias name="" field="type" index="1"/>
+        <alias name="" field="page" index="2"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -5390,9 +5398,9 @@ def my_form_open(dialog, layer, feature):
         <default field="page" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="page" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="type" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="page" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -5403,12 +5411,12 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="0" type="field" width="-1" name="type"/>
-          <column hidden="0" type="field" width="-1" name="page"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="0" name="type" type="field"/>
+          <column width="-1" hidden="0" name="page" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5439,20 +5447,20 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="page"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="page" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field 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 simplifyDrawingHints="0" readOnly="0" simplifyAlgorithm="0" autoRefreshTime="0" geometry="Point" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="100000" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" type="vector" simplifyLocal="1" refreshOnNotifyMessage="" minScale="1e+08" refreshOnNotifyEnabled="0" labelsEnabled="1" wkbType="Point">
+    <maplayer wkbType="Point" readOnly="0" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" simplifyDrawingHints="0" simplifyLocal="1" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" autoRefreshTime="0" minScale="1e+08" geometry="Point" simplifyDrawingTol="1" simplifyMaxScale="1" autoRefreshEnabled="0" styleCategories="AllStyleCategories" type="vector" maxScale="100000">
       <extent>
         <xmin>18.37523075794307204</xmin>
         <ymin>-33.94592961896692884</ymin>
@@ -5509,7 +5517,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" miny="0" crs="" dimensions="2" maxy="0" maxz="0" maxx="0"/>
+          <spatial maxx="0" maxz="0" minz="0" minx="0" maxy="0" crs="" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -5520,7 +5528,7 @@ def my_form_open(dialog, layer, feature):
       </resourceMetadata>
       <provider encoding="UTF-8">ogr</provider>
       <vectorjoins>
-        <join editable="0" customPrefix="csv_" targetFieldName="position" cascadedDelete="0" hasCustomPrefix="1" joinLayerId="marshals_by_position20161003112326575" memoryCache="1" upsertOnEdit="0" joinFieldName="position" dynamicForm="0">
+        <join targetFieldName="position" memoryCache="1" joinLayerId="marshals_by_position20161003112326575" upsertOnEdit="0" hasCustomPrefix="1" editable="0" customPrefix="csv_" cascadedDelete="0" joinFieldName="position" dynamicForm="0">
           <joinFieldsSubset>
             <field name="club"/>
             <field name="name"/>
@@ -5545,66 +5553,66 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="RuleRenderer" enableorderby="0" symbollevels="0" forceraster="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
         <rules key="{436a5e05-3485-477a-80b7-cf4d12d6dcec}">
-          <rule label="Show in marshal overview" description="Show in marshal overview" key="{308d81eb-cefa-4627-8afb-3baa8363f863}" symbol="0" filter="'marshal plan' = attribute( @atlas_feature , 'type' )"/>
-          <rule label="Show in marshal maps" description="Show in marshal overview" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" symbol="1" filter="'marshal' = attribute( @atlas_feature , 'type' )"/>
+          <rule key="{308d81eb-cefa-4627-8afb-3baa8363f863}" symbol="0" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" label="Show in marshal overview" description="Show in marshal overview"/>
+          <rule key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" symbol="1" filter="'marshal' = attribute( @atlas_feature , 'type' )" label="Show in marshal maps" description="Show in marshal overview"/>
         </rules>
         <symbols>
-          <symbol type="marker" alpha="0.792157" name="0" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="1">
-              <prop v="0" k="angle"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="1" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol name="0" alpha="0.792157" type="marker" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" pass="1" locked="0" class="SimpleMarker">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="0,0,0,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="circle"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="0,0,0,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="1"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" alpha="0.01" name="1" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="1">
-              <prop v="0" k="angle"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="0.1" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol name="1" alpha="0.01" type="marker" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" pass="1" locked="0" class="SimpleMarker">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="0,0,0,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="circle"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="0,0,0,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="0.1"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -5613,236 +5621,236 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{3100b6d3-183a-45b5-94f5-2ae25cc59226}">
-          <rule description="Show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" key="{26c6b0ec-ed26-401f-abd2-72394fe7d58d}" filter="'marshal plan' = attribute( @atlas_feature , 'type' )">
+          <rule key="{26c6b0ec-ed26-401f-abd2-72394fe7d58d}" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" description="Show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)">
             <settings>
-              <text-style fontItalic="0" fieldName="position" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="63" blendMode="0" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="6" multilineHeight="1" textOpacity="0.9" fontSizeUnit="Point" textColor="0,0,0,255" namedStyle="Semibold" fontFamily="Myriad Pro" isExpression="0">
-                <text-buffer bufferOpacity="1" bufferJoinStyle="64" bufferSize="1" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255"/>
-                <background shapeType="3" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.5" shapeSizeType="0" shapeRadiiY="0" shapeBlendMode="0" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="0.1" shapeRadiiX="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-                <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+              <text-style fontWordSpacing="0" fontSize="6" fontItalic="0" textOpacity="0.9" textColor="0,0,0,255" isExpression="0" fontStrikeout="0" fontCapitals="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWeight="63" fontSizeUnit="Point" fontUnderline="0" fontFamily="Myriad Pro" useSubstitutions="0" namedStyle="Semibold" fontLetterSpacing="0" previewBkgrdColor="#ffffff" multilineHeight="1" blendMode="0" fieldName="position">
+                <text-buffer bufferBlendMode="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="64" bufferDraw="0" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBorderWidth="0.1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeDraw="1" shapeSizeUnit="MM" shapeOpacity="0.5" shapeSizeType="0" shapeSizeX="0" shapeBorderColor="0,0,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeJoinStyle="64" shapeOffsetX="0" shapeOffsetY="0" shapeType="3" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeRadiiX="0" shapeRotationType="0"/>
+                <shadow shadowRadius="1.5" shadowColor="0,0,0,255" shadowOpacity="0.7" shadowScale="100" shadowBlendMode="6" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" wrapChar="" placeDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="0" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-              <placement quadOffset="4" preserveRotation="1" geometryGenerator="" placement="6" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" priority="10" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-20" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" offsetUnits="MapUnit" placementFlags="10" geometryGeneratorEnabled="0" dist="1" offsetType="0"/>
-              <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="1" fontLimitPixelSize="0" displayAll="1" obstacleFactor="1" obstacle="0" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="2" maxNumLabels="2000" scaleMax="10000000"/>
+              <text-format wrapChar="" autoWrapLength="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0" decimals="3" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0"/>
+              <placement xOffset="0" repeatDistance="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" geometryGeneratorType="PointGeometry" quadOffset="4" centroidWhole="0" geometryGeneratorEnabled="0" distUnits="MM" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" offsetUnits="MapUnit" preserveRotation="1" offsetType="0" centroidInside="0" repeatDistanceUnits="MM" geometryGenerator="" dist="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20"/>
+              <rendering minFeatureSize="0" scaleMax="10000000" maxNumLabels="2000" zIndex="2" drawLabels="1" limitNumLabels="0" scaleVisibility="0" fontLimitPixelSize="0" displayAll="1" obstacleType="0" obstacleFactor="1" labelPerPart="0" mergeLines="0" obstacle="0" scaleMin="1" upsidedownLabels="0" fontMinPixelSize="3" fontMaxPixelSize="10000"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="FontStyle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="FontStyle" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="Size" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </dd_properties>
             </settings>
           </rule>
-          <rule active="0" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" key="{98b8f830-3256-405e-9a42-27279b9826d4}" filter="'marshal' = attribute( @atlas_feature , 'type' )">
+          <rule key="{98b8f830-3256-405e-9a42-27279b9826d4}" active="0" filter="'marshal' = attribute( @atlas_feature , 'type' )" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index">
             <settings>
-              <text-style fontItalic="0" fieldName="position" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="63" blendMode="0" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="6" multilineHeight="1" textOpacity="0.5" fontSizeUnit="Point" textColor="0,0,0,255" namedStyle="Semibold" fontFamily="Myriad Pro" isExpression="0">
-                <text-buffer bufferOpacity="1" bufferJoinStyle="64" bufferSize="1" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255"/>
-                <background shapeType="3" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.5" shapeSizeType="0" shapeRadiiY="0" shapeBlendMode="0" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.2" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="0.4" shapeRadiiX="0" shapeSizeX="0.2" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-                <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+              <text-style fontWordSpacing="0" fontSize="6" fontItalic="0" textOpacity="0.5" textColor="0,0,0,255" isExpression="0" fontStrikeout="0" fontCapitals="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWeight="63" fontSizeUnit="Point" fontUnderline="0" fontFamily="Myriad Pro" useSubstitutions="0" namedStyle="Semibold" fontLetterSpacing="0" previewBkgrdColor="#ffffff" multilineHeight="1" blendMode="0" fieldName="position">
+                <text-buffer bufferBlendMode="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="64" bufferDraw="0" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBorderWidth="0.4" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeDraw="1" shapeSizeUnit="MM" shapeOpacity="0.5" shapeSizeType="0" shapeSizeX="0.2" shapeBorderColor="0,0,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.2" shapeFillColor="255,255,255,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeJoinStyle="64" shapeOffsetX="0" shapeOffsetY="0" shapeType="3" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeRadiiX="0" shapeRotationType="0"/>
+                <shadow shadowRadius="1.5" shadowColor="0,0,0,255" shadowOpacity="0.7" shadowScale="100" shadowBlendMode="6" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" wrapChar="" placeDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="1" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-              <placement quadOffset="4" preserveRotation="1" geometryGenerator="" placement="6" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" priority="8" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-20" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" offsetUnits="MapUnit" placementFlags="10" geometryGeneratorEnabled="0" dist="0" offsetType="0"/>
-              <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="1" fontLimitPixelSize="0" displayAll="1" obstacleFactor="1.8" obstacle="0" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="5" maxNumLabels="2000" scaleMax="10000000"/>
+              <text-format wrapChar="" autoWrapLength="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0" decimals="3" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="1"/>
+              <placement xOffset="0" repeatDistance="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" priority="8" geometryGeneratorType="PointGeometry" quadOffset="4" centroidWhole="0" geometryGeneratorEnabled="0" distUnits="MM" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" offsetUnits="MapUnit" preserveRotation="1" offsetType="0" centroidInside="0" repeatDistanceUnits="MM" geometryGenerator="" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20"/>
+              <rendering minFeatureSize="0" scaleMax="10000000" maxNumLabels="2000" zIndex="5" drawLabels="1" limitNumLabels="0" scaleVisibility="0" fontLimitPixelSize="0" displayAll="1" obstacleType="0" obstacleFactor="1.8" labelPerPart="0" mergeLines="0" obstacle="0" scaleMin="1" upsidedownLabels="0" fontMinPixelSize="3" fontMaxPixelSize="10000"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if ( @atlasfeature_id = $id, 1, 0)" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="AlwaysShow" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if ( @atlasfeature_id = $id, 1, 0)" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="FontOpacity">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="FontOpacity" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="FontStyle">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="FontStyle" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="ObstacleFactor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="ObstacleFactor" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="Priority">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if ( @atlas_featureid = $id, 10.0, 8.0 )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="Priority" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if ( @atlas_featureid = $id, 10.0, 8.0 )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="ShapeOpacity">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="ShapeOpacity" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if ( @atlas_featureid = $id, 8, 6 )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="Size" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if ( @atlas_featureid = $id, 8, 6 )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="ZIndex">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if ( @atlasfeature_id = $id, 15, 5 )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="ZIndex" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if ( @atlasfeature_id = $id, 15, 5 )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </dd_properties>
             </settings>
           </rule>
-          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label" key="{99221fb4-413e-4f4d-b076-d6c2768a862d}" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id">
+          <rule key="{99221fb4-413e-4f4d-b076-d6c2768a862d}" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label">
             <settings>
-              <text-style fontItalic="0" fieldName="position" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="50" blendMode="0" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="6" multilineHeight="1" textOpacity="0.6" fontSizeUnit="Point" textColor="0,0,0,255" namedStyle="Regular" fontFamily="Myriad Pro" isExpression="0">
-                <text-buffer bufferOpacity="1" bufferJoinStyle="64" bufferSize="1" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255"/>
-                <background shapeType="3" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.6" shapeSizeType="0" shapeRadiiY="0" shapeBlendMode="0" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.2" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="0.4" shapeRadiiX="0" shapeSizeX="0.2" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-                <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+              <text-style fontWordSpacing="0" fontSize="6" fontItalic="0" textOpacity="0.6" textColor="0,0,0,255" isExpression="0" fontStrikeout="0" fontCapitals="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWeight="50" fontSizeUnit="Point" fontUnderline="0" fontFamily="Myriad Pro" useSubstitutions="0" namedStyle="Regular" fontLetterSpacing="0" previewBkgrdColor="#ffffff" multilineHeight="1" blendMode="0" fieldName="position">
+                <text-buffer bufferBlendMode="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="64" bufferDraw="0" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBorderWidth="0.4" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeDraw="1" shapeSizeUnit="MM" shapeOpacity="0.6" shapeSizeType="0" shapeSizeX="0.2" shapeBorderColor="0,0,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.2" shapeFillColor="255,255,255,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeJoinStyle="64" shapeOffsetX="0" shapeOffsetY="0" shapeType="3" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeRadiiX="0" shapeRotationType="0"/>
+                <shadow shadowRadius="1.5" shadowColor="0,0,0,255" shadowOpacity="0.7" shadowScale="100" shadowBlendMode="6" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" wrapChar="" placeDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="1" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-              <placement quadOffset="4" preserveRotation="1" geometryGenerator="" placement="6" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" priority="8" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-20" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" offsetUnits="MapUnit" placementFlags="10" geometryGeneratorEnabled="0" dist="0" offsetType="0"/>
-              <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="1" fontLimitPixelSize="0" displayAll="1" obstacleFactor="1.8" obstacle="0" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="5" maxNumLabels="2000" scaleMax="10000000"/>
+              <text-format wrapChar="" autoWrapLength="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0" decimals="3" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="1"/>
+              <placement xOffset="0" repeatDistance="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" priority="8" geometryGeneratorType="PointGeometry" quadOffset="4" centroidWhole="0" geometryGeneratorEnabled="0" distUnits="MM" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" offsetUnits="MapUnit" preserveRotation="1" offsetType="0" centroidInside="0" repeatDistanceUnits="MM" geometryGenerator="" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20"/>
+              <rendering minFeatureSize="0" scaleMax="10000000" maxNumLabels="2000" zIndex="5" drawLabels="1" limitNumLabels="0" scaleVisibility="0" fontLimitPixelSize="0" displayAll="1" obstacleType="0" obstacleFactor="1.8" labelPerPart="0" mergeLines="0" obstacle="0" scaleMin="1" upsidedownLabels="0" fontMinPixelSize="3" fontMaxPixelSize="10000"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <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 type="Map" name="FontOpacity">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="FontOpacity" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="FontStyle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="FontStyle" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="ObstacleFactor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="ObstacleFactor" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="Priority">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="Priority" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="ShapeOpacity">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="ShapeOpacity" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="Size" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="ZIndex">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="ZIndex" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </dd_properties>
             </settings>
           </rule>
-          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top" key="{85065de1-e51c-4c04-9292-536cbccc7aba}" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id">
+          <rule key="{85065de1-e51c-4c04-9292-536cbccc7aba}" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top">
             <settings>
-              <text-style fontItalic="0" fieldName="position" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="63" blendMode="0" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="8" multilineHeight="1" textOpacity="0.9" fontSizeUnit="Point" textColor="0,0,0,255" namedStyle="Semibold" fontFamily="Myriad Pro" isExpression="0">
-                <text-buffer bufferOpacity="1" bufferJoinStyle="64" bufferSize="1" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255"/>
-                <background shapeType="3" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.9" shapeSizeType="0" shapeRadiiY="0" shapeBlendMode="0" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.2" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,0,255" shapeJoinStyle="64" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="0.4" shapeRadiiX="0" shapeSizeX="0.2" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-                <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+              <text-style fontWordSpacing="0" fontSize="8" fontItalic="0" textOpacity="0.9" textColor="0,0,0,255" isExpression="0" fontStrikeout="0" fontCapitals="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWeight="63" fontSizeUnit="Point" fontUnderline="0" fontFamily="Myriad Pro" useSubstitutions="0" namedStyle="Semibold" fontLetterSpacing="0" previewBkgrdColor="#ffffff" multilineHeight="1" blendMode="0" fieldName="position">
+                <text-buffer bufferBlendMode="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="64" bufferDraw="0" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBorderWidth="0.4" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeDraw="1" shapeSizeUnit="MM" shapeOpacity="0.9" shapeSizeType="0" shapeSizeX="0.2" shapeBorderColor="0,0,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.2" shapeFillColor="255,255,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeJoinStyle="64" shapeOffsetX="0" shapeOffsetY="0" shapeType="3" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeRadiiX="0" shapeRotationType="0"/>
+                <shadow shadowRadius="1.5" shadowColor="0,0,0,255" shadowOpacity="0.7" shadowScale="100" shadowBlendMode="6" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" wrapChar="" placeDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="1" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-              <placement quadOffset="4" preserveRotation="1" geometryGenerator="" placement="0" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" priority="10" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-20" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" offsetUnits="MapUnit" placementFlags="10" geometryGeneratorEnabled="0" dist="0" offsetType="0"/>
-              <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="1" fontLimitPixelSize="0" displayAll="1" obstacleFactor="1.8" obstacle="0" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="10" maxNumLabels="2000" scaleMax="10000000"/>
+              <text-format wrapChar="" autoWrapLength="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0" decimals="3" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="1"/>
+              <placement xOffset="0" repeatDistance="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" geometryGeneratorType="PointGeometry" quadOffset="4" centroidWhole="0" geometryGeneratorEnabled="0" distUnits="MM" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" offsetUnits="MapUnit" preserveRotation="1" offsetType="0" centroidInside="0" repeatDistanceUnits="MM" geometryGenerator="" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" placement="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20"/>
+              <rendering minFeatureSize="0" scaleMax="10000000" maxNumLabels="2000" zIndex="10" drawLabels="1" limitNumLabels="0" scaleVisibility="0" fontLimitPixelSize="0" displayAll="1" obstacleType="0" obstacleFactor="1.8" labelPerPart="0" mergeLines="0" obstacle="0" scaleMin="1" upsidedownLabels="0" fontMinPixelSize="3" fontMaxPixelSize="10000"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <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 type="Map" name="FontOpacity">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="FontOpacity" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="FontStyle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="FontStyle" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="ObstacleFactor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="ObstacleFactor" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="Priority">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="Priority" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="ShapeOpacity">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="ShapeOpacity" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="Size" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="ZIndex">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="ZIndex" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </dd_properties>
             </settings>
@@ -5999,21 +6007,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundColor="#ffffff" backgroundAlpha="255" labelPlacementMethod="XHeight" lineSizeType="MM" minimumSize="0" diagramOrientation="Up" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" barWidth="5" penWidth="0" penColor="#000000" width="15" scaleDependency="Area" minScaleDenominator="100000" height="15" scaleBasedVisibility="0" rotationOffset="270" enabled="0">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" color="#000000"/>
+        <DiagramCategory minimumSize="0" penAlpha="255" labelPlacementMethod="XHeight" width="15" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penWidth="0" barWidth="5" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" minScaleDenominator="100000" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" penColor="#000000" enabled="0" height="15" lineSizeType="MM" diagramOrientation="Up">
+          <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="0" zIndex="0" obstacle="0" linePlacementFlags="2" showAll="1">
+      <DiagramLayerSettings linePlacementFlags="2" dist="0" obstacle="0" showAll="1" priority="0" placement="0" zIndex="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option value="" name="name" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -6022,8 +6030,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6032,8 +6040,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option value="false" name="IsMultiline" type="bool"/>
+                <Option value="false" name="UseHtml" type="bool"/>
               </Option>
             </config>
           </editWidget>
@@ -6042,8 +6050,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option value="false" name="IsMultiline" type="bool"/>
+                <Option value="false" name="UseHtml" type="bool"/>
               </Option>
             </config>
           </editWidget>
@@ -6052,8 +6060,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6062,8 +6070,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6072,8 +6080,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6082,8 +6090,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6125,18 +6133,18 @@ 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="xyposition" index="4" name=""/>
-        <alias field="csv_club" index="5" name=""/>
-        <alias field="csv_name" index="6" name=""/>
-        <alias field="csv_captain" index="7" name=""/>
-        <alias field="csv_captain_phone" index="8" name=""/>
-        <alias field="csv_first_runner" index="9" name=""/>
-        <alias field="csv_last_runner" index="10" name=""/>
-        <alias field="csv_instructions" index="11" name=""/>
+        <alias name="" field="id" index="0"/>
+        <alias name="" field="position" index="1"/>
+        <alias name="" field="type" index="2"/>
+        <alias name="" field="notes" index="3"/>
+        <alias name="" field="xyposition" index="4"/>
+        <alias name="" field="csv_club" index="5"/>
+        <alias name="" field="csv_name" index="6"/>
+        <alias name="" field="csv_captain" index="7"/>
+        <alias name="" field="csv_captain_phone" index="8"/>
+        <alias name="" field="csv_first_runner" index="9"/>
+        <alias name="" field="csv_last_runner" index="10"/>
+        <alias name="" field="csv_instructions" index="11"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -6155,18 +6163,18 @@ def my_form_open(dialog, layer, feature):
         <default field="csv_instructions" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="position" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="notes" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="xyposition" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="csv_club" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="csv_name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="csv_captain" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="csv_captain_phone" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="csv_first_runner" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="csv_last_runner" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="csv_instructions" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="position" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="type" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="notes" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="xyposition" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="csv_club" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="csv_name" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="csv_captain" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="csv_captain_phone" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="csv_first_runner" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="csv_last_runner" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="csv_instructions" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -6186,21 +6194,21 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;position&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;position&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="position"/>
-          <column hidden="0" type="field" width="-1" name="type"/>
-          <column hidden="0" type="field" width="-1" name="notes"/>
-          <column hidden="0" type="field" width="-1" name="xyposition"/>
-          <column hidden="0" type="field" width="-1" name="csv_name"/>
-          <column hidden="0" type="field" width="-1" name="csv_club"/>
-          <column hidden="0" type="field" width="-1" name="csv_captain"/>
-          <column hidden="0" type="field" width="-1" name="csv_captain_phone"/>
-          <column hidden="0" type="field" width="-1" name="csv_first_runner"/>
-          <column hidden="0" type="field" width="-1" name="csv_last_runner"/>
-          <column hidden="0" type="field" width="-1" name="csv_instructions"/>
+          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="position" type="field"/>
+          <column width="-1" hidden="0" name="type" type="field"/>
+          <column width="-1" hidden="0" name="notes" type="field"/>
+          <column width="-1" hidden="0" name="xyposition" type="field"/>
+          <column width="-1" hidden="0" name="csv_name" type="field"/>
+          <column width="-1" hidden="0" name="csv_club" type="field"/>
+          <column width="-1" hidden="0" name="csv_captain" type="field"/>
+          <column width="-1" hidden="0" name="csv_captain_phone" type="field"/>
+          <column width="-1" hidden="0" name="csv_first_runner" type="field"/>
+          <column width="-1" hidden="0" name="csv_last_runner" type="field"/>
+          <column width="-1" hidden="0" name="csv_instructions" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6231,70 +6239,70 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="csv_10_distance"/>
-        <field editable="0" name="csv_21_distance"/>
-        <field editable="0" name="csv_Description"/>
-        <field editable="1" name="csv_capt_1"/>
-        <field editable="1" name="csv_captai"/>
-        <field editable="0" name="csv_captain"/>
-        <field editable="0" name="csv_captain_number"/>
-        <field editable="0" name="csv_captain_phone"/>
-        <field editable="0" name="csv_club"/>
-        <field editable="0" name="csv_email"/>
-        <field editable="0" name="csv_first runner"/>
-        <field editable="1" name="csv_first_"/>
-        <field editable="0" name="csv_first_runner"/>
-        <field editable="0" name="csv_firstname"/>
-        <field editable="1" name="csv_instru"/>
-        <field editable="0" name="csv_instructions"/>
-        <field editable="0" name="csv_last runner"/>
-        <field editable="1" name="csv_last_r"/>
-        <field editable="0" name="csv_last_runner"/>
-        <field editable="0" name="csv_name"/>
-        <field editable="0" name="csv_phone"/>
-        <field editable="1" name="csv_positi"/>
-        <field editable="0" name="csv_position"/>
-        <field editable="0" name="csv_races"/>
-        <field editable="0" name="csv_surname"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="notes"/>
-        <field editable="1" name="oldpositio"/>
-        <field editable="1" name="position"/>
-        <field editable="1" name="type"/>
-        <field editable="1" name="xyposition"/>
+        <field name="csv_10_distance" editable="0"/>
+        <field name="csv_21_distance" editable="0"/>
+        <field name="csv_Description" editable="0"/>
+        <field name="csv_capt_1" editable="1"/>
+        <field name="csv_captai" editable="1"/>
+        <field name="csv_captain" editable="0"/>
+        <field name="csv_captain_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_firstname" editable="0"/>
+        <field name="csv_instru" editable="1"/>
+        <field name="csv_instructions" editable="0"/>
+        <field name="csv_last runner" editable="0"/>
+        <field name="csv_last_r" editable="1"/>
+        <field name="csv_last_runner" editable="0"/>
+        <field name="csv_name" editable="0"/>
+        <field name="csv_phone" editable="0"/>
+        <field name="csv_positi" editable="1"/>
+        <field name="csv_position" editable="0"/>
+        <field name="csv_races" editable="0"/>
+        <field name="csv_surname" editable="0"/>
+        <field name="id" editable="1"/>
+        <field name="notes" editable="1"/>
+        <field name="oldpositio" editable="1"/>
+        <field name="position" editable="1"/>
+        <field name="type" editable="1"/>
+        <field name="xyposition" editable="1"/>
       </editable>
       <labelOnTop>
-        <field 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_firstname"/>
-        <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="csv_surname"/>
-        <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_firstname" 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="csv_surname" 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">
@@ -6343,7 +6351,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer geometry="No geometry" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" maxScale="100000" type="vector" minScale="1e+08" refreshOnNotifyMessage="" wkbType="NoGeometry" readOnly="0" autoRefreshTime="0" styleCategories="AllStyleCategories">
+    <maplayer minScale="1e+08" hasScaleBasedVisibilityFlag="0" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" wkbType="NoGeometry" styleCategories="AllStyleCategories" autoRefreshEnabled="0" maxScale="100000" readOnly="0" geometry="No geometry" refreshOnNotifyMessage="">
       <id>marshals_by_position20161003112326575</id>
       <datasource>file:./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes</datasource>
       <keywordList>
@@ -6394,7 +6402,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" miny="0" crs="" dimensions="2" maxy="0" maxz="0" maxx="0"/>
+          <spatial maxx="0" maxz="0" minz="0" minx="0" maxy="0" crs="" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -6407,8 +6415,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/>
@@ -6427,7 +6435,7 @@ def my_form_open(dialog, layer, feature):
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -6436,8 +6444,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6446,8 +6454,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6470,8 +6478,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6480,8 +6488,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6490,8 +6498,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6500,8 +6508,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6524,8 +6532,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6553,20 +6561,20 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="position" index="0" name=""/>
-        <alias field="club" index="1" name=""/>
-        <alias field="firstname" index="2" name=""/>
-        <alias field="surname" index="3" name=""/>
-        <alias field="name" 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="captain_email" index="9" name=""/>
-        <alias field="races" index="10" name=""/>
-        <alias field="first_runner" index="11" name=""/>
-        <alias field="last_runner" index="12" name=""/>
-        <alias field="instructions" index="13" name=""/>
+        <alias name="" field="position" index="0"/>
+        <alias name="" field="club" index="1"/>
+        <alias name="" field="firstname" index="2"/>
+        <alias name="" field="surname" index="3"/>
+        <alias name="" field="name" index="4"/>
+        <alias name="" field="phone" index="5"/>
+        <alias name="" field="email" index="6"/>
+        <alias name="" field="captain" index="7"/>
+        <alias name="" field="captain_phone" index="8"/>
+        <alias name="" field="captain_email" index="9"/>
+        <alias name="" field="races" index="10"/>
+        <alias name="" field="first_runner" index="11"/>
+        <alias name="" field="last_runner" index="12"/>
+        <alias name="" field="instructions" index="13"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -6587,20 +6595,20 @@ def my_form_open(dialog, layer, feature):
         <default field="instructions" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="position" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="club" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="firstname" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="surname" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="phone" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="email" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="captain" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="captain_phone" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="captain_email" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="races" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="first_runner" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="last_runner" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="instructions" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="position" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="club" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="firstname" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="surname" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="name" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="phone" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="email" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="captain" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="captain_phone" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="captain_email" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="races" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="first_runner" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="last_runner" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="instructions" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="position" exp="" desc=""/>
@@ -6622,23 +6630,23 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="position"/>
-          <column hidden="0" type="field" width="221" name="name"/>
-          <column hidden="0" type="field" width="-1" name="club"/>
-          <column hidden="0" type="field" width="-1" name="phone"/>
-          <column hidden="0" type="field" width="-1" name="email"/>
-          <column hidden="0" type="field" width="-1" name="captain"/>
-          <column hidden="0" type="field" width="-1" name="races"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="first_runner"/>
-          <column hidden="0" type="field" width="-1" name="last_runner"/>
-          <column hidden="0" type="field" width="-1" name="instructions"/>
-          <column hidden="0" type="field" width="-1" name="firstname"/>
-          <column hidden="0" type="field" width="-1" name="surname"/>
-          <column hidden="0" type="field" width="-1" name="captain_phone"/>
-          <column hidden="0" type="field" width="-1" name="captain_email"/>
+          <column width="-1" hidden="0" name="position" type="field"/>
+          <column width="221" hidden="0" name="name" type="field"/>
+          <column width="-1" hidden="0" name="club" type="field"/>
+          <column width="-1" hidden="0" name="phone" type="field"/>
+          <column width="-1" hidden="0" name="email" type="field"/>
+          <column width="-1" hidden="0" name="captain" type="field"/>
+          <column width="-1" hidden="0" name="races" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="first_runner" type="field"/>
+          <column width="-1" hidden="0" name="last_runner" type="field"/>
+          <column width="-1" hidden="0" name="instructions" type="field"/>
+          <column width="-1" hidden="0" name="firstname" type="field"/>
+          <column width="-1" hidden="0" name="surname" type="field"/>
+          <column width="-1" hidden="0" name="captain_phone" type="field"/>
+          <column width="-1" hidden="0" name="captain_email" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6669,48 +6677,372 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="10_distance"/>
-        <field editable="1" name="21_distance"/>
-        <field editable="1" name="5_distance"/>
-        <field editable="1" name="captain"/>
-        <field editable="1" name="captain_number"/>
-        <field editable="1" name="club"/>
-        <field editable="1" name="email"/>
-        <field editable="1" name="first_name"/>
-        <field editable="1" name="first_runner"/>
-        <field editable="1" name="instructions"/>
-        <field editable="1" name="last_name"/>
-        <field editable="1" name="last_runner"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="phone"/>
-        <field editable="1" name="position"/>
-        <field editable="1" name="races"/>
-        <field editable="1" name="tshirt"/>
+        <field name="10_distance" editable="1"/>
+        <field name="21_distance" editable="1"/>
+        <field name="5_distance" editable="1"/>
+        <field name="captain" editable="1"/>
+        <field name="captain_number" editable="1"/>
+        <field name="club" editable="1"/>
+        <field name="email" editable="1"/>
+        <field name="first_name" editable="1"/>
+        <field name="first_runner" editable="1"/>
+        <field name="instructions" editable="1"/>
+        <field name="last_name" editable="1"/>
+        <field name="last_runner" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="phone" editable="1"/>
+        <field name="position" editable="1"/>
+        <field name="races" editable="1"/>
+        <field name="tshirt" editable="1"/>
       </editable>
       <labelOnTop>
-        <field 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 simplifyDrawingHints="0" readOnly="0" simplifyAlgorithm="0" autoRefreshTime="0" geometry="Point" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="100000" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" type="vector" simplifyLocal="1" refreshOnNotifyMessage="" minScale="1e+08" refreshOnNotifyEnabled="0" labelsEnabled="1" wkbType="Point">
+    <maplayer wkbType="MultiLineString" readOnly="0" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" simplifyDrawingHints="1" simplifyLocal="1" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" autoRefreshTime="0" minScale="1e+08" geometry="Line" simplifyDrawingTol="1" simplifyMaxScale="1" autoRefreshEnabled="0" styleCategories="AllStyleCategories" type="vector" maxScale="0">
+      <extent>
+        <xmin>18.41055689999999956</xmin>
+        <ymin>-33.9145735999999971</ymin>
+        <xmax>18.42111279999999951</xmax>
+        <ymax>-33.90282662665203617</ymax>
+      </extent>
+      <id>mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea</id>
+      <datasource>./mayor.shp</datasource>
+      <keywordList>
+        <value></value>
+      </keywordList>
+      <layername>mayor</layername>
+      <srs>
+        <spatialrefsys>
+          <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+          <srsid>3452</srsid>
+          <srid>4326</srid>
+          <authid>EPSG:4326</authid>
+          <description>WGS 84</description>
+          <projectionacronym>longlat</projectionacronym>
+          <ellipsoidacronym>WGS84</ellipsoidacronym>
+          <geographicflag>true</geographicflag>
+        </spatialrefsys>
+      </srs>
+      <resourceMetadata>
+        <identifier></identifier>
+        <parentidentifier></parentidentifier>
+        <language></language>
+        <type>dataset</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>
+        <crs>
+          <spatialrefsys>
+            <proj4></proj4>
+            <srsid>0</srsid>
+            <srid>0</srid>
+            <authid></authid>
+            <description></description>
+            <projectionacronym></projectionacronym>
+            <ellipsoidacronym></ellipsoidacronym>
+            <geographicflag>false</geographicflag>
+          </spatialrefsys>
+        </crs>
+        <extent>
+          <spatial maxx="0" maxz="0" minz="0" minx="0" maxy="0" crs="" dimensions="2" miny="0"/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
+      </resourceMetadata>
+      <provider encoding="UTF-8">ogr</provider>
+      <vectorjoins/>
+      <layerDependencies/>
+      <dataDependencies/>
+      <legend type="default-vector"/>
+      <expressionfields/>
+      <map-layer-style-manager current="default">
+        <map-layer-style name="default"/>
+      </map-layer-style-manager>
+      <auxiliaryLayer/>
+      <flags>
+        <Identifiable>1</Identifiable>
+        <Removable>1</Removable>
+        <Searchable>1</Searchable>
+      </flags>
+      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
+        <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
+          <rule key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" symbol="0" filter="&quot;type&quot; IS 'car'" label="Car"/>
+          <rule key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" symbol="1" filter="&quot;type&quot; IS 'walk'" label="Walking"/>
+        </rules>
+        <symbols>
+          <symbol name="0" alpha="1" type="line" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" pass="0" locked="0" class="SimpleLine">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="123,211,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="1"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties"/>
+                  <Option value="collection" name="type" type="QString"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+          <symbol name="1" alpha="1" type="line" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" pass="0" locked="0" class="SimpleLine">
+              <prop k="capstyle" v="flat"/>
+              <prop k="customdash" v="4;1;1;1"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="103,34,144,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="1.25"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="1"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties"/>
+                  <Option value="collection" name="type" type="QString"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+            <layer enabled="1" pass="0" locked="0" 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"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="lastvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties"/>
+                  <Option value="collection" name="type" type="QString"/>
+                </Option>
+              </data_defined_properties>
+              <symbol name="@1@1" alpha="1" type="marker" clip_to_extent="1" force_rhr="0">
+                <layer enabled="1" pass="0" locked="0" class="FilledMarker">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="103,34,144,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="5"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option value="" name="name" type="QString"/>
+                      <Option name="properties"/>
+                      <Option value="collection" name="type" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <symbol name="@@1@1@0" alpha="1" type="fill" clip_to_extent="1" force_rhr="0">
+                    <layer enabled="1" pass="0" locked="0" 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"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="35,35,35,255"/>
+                      <prop k="outline_style" v="no"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option value="" name="name" type="QString"/>
+                          <Option name="properties"/>
+                          <Option value="collection" name="type" type="QString"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                </layer>
+              </symbol>
+            </layer>
+          </symbol>
+        </symbols>
+      </renderer-v2>
+      <customproperties>
+        <property key="dualview/previewExpressions" value="id"/>
+        <property key="embeddedWidgets/count" value="0"/>
+        <property key="variableNames"/>
+        <property key="variableValues"/>
+      </customproperties>
+      <blendMode>0</blendMode>
+      <featureBlendMode>0</featureBlendMode>
+      <layerOpacity>1</layerOpacity>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory minimumSize="0" penAlpha="255" labelPlacementMethod="XHeight" width="15" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penWidth="0" barWidth="5" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" minScaleDenominator="0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" penColor="#000000" enabled="0" height="15" lineSizeType="MM" diagramOrientation="Up">
+          <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
+        </DiagramCategory>
+      </SingleCategoryDiagramRenderer>
+      <DiagramLayerSettings linePlacementFlags="18" dist="0" obstacle="0" showAll="1" priority="0" placement="2" zIndex="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="id">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="type">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+      </fieldConfiguration>
+      <aliases>
+        <alias name="" field="id" index="0"/>
+        <alias name="" field="type" index="1"/>
+      </aliases>
+      <excludeAttributesWMS/>
+      <excludeAttributesWFS/>
+      <defaults>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+      </defaults>
+      <constraints>
+        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="type" notnull_strength="0" exp_strength="0" constraints="0"/>
+      </constraints>
+      <constraintExpressions>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
+      </constraintExpressions>
+      <expressionfields/>
+      <attributeactions>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+      </attributeactions>
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+        <columns>
+          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="type" type="field"/>
+        </columns>
+      </attributetableconfig>
+      <conditionalstyles>
+        <rowstyles/>
+        <fieldstyles/>
+      </conditionalstyles>
+      <editform tolerant="1"></editform>
+      <editforminit/>
+      <editforminitcodesource>0</editforminitcodesource>
+      <editforminitfilepath></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 name="id" editable="1"/>
+        <field name="type" editable="1"/>
+      </editable>
+      <labelOnTop>
+        <field name="id" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
+      </labelOnTop>
+      <widgets/>
+      <previewExpression>id</previewExpression>
+      <mapTip></mapTip>
+    </maplayer>
+    <maplayer wkbType="Point" readOnly="0" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" simplifyDrawingHints="0" simplifyLocal="1" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" autoRefreshTime="0" minScale="1e+08" geometry="Point" simplifyDrawingTol="1" simplifyMaxScale="1" autoRefreshEnabled="0" styleCategories="AllStyleCategories" type="vector" maxScale="100000">
       <extent>
         <xmin>18.37896929129519208</xmin>
         <ymin>-33.93500027904928373</ymin>
@@ -6767,7 +7099,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" miny="0" crs="" dimensions="2" maxy="0" maxz="0" maxx="0"/>
+          <spatial maxx="0" maxz="0" minz="0" minx="0" maxy="0" crs="" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -6794,41 +7126,41 @@ def my_form_open(dialog, layer, feature):
       <renderer-v2 type="nullSymbol"/>
       <labeling type="simple">
         <settings>
-          <text-style fontItalic="0" fieldName="name" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="50" blendMode="0" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="8.5" multilineHeight="1" textOpacity="0.75" fontSizeUnit="Point" textColor="0,0,0,255" namedStyle="Regular" fontFamily="Myriad Pro" isExpression="0">
-            <text-buffer bufferOpacity="0.6" bufferJoinStyle="64" bufferSize="1.5" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="1" bufferColor="255,255,255,255"/>
-            <background shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeType="0" shapeRadiiY="0" shapeBlendMode="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="0" shapeRadiiX="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-            <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+          <text-style fontWordSpacing="0" fontSize="8.5" fontItalic="0" textOpacity="0.75" textColor="0,0,0,255" isExpression="0" fontStrikeout="0" fontCapitals="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWeight="50" fontSizeUnit="Point" fontUnderline="0" fontFamily="Myriad Pro" useSubstitutions="0" namedStyle="Regular" fontLetterSpacing="0" previewBkgrdColor="#ffffff" multilineHeight="1" blendMode="0" fieldName="name">
+            <text-buffer bufferBlendMode="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="64" bufferDraw="1" bufferOpacity="0.6" bufferSize="1.5" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeDraw="0" shapeSizeUnit="MM" shapeOpacity="1" shapeSizeType="0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeJoinStyle="64" shapeOffsetX="0" shapeOffsetY="0" shapeType="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeRadiiX="0" shapeRotationType="0"/>
+            <shadow shadowRadius="1.5" shadowColor="0,0,0,255" shadowOpacity="0.7" shadowScale="100" shadowBlendMode="6" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
             <substitutions/>
           </text-style>
-          <text-format rightDirectionSymbol=">" wrapChar="" placeDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="0" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-          <placement quadOffset="4" preserveRotation="1" geometryGenerator="" placement="6" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" priority="1" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-20" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" offsetUnits="MapUnit" placementFlags="2" geometryGeneratorEnabled="0" dist="0" offsetType="0"/>
-          <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="1" fontLimitPixelSize="0" displayAll="0" obstacleFactor="0.2" obstacle="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="0" maxNumLabels="2000" scaleMax="10000000"/>
+          <text-format wrapChar="" autoWrapLength="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0" decimals="3" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0"/>
+          <placement xOffset="0" repeatDistance="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" priority="1" geometryGeneratorType="PointGeometry" quadOffset="4" centroidWhole="0" geometryGeneratorEnabled="0" distUnits="MM" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="2" offsetUnits="MapUnit" preserveRotation="1" offsetType="0" centroidInside="0" repeatDistanceUnits="MM" geometryGenerator="" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20"/>
+          <rendering minFeatureSize="0" scaleMax="10000000" maxNumLabels="2000" zIndex="0" drawLabels="1" limitNumLabels="0" scaleVisibility="0" fontLimitPixelSize="0" displayAll="0" obstacleType="0" obstacleFactor="0.2" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="1" upsidedownLabels="0" fontMinPixelSize="3" fontMaxPixelSize="10000"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="LabelRotation">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="360 - (&quot;label_rota&quot;)" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="LabelRotation" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="360 - (&quot;label_rota&quot;)" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="PositionX">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="label_x" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                <Option name="PositionX" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="label_x" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="PositionY">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="label_y" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                <Option name="PositionY" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="label_y" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="Size">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="Size" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dd_properties>
         </settings>
@@ -6843,21 +7175,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundColor="#ffffff" backgroundAlpha="255" labelPlacementMethod="XHeight" lineSizeType="MM" minimumSize="0" diagramOrientation="Up" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" barWidth="5" penWidth="0" penColor="#000000" width="15" scaleDependency="Area" minScaleDenominator="100000" height="15" scaleBasedVisibility="0" rotationOffset="270" enabled="0">
-          <fontProperties description="Arial,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" color="#000000"/>
+        <DiagramCategory minimumSize="0" penAlpha="255" labelPlacementMethod="XHeight" width="15" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penWidth="0" barWidth="5" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" minScaleDenominator="100000" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" penColor="#000000" enabled="0" height="15" lineSizeType="MM" diagramOrientation="Up">
+          <fontProperties style="" description="Arial,10,-1,5,50,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="0" zIndex="0" obstacle="0" linePlacementFlags="2" showAll="1">
+      <DiagramLayerSettings linePlacementFlags="2" dist="0" obstacle="0" showAll="1" priority="0" placement="0" zIndex="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option value="" name="name" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -6866,8 +7198,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6876,8 +7208,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6886,8 +7218,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6896,8 +7228,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6906,8 +7238,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6916,8 +7248,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6926,8 +7258,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6936,8 +7268,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6946,23 +7278,23 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </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 name="" field="id" index="0"/>
+        <alias name="" field="osm_id" index="1"/>
+        <alias name="" field="name" index="2"/>
+        <alias name="" field="type" index="3"/>
+        <alias name="" field="z_order" index="4"/>
+        <alias name="" field="population" index="5"/>
+        <alias name="" field="label_x" index="6"/>
+        <alias name="" field="label_y" index="7"/>
+        <alias name="" field="label_rota" index="8"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -6978,15 +7310,15 @@ def my_form_open(dialog, layer, feature):
         <default field="label_rota" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="osm_id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="z_order" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="population" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label_x" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label_y" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label_rota" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="osm_id" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="name" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="type" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="z_order" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="population" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="label_x" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="label_y" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="label_rota" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -7003,18 +7335,18 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="0" type="field" width="-1" name="osm_id"/>
-          <column hidden="0" type="field" width="-1" name="name"/>
-          <column hidden="0" type="field" width="-1" name="type"/>
-          <column hidden="0" type="field" width="-1" name="z_order"/>
-          <column hidden="0" type="field" width="-1" name="population"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="label_x"/>
-          <column hidden="0" type="field" width="-1" name="label_y"/>
-          <column hidden="0" type="field" width="-1" name="label_rota"/>
+          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="0" name="osm_id" type="field"/>
+          <column width="-1" hidden="0" name="name" type="field"/>
+          <column width="-1" hidden="0" name="type" type="field"/>
+          <column width="-1" hidden="0" name="z_order" type="field"/>
+          <column width="-1" hidden="0" name="population" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="label_x" type="field"/>
+          <column width="-1" hidden="0" name="label_y" type="field"/>
+          <column width="-1" hidden="0" name="label_rota" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7045,32 +7377,32 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="label_rota"/>
-        <field editable="1" name="label_x"/>
-        <field editable="1" name="label_y"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="osm_id"/>
-        <field editable="1" name="population"/>
-        <field editable="1" name="type"/>
-        <field editable="1" name="z_order"/>
+        <field name="id" editable="1"/>
+        <field name="label_rota" editable="1"/>
+        <field name="label_x" editable="1"/>
+        <field name="label_y" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="osm_id" editable="1"/>
+        <field name="population" editable="1"/>
+        <field name="type" editable="1"/>
+        <field name="z_order" editable="1"/>
       </editable>
       <labelOnTop>
-        <field 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 simplifyDrawingHints="0" readOnly="0" simplifyAlgorithm="0" autoRefreshTime="0" geometry="Line" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="100000" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" type="vector" simplifyLocal="1" refreshOnNotifyMessage="" minScale="1e+08" refreshOnNotifyEnabled="0" labelsEnabled="1" wkbType="MultiLineString">
+    <maplayer wkbType="MultiLineString" readOnly="0" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" simplifyDrawingHints="0" simplifyLocal="1" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" autoRefreshTime="0" minScale="1e+08" geometry="Line" simplifyDrawingTol="1" simplifyMaxScale="1" autoRefreshEnabled="0" styleCategories="AllStyleCategories" type="vector" maxScale="100000">
       <extent>
         <xmin>18.3437671999999985</xmin>
         <ymin>-34.02801110000000051</ymin>
@@ -7127,7 +7459,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" miny="0" crs="" dimensions="2" maxy="0" maxz="0" maxx="0"/>
+          <spatial maxx="0" maxz="0" minz="0" minx="0" maxy="0" crs="" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -7154,61 +7486,61 @@ def my_form_open(dialog, layer, feature):
       <renderer-v2 type="nullSymbol"/>
       <labeling type="simple">
         <settings>
-          <text-style fontItalic="0" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="50" blendMode="0" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="7" multilineHeight="1" textOpacity="0.8" fontSizeUnit="Point" textColor="0,0,0,255" namedStyle="Regular" fontFamily="Myriad Pro" isExpression="1">
-            <text-buffer bufferOpacity="0.6" bufferJoinStyle="128" bufferSize="1" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="1" bufferColor="255,255,255,255"/>
-            <background shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeType="0" shapeRadiiY="0" shapeBlendMode="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="0" shapeRadiiX="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-            <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+          <text-style fontWordSpacing="0" fontSize="7" fontItalic="0" textOpacity="0.8" textColor="0,0,0,255" isExpression="1" fontStrikeout="0" fontCapitals="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWeight="50" fontSizeUnit="Point" fontUnderline="0" fontFamily="Myriad Pro" useSubstitutions="0" namedStyle="Regular" fontLetterSpacing="0" previewBkgrdColor="#ffffff" multilineHeight="1" blendMode="0" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )">
+            <text-buffer bufferBlendMode="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="128" bufferDraw="1" bufferOpacity="0.6" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeDraw="0" shapeSizeUnit="MM" shapeOpacity="1" shapeSizeType="0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeJoinStyle="64" shapeOffsetX="0" shapeOffsetY="0" shapeType="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeRadiiX="0" shapeRotationType="0"/>
+            <shadow shadowRadius="1.5" shadowColor="0,0,0,255" shadowOpacity="0.7" shadowScale="100" shadowBlendMode="6" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
             <substitutions/>
           </text-style>
-          <text-format rightDirectionSymbol=">" wrapChar="" placeDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="0" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-          <placement quadOffset="4" preserveRotation="1" geometryGenerator="" placement="3" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" priority="3" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-20" maxCurvedCharAngleIn="20" repeatDistanceUnits="MapUnit" offsetUnits="MapUnit" placementFlags="4" geometryGeneratorEnabled="0" dist="0" offsetType="0"/>
-          <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="1" fontLimitPixelSize="0" displayAll="0" obstacleFactor="0.3" obstacle="1" mergeLines="1" minFeatureSize="5" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="0" maxNumLabels="2000" scaleMax="10000000"/>
+          <text-format wrapChar="" autoWrapLength="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0" decimals="3" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0"/>
+          <placement xOffset="0" repeatDistance="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" priority="3" geometryGeneratorType="PointGeometry" quadOffset="4" centroidWhole="0" geometryGeneratorEnabled="0" distUnits="MM" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="4" offsetUnits="MapUnit" preserveRotation="1" offsetType="0" centroidInside="0" repeatDistanceUnits="MapUnit" geometryGenerator="" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" placement="3" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20"/>
+          <rendering minFeatureSize="5" scaleMax="10000000" maxNumLabels="2000" zIndex="0" drawLabels="1" limitNumLabels="0" scaleVisibility="0" fontLimitPixelSize="0" displayAll="0" obstacleType="0" obstacleFactor="0.3" labelPerPart="0" mergeLines="1" obstacle="1" scaleMin="1" upsidedownLabels="0" fontMinPixelSize="3" fontMaxPixelSize="10000"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="AlwaysShow">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="always_sho" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="AlwaysShow" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="always_sho" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="IsObstacle">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="&quot;&quot;" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="IsObstacle" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="&quot;&quot;" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="LabelRotation">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="360 - (&quot;label_rota&quot;)" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="LabelRotation" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="360 - (&quot;label_rota&quot;)" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="PositionX">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="label_x" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                <Option name="PositionX" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="label_x" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="PositionY">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="label_y" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                <Option name="PositionY" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="label_y" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="Priority">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="int" value="1" name="type"/>
-                  <Option type="QString" value="" name="val"/>
+                <Option name="Priority" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="1" name="type" type="int"/>
+                  <Option value="" name="val" type="QString"/>
                 </Option>
-                <Option type="Map" name="Show">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="auxiliary_storage_labeling_show" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                <Option name="Show" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="auxiliary_storage_labeling_show" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="Size">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="Size" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dd_properties>
         </settings>
@@ -7223,21 +7555,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundColor="#ffffff" backgroundAlpha="255" labelPlacementMethod="XHeight" lineSizeType="MM" minimumSize="0" diagramOrientation="Up" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" barWidth="5" penWidth="0" penColor="#000000" width="15" scaleDependency="Area" minScaleDenominator="100000" height="15" scaleBasedVisibility="0" rotationOffset="270" enabled="0">
-          <fontProperties description="Arial,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" color="#000000"/>
+        <DiagramCategory minimumSize="0" penAlpha="255" labelPlacementMethod="XHeight" width="15" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penWidth="0" barWidth="5" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" minScaleDenominator="100000" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" penColor="#000000" enabled="0" height="15" lineSizeType="MM" diagramOrientation="Up">
+          <fontProperties style="" description="Arial,10,-1,5,50,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="2" zIndex="0" obstacle="0" linePlacementFlags="2" showAll="1">
+      <DiagramLayerSettings linePlacementFlags="2" dist="0" obstacle="0" showAll="1" priority="0" placement="2" zIndex="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option value="" name="name" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -7246,8 +7578,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -7256,8 +7588,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -7301,8 +7633,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -7365,22 +7697,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 name="" field="osm_id" index="0"/>
+        <alias name="" field="name" index="1"/>
+        <alias name="" field="highway" index="2"/>
+        <alias name="" field="waterway" index="3"/>
+        <alias name="" field="aerialway" index="4"/>
+        <alias name="" field="barrier" index="5"/>
+        <alias name="" field="man_made" index="6"/>
+        <alias name="" field="z_order" index="7"/>
+        <alias name="" field="other_tags" index="8"/>
+        <alias name="" field="never_show" index="9"/>
+        <alias name="" field="label_x" index="10"/>
+        <alias name="" field="label_y" index="11"/>
+        <alias name="" field="label_rota" index="12"/>
+        <alias name="" field="always_sho" index="13"/>
+        <alias name="" field="resident_a" index="14"/>
+        <alias name="" field="auxiliary_storage_labeling_show" index="15"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -7403,22 +7735,22 @@ def my_form_open(dialog, layer, feature):
         <default field="auxiliary_storage_labeling_show" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="osm_id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="highway" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="waterway" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="aerialway" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="barrier" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="man_made" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="z_order" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="other_tags" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="never_show" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label_x" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label_y" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label_rota" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="always_sho" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="resident_a" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="auxiliary_storage_labeling_show" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="osm_id" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="name" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="highway" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="waterway" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="aerialway" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="barrier" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="man_made" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="z_order" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="other_tags" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="never_show" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="label_x" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="label_y" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="label_rota" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="always_sho" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="resident_a" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="auxiliary_storage_labeling_show" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="osm_id" exp="" desc=""/>
@@ -7442,25 +7774,25 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;resident_a&quot;" sortOrder="1">
+      <attributetableconfig sortExpression="&quot;resident_a&quot;" sortOrder="1" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="osm_id"/>
-          <column hidden="0" type="field" width="-1" name="name"/>
-          <column hidden="0" type="field" width="-1" name="z_order"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="highway"/>
-          <column hidden="0" type="field" width="-1" name="waterway"/>
-          <column hidden="0" type="field" width="-1" name="aerialway"/>
-          <column hidden="0" type="field" width="-1" name="barrier"/>
-          <column hidden="0" type="field" width="-1" name="man_made"/>
-          <column hidden="0" type="field" width="-1" name="other_tags"/>
-          <column hidden="0" type="field" width="-1" name="never_show"/>
-          <column hidden="0" type="field" width="-1" name="label_x"/>
-          <column hidden="0" type="field" width="-1" name="label_y"/>
-          <column hidden="0" type="field" width="-1" name="label_rota"/>
-          <column hidden="0" type="field" width="-1" name="always_sho"/>
-          <column hidden="0" type="field" width="-1" name="resident_a"/>
-          <column hidden="0" type="field" width="-1" name="auxiliary_storage_labeling_show"/>
+          <column width="-1" hidden="0" name="osm_id" type="field"/>
+          <column width="-1" hidden="0" name="name" type="field"/>
+          <column width="-1" hidden="0" name="z_order" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="highway" type="field"/>
+          <column width="-1" hidden="0" name="waterway" type="field"/>
+          <column width="-1" hidden="0" name="aerialway" type="field"/>
+          <column width="-1" hidden="0" name="barrier" type="field"/>
+          <column width="-1" hidden="0" name="man_made" type="field"/>
+          <column width="-1" hidden="0" name="other_tags" type="field"/>
+          <column width="-1" hidden="0" name="never_show" type="field"/>
+          <column width="-1" hidden="0" name="label_x" type="field"/>
+          <column width="-1" hidden="0" name="label_y" type="field"/>
+          <column width="-1" hidden="0" name="label_rota" type="field"/>
+          <column width="-1" hidden="0" name="always_sho" type="field"/>
+          <column width="-1" hidden="0" name="resident_a" type="field"/>
+          <column width="-1" hidden="0" name="auxiliary_storage_labeling_show" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7491,76 +7823,76 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="aerialway"/>
-        <field editable="1" name="always_sho"/>
-        <field editable="0" name="auxiliary_storage_labeling_show"/>
-        <field editable="1" name="barrier"/>
-        <field editable="1" name="highway"/>
-        <field editable="1" name="label_rota"/>
-        <field editable="1" name="label_x"/>
-        <field editable="1" name="label_y"/>
-        <field editable="1" name="man_made"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="never_show"/>
-        <field editable="0" name="orig_access"/>
-        <field editable="0" name="orig_always_sho"/>
-        <field editable="0" name="orig_bridge"/>
-        <field editable="0" name="orig_c_z_order"/>
-        <field editable="0" name="orig_class"/>
-        <field editable="0" name="orig_id"/>
-        <field editable="0" name="orig_label_rota"/>
-        <field editable="0" name="orig_label_x"/>
-        <field editable="0" name="orig_label_y"/>
-        <field editable="0" name="orig_name"/>
-        <field editable="0" name="orig_oneway"/>
-        <field editable="0" name="orig_ref"/>
-        <field editable="0" name="orig_service"/>
-        <field editable="0" name="orig_show"/>
-        <field editable="0" name="orig_tunnel"/>
-        <field editable="0" name="orig_type"/>
-        <field editable="0" name="orig_z_order"/>
-        <field editable="1" name="osm_id"/>
-        <field editable="1" name="other_tags"/>
-        <field editable="1" name="resident_a"/>
-        <field editable="1" name="resident_access"/>
-        <field editable="1" name="waterway"/>
-        <field editable="1" name="z_order"/>
+        <field name="aerialway" editable="1"/>
+        <field name="always_sho" editable="1"/>
+        <field name="auxiliary_storage_labeling_show" editable="0"/>
+        <field name="barrier" editable="1"/>
+        <field name="highway" editable="1"/>
+        <field name="label_rota" editable="1"/>
+        <field name="label_x" editable="1"/>
+        <field name="label_y" editable="1"/>
+        <field name="man_made" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="never_show" editable="1"/>
+        <field name="orig_access" editable="0"/>
+        <field name="orig_always_sho" editable="0"/>
+        <field name="orig_bridge" editable="0"/>
+        <field name="orig_c_z_order" editable="0"/>
+        <field name="orig_class" editable="0"/>
+        <field name="orig_id" editable="0"/>
+        <field name="orig_label_rota" editable="0"/>
+        <field name="orig_label_x" editable="0"/>
+        <field name="orig_label_y" editable="0"/>
+        <field name="orig_name" editable="0"/>
+        <field name="orig_oneway" editable="0"/>
+        <field name="orig_ref" editable="0"/>
+        <field name="orig_service" editable="0"/>
+        <field name="orig_show" editable="0"/>
+        <field name="orig_tunnel" editable="0"/>
+        <field name="orig_type" editable="0"/>
+        <field name="orig_z_order" editable="0"/>
+        <field name="osm_id" editable="1"/>
+        <field name="other_tags" editable="1"/>
+        <field name="resident_a" editable="1"/>
+        <field name="resident_access" editable="1"/>
+        <field name="waterway" editable="1"/>
+        <field name="z_order" editable="1"/>
       </editable>
       <labelOnTop>
-        <field 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">
@@ -7609,7 +7941,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="0" readOnly="0" simplifyAlgorithm="0" autoRefreshTime="0" geometry="Point" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" type="vector" simplifyLocal="1" refreshOnNotifyMessage="" minScale="1e+08" refreshOnNotifyEnabled="0" labelsEnabled="1" wkbType="Point">
+    <maplayer wkbType="Point" readOnly="0" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" simplifyDrawingHints="0" simplifyLocal="1" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" autoRefreshTime="0" minScale="1e+08" geometry="Point" simplifyDrawingTol="1" simplifyMaxScale="1" autoRefreshEnabled="0" styleCategories="AllStyleCategories" type="vector" maxScale="0">
       <extent>
         <xmin>18.3984390148267174</xmin>
         <ymin>-33.90832575607554134</ymin>
@@ -7666,7 +7998,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" miny="0" crs="" dimensions="2" maxy="0" maxz="0" maxx="0"/>
+          <spatial maxx="0" maxz="0" minz="0" minx="0" maxy="0" crs="" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -7690,7 +8022,7 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="RuleRenderer" enableorderby="0" symbollevels="0" forceraster="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
         <rules key="{0927a9cd-bbb2-44ea-811b-fdbcb767a09a}">
           <rule key="{efda7615-994b-459d-a657-ee8185286b0b}" symbol="0" filter="regexp_match( &quot;type&quot;, '(start|finish)')"/>
           <rule key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}" symbol="1" filter="&quot;type&quot; = 'toilets'"/>
@@ -7700,289 +8032,289 @@ def my_form_open(dialog, layer, feature):
           <rule key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}" symbol="5" filter="&quot;type&quot; = 'parking'"/>
         </rules>
         <symbols>
-          <symbol type="marker" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-              <prop v="0" k="angle"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="round" k="joinstyle"/>
-              <prop v="star" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.5" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="7" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol name="0" alpha="1" type="marker" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" pass="0" locked="0" class="SimpleMarker">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="0,0,0,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="round"/>
+              <prop k="name" v="star"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="0,0,0,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0.5"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="7"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="if( @map_scale &lt; 7000, '14', '7' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="if( @map_scale &lt; 7000, '14', '7' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" alpha="1" name="1" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SvgMarker" enabled="1" pass="0">
-              <prop v="0" k="angle"/>
-              <prop v="0,32,80,255" k="color"/>
-              <prop v="0" k="fixedAspectRatio"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="amenity/amenity_toilets.svg" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="7" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol name="1" alpha="1" type="marker" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" pass="0" locked="0" class="SvgMarker">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="0,32,80,255"/>
+              <prop k="fixedAspectRatio" v="0"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="name" v="amenity/amenity_toilets.svg"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="35,35,35,255"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="7"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="if( @map_scale &lt; 7000, '10', '5' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" alpha="1" name="2" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SvgMarker" enabled="1" pass="0">
-              <prop v="0" k="angle"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="0" k="fixedAspectRatio"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="../images/gym-bag.svg" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="6" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol name="2" alpha="1" type="marker" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" pass="0" locked="0" class="SvgMarker">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="0,0,0,255"/>
+              <prop k="fixedAspectRatio" v="0"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="name" v="../images/gym-bag.svg"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="0,0,0,255"/>
+              <prop k="outline_width" v="0.2"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="6"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="fillColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="CASE&#xa;WHEN &quot;distance&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;distance&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;distance&quot; = '5KM'  THEN '#456419'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="fillColor" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="CASE&#xa;WHEN &quot;distance&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;distance&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;distance&quot; = '5KM'  THEN '#456419'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="outlineColor" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="if( @map_scale &lt; 7000, '10', '5' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="size" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" alpha="1" name="3" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SvgMarker" enabled="1" pass="0">
-              <prop v="0" k="angle"/>
-              <prop v="125,139,143,255" k="color"/>
-              <prop v="0" k="fixedAspectRatio"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="../images/road_closure.svg" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="6" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol name="3" alpha="1" type="marker" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" pass="0" locked="0" class="SvgMarker">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="125,139,143,255"/>
+              <prop k="fixedAspectRatio" v="0"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="name" v="../images/road_closure.svg"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="35,35,35,255"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="6"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="if( @map_scale &lt; 7000, '10', '6' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="if( @map_scale &lt; 7000, '10', '6' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" alpha="1" name="4" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SvgMarker" enabled="1" pass="0">
-              <prop v="0" k="angle"/>
-              <prop v="0,12,254,255" k="color"/>
-              <prop v="0" k="fixedAspectRatio"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="transport/transport_bus_stop.svg" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="255,255,255,255" k="outline_color"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="5" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
-              <effect type="effectStack" enabled="0">
+          <symbol name="4" alpha="1" type="marker" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" pass="0" locked="0" class="SvgMarker">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="0,12,254,255"/>
+              <prop k="fixedAspectRatio" v="0"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="name" v="transport/transport_bus_stop.svg"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="255,255,255,255"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="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"/>
+              <effect enabled="0" type="effectStack">
                 <effect type="dropShadow">
-                  <prop v="13" k="blend_mode"/>
-                  <prop v="2.645" k="blur_level"/>
-                  <prop v="MM" k="blur_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-                  <prop v="0,0,0,255" k="color"/>
-                  <prop v="2" k="draw_mode"/>
-                  <prop v="0" k="enabled"/>
-                  <prop v="135" k="offset_angle"/>
-                  <prop v="2" k="offset_distance"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_unit_scale"/>
-                  <prop v="1" k="opacity"/>
+                  <prop k="blend_mode" v="13"/>
+                  <prop k="blur_level" v="2.645"/>
+                  <prop k="blur_unit" v="MM"/>
+                  <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="color" v="0,0,0,255"/>
+                  <prop k="draw_mode" v="2"/>
+                  <prop k="enabled" v="0"/>
+                  <prop k="offset_angle" v="135"/>
+                  <prop k="offset_distance" v="2"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="offset_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="opacity" v="1"/>
                 </effect>
                 <effect type="outerGlow">
-                  <prop v="0" k="blend_mode"/>
-                  <prop v="0.7935" k="blur_level"/>
-                  <prop v="MM" k="blur_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-                  <prop v="0,0,255,255" k="color1"/>
-                  <prop v="0,255,0,255" k="color2"/>
-                  <prop v="0" k="color_type"/>
-                  <prop v="0" k="discrete"/>
-                  <prop v="2" k="draw_mode"/>
-                  <prop v="1" k="enabled"/>
-                  <prop v="0.5" k="opacity"/>
-                  <prop v="gradient" k="rampType"/>
-                  <prop v="255,255,255,255" k="single_color"/>
-                  <prop v="2" k="spread"/>
-                  <prop v="MM" k="spread_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="spread_unit_scale"/>
+                  <prop k="blend_mode" v="0"/>
+                  <prop k="blur_level" v="0.7935"/>
+                  <prop k="blur_unit" v="MM"/>
+                  <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="color1" v="0,0,255,255"/>
+                  <prop k="color2" v="0,255,0,255"/>
+                  <prop k="color_type" v="0"/>
+                  <prop k="discrete" v="0"/>
+                  <prop k="draw_mode" v="2"/>
+                  <prop k="enabled" v="1"/>
+                  <prop k="opacity" v="0.5"/>
+                  <prop k="rampType" v="gradient"/>
+                  <prop k="single_color" v="255,255,255,255"/>
+                  <prop k="spread" v="2"/>
+                  <prop k="spread_unit" v="MM"/>
+                  <prop k="spread_unit_scale" v="3x:0,0,0,0,0,0"/>
                 </effect>
                 <effect type="drawSource">
-                  <prop v="0" k="blend_mode"/>
-                  <prop v="2" k="draw_mode"/>
-                  <prop v="1" k="enabled"/>
-                  <prop v="1" k="opacity"/>
+                  <prop k="blend_mode" v="0"/>
+                  <prop k="draw_mode" v="2"/>
+                  <prop k="enabled" v="1"/>
+                  <prop k="opacity" v="1"/>
                 </effect>
                 <effect type="innerShadow">
-                  <prop v="13" k="blend_mode"/>
-                  <prop v="2.645" k="blur_level"/>
-                  <prop v="MM" k="blur_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-                  <prop v="0,0,0,255" k="color"/>
-                  <prop v="2" k="draw_mode"/>
-                  <prop v="0" k="enabled"/>
-                  <prop v="135" k="offset_angle"/>
-                  <prop v="2" k="offset_distance"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_unit_scale"/>
-                  <prop v="1" k="opacity"/>
+                  <prop k="blend_mode" v="13"/>
+                  <prop k="blur_level" v="2.645"/>
+                  <prop k="blur_unit" v="MM"/>
+                  <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="color" v="0,0,0,255"/>
+                  <prop k="draw_mode" v="2"/>
+                  <prop k="enabled" v="0"/>
+                  <prop k="offset_angle" v="135"/>
+                  <prop k="offset_distance" v="2"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="offset_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="opacity" v="1"/>
                 </effect>
                 <effect type="innerGlow">
-                  <prop v="0" k="blend_mode"/>
-                  <prop v="0.7935" k="blur_level"/>
-                  <prop v="MM" k="blur_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-                  <prop v="0,0,255,255" k="color1"/>
-                  <prop v="0,255,0,255" k="color2"/>
-                  <prop v="0" k="color_type"/>
-                  <prop v="0" k="discrete"/>
-                  <prop v="2" k="draw_mode"/>
-                  <prop v="0" k="enabled"/>
-                  <prop v="0.5" k="opacity"/>
-                  <prop v="gradient" k="rampType"/>
-                  <prop v="255,255,255,255" k="single_color"/>
-                  <prop v="2" k="spread"/>
-                  <prop v="MM" k="spread_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="spread_unit_scale"/>
+                  <prop k="blend_mode" v="0"/>
+                  <prop k="blur_level" v="0.7935"/>
+                  <prop k="blur_unit" v="MM"/>
+                  <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="color1" v="0,0,255,255"/>
+                  <prop k="color2" v="0,255,0,255"/>
+                  <prop k="color_type" v="0"/>
+                  <prop k="discrete" v="0"/>
+                  <prop k="draw_mode" v="2"/>
+                  <prop k="enabled" v="0"/>
+                  <prop k="opacity" v="0.5"/>
+                  <prop k="rampType" v="gradient"/>
+                  <prop k="single_color" v="255,255,255,255"/>
+                  <prop k="spread" v="2"/>
+                  <prop k="spread_unit" v="MM"/>
+                  <prop k="spread_unit_scale" v="3x:0,0,0,0,0,0"/>
                 </effect>
               </effect>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" alpha="1" name="5" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SvgMarker" enabled="1" pass="0">
-              <prop v="0" k="angle"/>
-              <prop v="43,153,41,255" k="color"/>
-              <prop v="0" k="fixedAspectRatio"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="transport/amenity=parking.svg" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="6" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol name="5" alpha="1" type="marker" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" pass="0" locked="0" class="SvgMarker">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="43,153,41,255"/>
+              <prop k="fixedAspectRatio" v="0"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="name" v="transport/amenity=parking.svg"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="35,35,35,255"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="6"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="if( @map_scale &lt; 7000, '10', '5' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -7991,36 +8323,36 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings>
-          <text-style fontItalic="0" fieldName="name" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="63" blendMode="0" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="10" multilineHeight="1" textOpacity="0.9" fontSizeUnit="Point" textColor="0,0,0,255" namedStyle="Semibold" fontFamily="Myriad Pro" isExpression="0">
-            <text-buffer bufferOpacity="0.8" bufferJoinStyle="128" bufferSize="2" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="1" bufferColor="255,255,255,255"/>
-            <background shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.7" shapeSizeType="0" shapeRadiiY="2" shapeBlendMode="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="0" shapeRadiiX="2" shapeSizeX="1" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-            <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+          <text-style fontWordSpacing="0" fontSize="10" fontItalic="0" textOpacity="0.9" textColor="0,0,0,255" isExpression="0" fontStrikeout="0" fontCapitals="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWeight="63" fontSizeUnit="Point" fontUnderline="0" fontFamily="Myriad Pro" useSubstitutions="0" namedStyle="Semibold" fontLetterSpacing="0" previewBkgrdColor="#ffffff" multilineHeight="1" blendMode="0" fieldName="name">
+            <text-buffer bufferBlendMode="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="128" bufferDraw="1" bufferOpacity="0.8" bufferSize="2" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="2" shapeDraw="0" shapeSizeUnit="MM" shapeOpacity="0.7" shapeSizeType="0" shapeSizeX="1" shapeBorderColor="128,128,128,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeFillColor="255,255,255,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeJoinStyle="64" shapeOffsetX="0" shapeOffsetY="0" shapeType="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeRadiiX="2" shapeRotationType="0"/>
+            <shadow shadowRadius="1.5" shadowColor="0,0,0,255" shadowOpacity="0.7" shadowScale="100" shadowBlendMode="6" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
             <substitutions/>
           </text-style>
-          <text-format rightDirectionSymbol=">" wrapChar="" placeDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="3" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-          <placement quadOffset="2" preserveRotation="1" geometryGenerator="" placement="0" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="3" distUnits="MM" rotationAngle="0" xOffset="2" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" priority="10" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-25" maxCurvedCharAngleIn="25" repeatDistanceUnits="MM" offsetUnits="MM" placementFlags="10" geometryGeneratorEnabled="0" dist="3" offsetType="0"/>
-          <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="0" fontLimitPixelSize="0" displayAll="1" obstacleFactor="1.8" obstacle="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="10" maxNumLabels="2000" scaleMax="0"/>
+          <text-format wrapChar="" autoWrapLength="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0" decimals="3" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3"/>
+          <placement xOffset="2" repeatDistance="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" geometryGeneratorType="PointGeometry" quadOffset="2" centroidWhole="0" geometryGeneratorEnabled="0" distUnits="MM" yOffset="3" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" offsetUnits="MM" preserveRotation="1" offsetType="0" centroidInside="0" repeatDistanceUnits="MM" geometryGenerator="" dist="3" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" placement="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25"/>
+          <rendering minFeatureSize="0" scaleMax="0" maxNumLabels="2000" zIndex="10" drawLabels="1" limitNumLabels="0" scaleVisibility="0" fontLimitPixelSize="0" displayAll="1" obstacleType="0" obstacleFactor="1.8" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="0" upsidedownLabels="0" fontMinPixelSize="3" fontMaxPixelSize="10000"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="LabelDistance">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="if( @map_scale &lt; 7000, '5', '3' )" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="LabelDistance" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="if( @map_scale &lt; 7000, '5', '3' )" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="OffsetQuad">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="2" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="OffsetQuad" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="2" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="Size">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="if( @map_scale &lt; 7000, '14', '10' )" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="Size" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="if( @map_scale &lt; 7000, '14', '10' )" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dd_properties>
         </settings>
@@ -8035,21 +8367,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundColor="#ffffff" backgroundAlpha="255" labelPlacementMethod="XHeight" lineSizeType="MM" minimumSize="0" diagramOrientation="Up" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" barWidth="5" penWidth="0" penColor="#000000" width="15" scaleDependency="Area" minScaleDenominator="0" height="15" scaleBasedVisibility="0" rotationOffset="270" enabled="0">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0" style="0"/>
-          <attribute label="" field="" color="#000000"/>
+        <DiagramCategory minimumSize="0" penAlpha="255" labelPlacementMethod="XHeight" width="15" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penWidth="0" barWidth="5" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" minScaleDenominator="0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" penColor="#000000" enabled="0" height="15" lineSizeType="MM" diagramOrientation="Up">
+          <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="0" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
+      <DiagramLayerSettings linePlacementFlags="18" dist="0" obstacle="0" showAll="1" priority="0" placement="0" zIndex="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option value="" name="name" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -8084,10 +8416,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 name="" field="id" index="0"/>
+        <alias name="" field="type" index="1"/>
+        <alias name="" field="name" index="2"/>
+        <alias name="" field="distance" index="3"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -8098,10 +8430,10 @@ def my_form_open(dialog, layer, feature):
         <default field="distance" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="distance" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="type" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="name" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="distance" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -8113,13 +8445,13 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;type&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;type&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="0" type="field" width="-1" name="type"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="name"/>
-          <column hidden="0" type="field" width="-1" name="distance"/>
+          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="0" name="type" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="name" type="field"/>
+          <column width="-1" hidden="0" name="distance" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8150,22 +8482,22 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="type"/>
+        <field name="distance" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field 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 simplifyDrawingHints="1" readOnly="0" simplifyAlgorithm="0" autoRefreshTime="0" geometry="Polygon" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" type="vector" simplifyLocal="1" refreshOnNotifyMessage="" minScale="1e+08" refreshOnNotifyEnabled="0" labelsEnabled="0" wkbType="MultiPolygon">
+    <maplayer wkbType="MultiPolygon" readOnly="0" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" simplifyDrawingHints="1" simplifyLocal="1" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" autoRefreshTime="0" minScale="1e+08" geometry="Polygon" simplifyDrawingTol="1" simplifyMaxScale="1" autoRefreshEnabled="0" styleCategories="AllStyleCategories" type="vector" maxScale="0">
       <extent>
         <xmin>18.37312291788339991</xmin>
         <ymin>-33.931815589166888</ymin>
@@ -8229,75 +8561,75 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" enableorderby="0" symbollevels="0" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol type="fill" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="LinePatternFill" enabled="1" pass="0">
-              <prop v="135" k="angle"/>
-              <prop v="211,134,33,255" k="color"/>
-              <prop v="2" k="distance"/>
-              <prop v="3x:0,0,0,0,0,0" k="distance_map_unit_scale"/>
-              <prop v="MM" k="distance_unit"/>
-              <prop v="0.26" k="line_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="line_width_map_unit_scale"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
+          <symbol name="0" alpha="1" type="fill" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" pass="0" locked="0" class="LinePatternFill">
+              <prop k="angle" v="135"/>
+              <prop k="color" v="211,134,33,255"/>
+              <prop k="distance" v="2"/>
+              <prop k="distance_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="distance_unit" v="MM"/>
+              <prop k="line_width" v="0.26"/>
+              <prop k="line_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="line" alpha="1" name="@0@0" clip_to_extent="1" force_rhr="0">
-                <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-                  <prop v="square" k="capstyle"/>
-                  <prop v="5;2" k="customdash"/>
-                  <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                  <prop v="MM" k="customdash_unit"/>
-                  <prop v="0" k="draw_inside_polygon"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="211,134,33,255" k="line_color"/>
-                  <prop v="solid" k="line_style"/>
-                  <prop v="0.3" k="line_width"/>
-                  <prop v="MM" k="line_width_unit"/>
-                  <prop v="0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0" k="ring_filter"/>
-                  <prop v="0" k="use_custom_dash"/>
-                  <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+              <symbol name="@0@0" alpha="1" type="line" clip_to_extent="1" force_rhr="0">
+                <layer enabled="1" pass="0" locked="0" class="SimpleLine">
+                  <prop k="capstyle" v="square"/>
+                  <prop k="customdash" v="5;2"/>
+                  <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="customdash_unit" v="MM"/>
+                  <prop k="draw_inside_polygon" v="0"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="line_color" v="211,134,33,255"/>
+                  <prop k="line_style" v="solid"/>
+                  <prop k="line_width" v="0.3"/>
+                  <prop k="line_width_unit" v="MM"/>
+                  <prop k="offset" v="0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="ring_filter" v="0"/>
+                  <prop k="use_custom_dash" v="0"/>
+                  <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option value="" name="name" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="211,134,33,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.46" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="no" k="style"/>
+            <layer enabled="1" pass="0" locked="0" 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"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="0,0,0,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0.46"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="style" v="no"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -8316,21 +8648,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundColor="#ffffff" backgroundAlpha="255" labelPlacementMethod="XHeight" lineSizeType="MM" minimumSize="0" diagramOrientation="Up" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" barWidth="5" penWidth="0" penColor="#000000" width="15" scaleDependency="Area" minScaleDenominator="0" height="15" scaleBasedVisibility="0" rotationOffset="270" enabled="0">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0" style="0"/>
-          <attribute label="" field="" color="#000000"/>
+        <DiagramCategory minimumSize="0" penAlpha="255" labelPlacementMethod="XHeight" width="15" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penWidth="0" barWidth="5" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" minScaleDenominator="0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" penColor="#000000" enabled="0" height="15" lineSizeType="MM" diagramOrientation="Up">
+          <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="1" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
+      <DiagramLayerSettings linePlacementFlags="18" dist="0" obstacle="0" showAll="1" priority="0" placement="1" zIndex="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option value="" name="name" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -8344,7 +8676,7 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="FID" index="0" name=""/>
+        <alias name="" field="FID" index="0"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -8352,7 +8684,7 @@ def my_form_open(dialog, layer, feature):
         <default field="FID" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="FID" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="FID" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="FID" exp="" desc=""/>
@@ -8361,11 +8693,11 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="0" type="field" width="431" name="type"/>
-          <column hidden="1" type="actions" width="-1"/>
+          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="431" hidden="0" name="type" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8396,18 +8728,18 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field 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 simplifyDrawingHints="1" readOnly="0" simplifyAlgorithm="0" autoRefreshTime="0" geometry="Line" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" type="vector" simplifyLocal="1" refreshOnNotifyMessage="" minScale="1e+08" refreshOnNotifyEnabled="0" labelsEnabled="1" wkbType="MultiLineString">
+    <maplayer wkbType="MultiLineString" readOnly="0" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" simplifyDrawingHints="1" simplifyLocal="1" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" autoRefreshTime="0" minScale="1e+08" geometry="Line" simplifyDrawingTol="1" simplifyMaxScale="1" autoRefreshEnabled="0" styleCategories="AllStyleCategories" type="vector" maxScale="0">
       <extent>
         <xmin>18.3752895999999879</xmin>
         <ymin>-33.94589500000000726</ymin>
@@ -8464,7 +8796,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" miny="0" crs="" dimensions="2" maxy="0" maxz="0" maxx="0"/>
+          <spatial maxx="0" maxz="0" minz="0" minx="0" maxy="0" crs="" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -8488,348 +8820,348 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="RuleRenderer" enableorderby="0" symbollevels="0" forceraster="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
         <rules key="{57366f52-c504-4c9a-800f-dcbf1d415bf6}">
-          <rule label="Road Open" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" symbol="0" filter="&quot;status&quot; = 'open'"/>
-          <rule label="No Parking" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" symbol="1" filter="&quot;status&quot; = 'no-parking'"/>
-          <rule label="Lane Closed" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" symbol="2" filter="&quot;status&quot; = 'lane-closed'"/>
-          <rule label="One-Way" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" symbol="3" filter="&quot;status&quot; = 'one-way'"/>
-          <rule label="Road Closures" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" symbol="4" filter="&quot;status&quot; = 'closure'"/>
+          <rule key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" symbol="0" filter="&quot;status&quot; = 'open'" label="Road Open"/>
+          <rule key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" symbol="1" filter="&quot;status&quot; = 'no-parking'" label="No Parking"/>
+          <rule key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" symbol="2" filter="&quot;status&quot; = 'lane-closed'" label="Lane Closed"/>
+          <rule key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" symbol="3" filter="&quot;status&quot; = 'one-way'" label="One-Way"/>
+          <rule key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" symbol="4" filter="&quot;status&quot; = 'closure'" label="Road Closures"/>
         </rules>
         <symbols>
-          <symbol type="line" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,255,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.75" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol name="0" alpha="1" type="line" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" pass="0" locked="0" class="SimpleLine">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,255,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.75"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="1" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="2" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+          <symbol name="1" alpha="1" type="line" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" pass="0" locked="0" 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"/>
+              <prop k="interval" v="2"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@1@0" clip_to_extent="1" force_rhr="0">
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="255,255,255,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,255,0,255" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0.5" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="1" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@1@0" alpha="1" type="marker" clip_to_extent="1" force_rhr="0">
+                <layer enabled="1" pass="0" locked="0" class="SimpleMarker">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="255,255,255,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,255,0,255"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0.5"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="1"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option value="" name="name" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="2" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="2;1;1;1" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,255,0,255" k="line_color"/>
-              <prop v="dash dot dot" k="line_style"/>
-              <prop v="0.75" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol name="2" alpha="1" type="line" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" pass="0" locked="0" 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"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,255,0,255"/>
+              <prop k="line_style" v="dash dot dot"/>
+              <prop k="line_width" v="0.75"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="1"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="250" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MapUnit" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="25" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer enabled="1" pass="0" locked="0" 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"/>
+              <prop k="interval" v="250"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MapUnit"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="25"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MapUnit"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="enabled">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="enabled" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@2@1" clip_to_extent="1" force_rhr="0">
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="0,255,0,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="35,35,35,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3.5" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@2@1" alpha="1" type="marker" clip_to_extent="1" force_rhr="0">
+                <layer enabled="1" pass="0" locked="0" class="SimpleMarker">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="0,255,0,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="35,35,35,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="3.5"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="outlineStyle">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                      <Option value="" name="name" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="outlineStyle" type="Map">
+                          <Option value="false" name="active" type="bool"/>
+                          <Option value="1" name="type" type="int"/>
+                          <Option value="" name="val" type="QString"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="3" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="3;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,255,0,255" k="line_color"/>
-              <prop v="dash" k="line_style"/>
-              <prop v="0.75" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol name="3" alpha="1" type="line" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" pass="0" locked="0" 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"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,255,0,255"/>
+              <prop k="line_style" v="dash"/>
+              <prop k="line_width" v="0.75"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="1"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="250" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MapUnit" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="25" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer enabled="1" pass="0" locked="0" 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"/>
+              <prop k="interval" v="250"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MapUnit"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="25"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MapUnit"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="enabled">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="enabled" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@3@1" clip_to_extent="1" force_rhr="0">
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="0,255,0,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="35,35,35,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3.5" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@3@1" alpha="1" type="marker" clip_to_extent="1" force_rhr="0">
+                <layer enabled="1" pass="0" locked="0" class="SimpleMarker">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="0,255,0,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="35,35,35,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="3.5"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="outlineStyle">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                      <Option value="" name="name" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="outlineStyle" type="Map">
+                          <Option value="false" name="active" type="bool"/>
+                          <Option value="1" name="type" type="int"/>
+                          <Option value="" name="val" type="QString"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="4" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="255,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.75" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol name="4" alpha="1" type="line" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" pass="0" locked="0" class="SimpleLine">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="255,0,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.75"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -8838,20 +9170,20 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings>
-          <text-style fontItalic="0" fieldName="times" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="50" blendMode="0" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="9" multilineHeight="1" textOpacity="1" fontSizeUnit="Point" textColor="0,0,0,255" namedStyle="Regular" fontFamily="Myriad Pro" isExpression="0">
-            <text-buffer bufferOpacity="1" bufferJoinStyle="128" bufferSize="1" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="1" bufferColor="255,255,255,255"/>
-            <background shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeType="0" shapeRadiiY="0" shapeBlendMode="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="0" shapeRadiiX="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-            <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+          <text-style fontWordSpacing="0" fontSize="9" fontItalic="0" textOpacity="1" textColor="0,0,0,255" isExpression="0" fontStrikeout="0" fontCapitals="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWeight="50" fontSizeUnit="Point" fontUnderline="0" fontFamily="Myriad Pro" useSubstitutions="0" namedStyle="Regular" fontLetterSpacing="0" previewBkgrdColor="#ffffff" multilineHeight="1" blendMode="0" fieldName="times">
+            <text-buffer bufferBlendMode="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128" bufferDraw="1" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeDraw="0" shapeSizeUnit="MM" shapeOpacity="1" shapeSizeType="0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeJoinStyle="64" shapeOffsetX="0" shapeOffsetY="0" shapeType="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeRadiiX="0" shapeRotationType="0"/>
+            <shadow shadowRadius="1.5" shadowColor="0,0,0,255" shadowOpacity="0.7" shadowScale="100" shadowBlendMode="6" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
             <substitutions/>
           </text-style>
-          <text-format rightDirectionSymbol=">" wrapChar="" placeDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="4294967295" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-          <placement quadOffset="4" preserveRotation="1" geometryGenerator="" placement="2" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" priority="5" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-25" maxCurvedCharAngleIn="25" repeatDistanceUnits="MM" offsetUnits="MM" placementFlags="10" geometryGeneratorEnabled="0" dist="0" offsetType="0"/>
-          <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="0" fontLimitPixelSize="0" displayAll="0" obstacleFactor="1" obstacle="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="0" maxNumLabels="2000" scaleMax="0"/>
+          <text-format wrapChar="" autoWrapLength="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0" decimals="3" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="4294967295"/>
+          <placement xOffset="0" repeatDistance="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" priority="5" geometryGeneratorType="PointGeometry" quadOffset="4" centroidWhole="0" geometryGeneratorEnabled="0" distUnits="MM" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" offsetUnits="MM" preserveRotation="1" offsetType="0" centroidInside="0" repeatDistanceUnits="MM" geometryGenerator="" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" placement="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25"/>
+          <rendering minFeatureSize="0" scaleMax="0" maxNumLabels="2000" zIndex="0" drawLabels="1" limitNumLabels="0" scaleVisibility="0" fontLimitPixelSize="0" displayAll="0" obstacleType="0" obstacleFactor="1" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="0" upsidedownLabels="0" fontMinPixelSize="3" fontMaxPixelSize="10000"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dd_properties>
         </settings>
@@ -8866,21 +9198,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundColor="#ffffff" backgroundAlpha="255" labelPlacementMethod="XHeight" lineSizeType="MM" minimumSize="0" diagramOrientation="Up" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" barWidth="5" penWidth="0" penColor="#000000" width="15" scaleDependency="Area" minScaleDenominator="0" height="15" scaleBasedVisibility="0" rotationOffset="270" enabled="0">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0" style="0"/>
-          <attribute label="" field="" color="#000000"/>
+        <DiagramCategory minimumSize="0" penAlpha="255" labelPlacementMethod="XHeight" width="15" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penWidth="0" barWidth="5" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" minScaleDenominator="0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" penColor="#000000" enabled="0" height="15" lineSizeType="MM" diagramOrientation="Up">
+          <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="2" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
+      <DiagramLayerSettings linePlacementFlags="18" dist="0" obstacle="0" showAll="1" priority="0" placement="2" zIndex="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option value="" name="name" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -8915,10 +9247,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 name="" field="id" index="0"/>
+        <alias name="" field="type" index="1"/>
+        <alias name="" field="status" index="2"/>
+        <alias name="" field="times" index="3"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -8929,10 +9261,10 @@ def my_form_open(dialog, layer, feature):
         <default field="times" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="status" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="times" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="type" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="status" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="times" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -8944,13 +9276,13 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="0" type="field" width="202" name="type"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="status"/>
-          <column hidden="0" type="field" width="-1" name="times"/>
+          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="202" hidden="0" name="type" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="status" type="field"/>
+          <column width="-1" hidden="0" name="times" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8981,22 +9313,22 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="status"/>
-        <field editable="1" name="times"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="status" editable="1"/>
+        <field name="times" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field 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 simplifyDrawingHints="0" readOnly="0" simplifyAlgorithm="0" autoRefreshTime="0" geometry="Point" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="100000" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" type="vector" simplifyLocal="1" refreshOnNotifyMessage="" minScale="1e+08" refreshOnNotifyEnabled="0" labelsEnabled="1" wkbType="Point">
+    <maplayer wkbType="Point" readOnly="0" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" simplifyDrawingHints="0" simplifyLocal="1" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" autoRefreshTime="0" minScale="1e+08" geometry="Point" simplifyDrawingTol="1" simplifyMaxScale="1" autoRefreshEnabled="0" styleCategories="AllStyleCategories" type="vector" maxScale="100000">
       <extent>
         <xmin>18.37564632736778236</xmin>
         <ymin>-33.94557692503335744</ymin>
@@ -9053,7 +9385,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" miny="0" crs="" dimensions="2" maxy="0" maxz="0" maxx="0"/>
+          <spatial maxx="0" maxz="0" minz="0" minx="0" maxy="0" crs="" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -9071,7 +9403,7 @@ def my_form_open(dialog, layer, feature):
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
         <map-layer-style name="timelapse">
-          <qgis maxScale="100000" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" version="3.8.3-Zanzibar" simplifyDrawingHints="0" simplifyLocal="1" labelsEnabled="1" minScale="1e+08" simplifyDrawingTol="1" simplifyMaxScale="1" readOnly="0" styleCategories="AllStyleCategories">
+          <qgis simplifyAlgorithm="0" simplifyLocal="1" minScale="1e+08" simplifyDrawingTol="1" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" styleCategories="AllStyleCategories" version="3.8.3-Zanzibar" readOnly="0" maxScale="100000" simplifyDrawingHints="0">
             <flags>
               <Identifiable>1</Identifiable>
               <Removable>1</Removable>
@@ -9080,125 +9412,125 @@ def my_form_open(dialog, layer, feature):
             <renderer-v2 type="nullSymbol"/>
             <labeling type="rule-based">
               <rules key="{2cf820d0-73b9-4746-94f0-ade0b2da8c4e}">
-                <rule key="{84988b39-de25-471d-aa1f-8d688cc3c1cd}" description="21KM" filter="&quot;Source&quot; = '21KM'">
+                <rule key="{84988b39-de25-471d-aa1f-8d688cc3c1cd}" filter="&quot;Source&quot; = '21KM'" description="21KM">
                   <settings>
-                    <text-style fontItalic="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" blendMode="0" fontWeight="63" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="7" multilineHeight="1" textOpacity="1" fontSizeUnit="Point" textColor="255,255,255,255" namedStyle="Semibold" fontFamily="Myriad Pro" isExpression="1">
-                      <text-buffer bufferOpacity="1" bufferJoinStyle="64" bufferSize="1" bufferNoFill="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255"/>
-                      <background shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeType="0" shapeRadiiY="0.1" shapeBlendMode="0" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="210,32,39,255" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="128" shapeFillColor="210,32,39,255" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeBorderWidth="1" shapeOffsetY="0" shapeRadiiX="1" shapeSizeX="0.5" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-                      <shadow shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowScale="100" shadowRadius="1.5" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+                    <text-style fontWordSpacing="0" fontSize="7" fontItalic="0" textOpacity="1" textColor="255,255,255,255" isExpression="1" fontStrikeout="0" fontCapitals="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWeight="63" fontSizeUnit="Point" fontUnderline="0" fontFamily="Myriad Pro" useSubstitutions="0" namedStyle="Semibold" previewBkgrdColor="#ffffff" fontLetterSpacing="0" multilineHeight="1" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )">
+                      <text-buffer bufferBlendMode="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="64" bufferDraw="0" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                      <background shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeRadiiY="0.1" shapeDraw="1" shapeSizeUnit="MM" shapeSizeType="0" shapeBorderColor="210,32,39,255" shapeSizeX="0.5" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="210,32,39,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeJoinStyle="128" shapeOffsetX="0" shapeOffsetY="0" shapeType="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeRadiiX="1" shapeRotationType="0"/>
+                      <shadow shadowRadius="1.5" shadowColor="0,0,0,255" shadowOpacity="0.7" shadowScale="100" shadowBlendMode="6" shadowOffsetDist="1" shadowUnder="0" shadowOffsetGlobal="1" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
                       <substitutions/>
                     </text-style>
-                    <text-format rightDirectionSymbol=">" wrapChar="" decimals="0" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="3" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-                    <placement quadOffset="3" preserveRotation="1" geometryGenerator="" placement="6" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" priority="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-20" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" offsetUnits="MapUnit" placementFlags="10" geometryGeneratorEnabled="0" dist="2" offsetType="0"/>
-                    <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="1" fontLimitPixelSize="0" displayAll="1" obstacleFactor="2" obstacle="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="0" maxNumLabels="2000" scaleMax="10000000"/>
+                    <text-format autoWrapLength="0" wrapChar="" plussign="0" placeDirectionSymbol="0" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0" decimals="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="3" useMaxLineLengthForAutoWrap="1"/>
+                    <placement repeatDistance="0" xOffset="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" geometryGeneratorType="PointGeometry" quadOffset="3" centroidWhole="0" geometryGeneratorEnabled="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" rotationAngle="0" placementFlags="10" offsetUnits="MapUnit" preserveRotation="1" geometryGenerator="" offsetType="0" repeatDistanceUnits="MM" centroidInside="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" dist="2" maxCurvedCharAngleOut="-20" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20"/>
+                    <rendering minFeatureSize="0" scaleMax="10000000" maxNumLabels="2000" zIndex="0" drawLabels="1" limitNumLabels="0" scaleVisibility="0" fontLimitPixelSize="0" displayAll="1" obstacleType="0" obstacleFactor="2" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="1" upsidedownLabels="0" fontMinPixelSize="3" fontMaxPixelSize="10000"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
-                        <Option type="Map" name="properties">
-                          <Option type="Map" name="PositionX">
-                            <Option type="bool" value="false" name="active"/>
-                            <Option type="int" value="1" name="type"/>
-                            <Option type="QString" value="" name="val"/>
+                        <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 type="Map" name="PositionY">
-                            <Option type="bool" value="false" name="active"/>
-                            <Option type="int" value="1" name="type"/>
-                            <Option type="QString" value="" name="val"/>
+                          <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 type="Map" name="PredefinedPositionOrder">
-                            <Option type="bool" value="false" name="active"/>
-                            <Option type="int" value="1" name="type"/>
-                            <Option type="QString" value="" name="val"/>
+                          <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 type="Map" name="Rotation">
-                            <Option type="bool" value="false" name="active"/>
-                            <Option type="QString" value="rotation" name="field"/>
-                            <Option type="int" value="2" name="type"/>
+                          <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 type="QString" value="collection" name="type"/>
+                        <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </dd_properties>
                   </settings>
                 </rule>
-                <rule key="{2699b0bb-7177-40de-af85-7bce9fd38af9}" description="10KM" filter="&quot;Source&quot; = '10KM'">
+                <rule key="{2699b0bb-7177-40de-af85-7bce9fd38af9}" filter="&quot;Source&quot; = '10KM'" description="10KM">
                   <settings>
-                    <text-style fontItalic="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" blendMode="0" fontWeight="63" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="7" multilineHeight="1" textOpacity="1" fontSizeUnit="Point" textColor="255,255,255,255" namedStyle="Semibold" fontFamily="Myriad Pro" isExpression="1">
-                      <text-buffer bufferOpacity="1" bufferJoinStyle="64" bufferSize="1" bufferNoFill="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255"/>
-                      <background shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeType="0" shapeRadiiY="0.1" shapeBlendMode="0" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="103,34,144,255" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="128" shapeFillColor="103,34,144,255" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeBorderWidth="1" shapeOffsetY="0" shapeRadiiX="1" shapeSizeX="0.5" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-                      <shadow shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowScale="100" shadowRadius="1.5" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+                    <text-style fontWordSpacing="0" fontSize="7" fontItalic="0" textOpacity="1" textColor="255,255,255,255" isExpression="1" fontStrikeout="0" fontCapitals="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWeight="63" fontSizeUnit="Point" fontUnderline="0" fontFamily="Myriad Pro" useSubstitutions="0" namedStyle="Semibold" previewBkgrdColor="#ffffff" fontLetterSpacing="0" multilineHeight="1" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )">
+                      <text-buffer bufferBlendMode="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="64" bufferDraw="0" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                      <background shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeRadiiY="0.1" shapeDraw="1" shapeSizeUnit="MM" shapeSizeType="0" shapeBorderColor="103,34,144,255" shapeSizeX="0.5" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="103,34,144,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeJoinStyle="128" shapeOffsetX="0" shapeOffsetY="0" shapeType="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeRadiiX="1" shapeRotationType="0"/>
+                      <shadow shadowRadius="1.5" shadowColor="0,0,0,255" shadowOpacity="0.7" shadowScale="100" shadowBlendMode="6" shadowOffsetDist="1" shadowUnder="0" shadowOffsetGlobal="1" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
                       <substitutions/>
                     </text-style>
-                    <text-format rightDirectionSymbol=">" wrapChar="" decimals="0" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="3" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-                    <placement quadOffset="4" preserveRotation="1" geometryGenerator="" placement="6" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" priority="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-20" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" offsetUnits="MapUnit" placementFlags="10" geometryGeneratorEnabled="0" dist="2" offsetType="0"/>
-                    <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="1" fontLimitPixelSize="0" displayAll="1" obstacleFactor="2" obstacle="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="0" maxNumLabels="2000" scaleMax="10000000"/>
+                    <text-format autoWrapLength="0" wrapChar="" plussign="0" placeDirectionSymbol="0" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0" decimals="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="3" useMaxLineLengthForAutoWrap="1"/>
+                    <placement repeatDistance="0" xOffset="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" geometryGeneratorType="PointGeometry" quadOffset="4" centroidWhole="0" geometryGeneratorEnabled="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" rotationAngle="0" placementFlags="10" offsetUnits="MapUnit" preserveRotation="1" geometryGenerator="" offsetType="0" repeatDistanceUnits="MM" centroidInside="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" dist="2" maxCurvedCharAngleOut="-20" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20"/>
+                    <rendering minFeatureSize="0" scaleMax="10000000" maxNumLabels="2000" zIndex="0" drawLabels="1" limitNumLabels="0" scaleVisibility="0" fontLimitPixelSize="0" displayAll="1" obstacleType="0" obstacleFactor="2" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="1" upsidedownLabels="0" fontMinPixelSize="3" fontMaxPixelSize="10000"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
-                        <Option type="Map" name="properties">
-                          <Option type="Map" name="PositionX">
-                            <Option type="bool" value="false" name="active"/>
-                            <Option type="int" value="1" name="type"/>
-                            <Option type="QString" value="" name="val"/>
+                        <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 type="Map" name="PositionY">
-                            <Option type="bool" value="false" name="active"/>
-                            <Option type="int" value="1" name="type"/>
-                            <Option type="QString" value="" name="val"/>
+                          <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 type="Map" name="PredefinedPositionOrder">
-                            <Option type="bool" value="true" name="active"/>
-                            <Option type="QString" value="quadrant" name="field"/>
-                            <Option type="int" value="2" name="type"/>
+                          <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 type="Map" name="Rotation">
-                            <Option type="bool" value="false" name="active"/>
-                            <Option type="QString" value="rotation" name="field"/>
-                            <Option type="int" value="2" name="type"/>
+                          <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 type="QString" value="collection" name="type"/>
+                        <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </dd_properties>
                   </settings>
                 </rule>
-                <rule key="{63d03041-a1e4-4dad-ab41-9339e48044c5}" description="5KM" filter="&quot;Source&quot; = '5KM'">
+                <rule key="{63d03041-a1e4-4dad-ab41-9339e48044c5}" filter="&quot;Source&quot; = '5KM'" description="5KM">
                   <settings>
-                    <text-style fontItalic="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" blendMode="0" fontWeight="63" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="7" multilineHeight="1" textOpacity="1" fontSizeUnit="Point" textColor="255,255,255,255" namedStyle="Semibold" fontFamily="Myriad Pro" isExpression="1">
-                      <text-buffer bufferOpacity="1" bufferJoinStyle="64" bufferSize="1" bufferNoFill="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255"/>
-                      <background shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeType="0" shapeRadiiY="0.1" shapeBlendMode="0" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="128" shapeFillColor="145,211,55,255" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeBorderWidth="1" shapeOffsetY="0" shapeRadiiX="1" shapeSizeX="0.5" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-                      <shadow shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowScale="100" shadowRadius="1.5" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+                    <text-style fontWordSpacing="0" fontSize="7" fontItalic="0" textOpacity="1" textColor="255,255,255,255" isExpression="1" fontStrikeout="0" fontCapitals="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWeight="63" fontSizeUnit="Point" fontUnderline="0" fontFamily="Myriad Pro" useSubstitutions="0" namedStyle="Semibold" previewBkgrdColor="#ffffff" fontLetterSpacing="0" multilineHeight="1" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )">
+                      <text-buffer bufferBlendMode="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="64" bufferDraw="0" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                      <background shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeRadiiY="0.1" shapeDraw="1" shapeSizeUnit="MM" shapeSizeType="0" shapeBorderColor="145,211,55,255" shapeSizeX="0.5" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="145,211,55,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeJoinStyle="128" shapeOffsetX="0" shapeOffsetY="0" shapeType="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeRadiiX="1" shapeRotationType="0"/>
+                      <shadow shadowRadius="1.5" shadowColor="0,0,0,255" shadowOpacity="0.7" shadowScale="100" shadowBlendMode="6" shadowOffsetDist="1" shadowUnder="0" shadowOffsetGlobal="1" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
                       <substitutions/>
                     </text-style>
-                    <text-format rightDirectionSymbol=">" wrapChar="" decimals="0" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="3" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-                    <placement quadOffset="4" preserveRotation="1" geometryGenerator="" placement="6" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" priority="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-20" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" offsetUnits="MapUnit" placementFlags="10" geometryGeneratorEnabled="0" dist="2" offsetType="0"/>
-                    <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="1" fontLimitPixelSize="0" displayAll="1" obstacleFactor="2" obstacle="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="0" maxNumLabels="2000" scaleMax="10000000"/>
+                    <text-format autoWrapLength="0" wrapChar="" plussign="0" placeDirectionSymbol="0" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0" decimals="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="3" useMaxLineLengthForAutoWrap="1"/>
+                    <placement repeatDistance="0" xOffset="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" geometryGeneratorType="PointGeometry" quadOffset="4" centroidWhole="0" geometryGeneratorEnabled="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" rotationAngle="0" placementFlags="10" offsetUnits="MapUnit" preserveRotation="1" geometryGenerator="" offsetType="0" repeatDistanceUnits="MM" centroidInside="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" dist="2" maxCurvedCharAngleOut="-20" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20"/>
+                    <rendering minFeatureSize="0" scaleMax="10000000" maxNumLabels="2000" zIndex="0" drawLabels="1" limitNumLabels="0" scaleVisibility="0" fontLimitPixelSize="0" displayAll="1" obstacleType="0" obstacleFactor="2" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="1" upsidedownLabels="0" fontMinPixelSize="3" fontMaxPixelSize="10000"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
-                        <Option type="Map" name="properties">
-                          <Option type="Map" name="PositionX">
-                            <Option type="bool" value="false" name="active"/>
-                            <Option type="int" value="1" name="type"/>
-                            <Option type="QString" value="" name="val"/>
+                        <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 type="Map" name="PositionY">
-                            <Option type="bool" value="false" name="active"/>
-                            <Option type="int" value="1" name="type"/>
-                            <Option type="QString" value="" name="val"/>
+                          <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 type="Map" name="PredefinedPositionOrder">
-                            <Option type="bool" value="true" name="active"/>
-                            <Option type="QString" value="quadrant" name="field"/>
-                            <Option type="int" value="2" name="type"/>
+                          <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 type="Map" name="Rotation">
-                            <Option type="bool" value="false" name="active"/>
-                            <Option type="QString" value="rotation" name="field"/>
-                            <Option type="int" value="2" name="type"/>
+                          <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 type="QString" value="collection" name="type"/>
+                        <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </dd_properties>
                   </settings>
@@ -9215,21 +9547,21 @@ def my_form_open(dialog, layer, feature):
             <featureBlendMode>0</featureBlendMode>
             <layerOpacity>1</layerOpacity>
             <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-              <DiagramCategory sizeType="MM" opacity="1" backgroundColor="#ffffff" backgroundAlpha="255" labelPlacementMethod="XHeight" lineSizeType="MM" minimumSize="0" diagramOrientation="Up" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" barWidth="5" sizeScale="3x:0,0,0,0,0,0" penWidth="0" penColor="#000000" width="15" scaleDependency="Area" minScaleDenominator="100000" height="15" scaleBasedVisibility="0" rotationOffset="270" enabled="0">
-                <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-                <attribute label="" field="" color="#000000"/>
+              <DiagramCategory minimumSize="0" penAlpha="255" labelPlacementMethod="XHeight" width="15" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penWidth="0" rotationOffset="270" barWidth="5" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" minScaleDenominator="100000" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" penColor="#000000" enabled="0" lineSizeType="MM" height="15" diagramOrientation="Up">
+                <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+                <attribute field="" color="#000000" label=""/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings priority="0" dist="0" placement="0" zIndex="0" obstacle="0" linePlacementFlags="2" showAll="1">
+            <DiagramLayerSettings linePlacementFlags="2" dist="0" obstacle="0" showAll="1" priority="0" placement="0" zIndex="0">
               <properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </properties>
             </DiagramLayerSettings>
-            <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+            <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
               <activeChecks/>
               <checkConfiguration/>
             </geometryOptions>
@@ -9238,8 +9570,8 @@ def my_form_open(dialog, layer, feature):
                 <editWidget type="TextEdit">
                   <config>
                     <Option type="Map">
-                      <Option type="QString" value="0" name="IsMultiline"/>
-                      <Option type="QString" value="0" name="UseHtml"/>
+                      <Option value="0" name="IsMultiline" type="QString"/>
+                      <Option value="0" name="UseHtml" type="QString"/>
                     </Option>
                   </config>
                 </editWidget>
@@ -9248,8 +9580,8 @@ def my_form_open(dialog, layer, feature):
                 <editWidget type="TextEdit">
                   <config>
                     <Option type="Map">
-                      <Option type="QString" value="0" name="IsMultiline"/>
-                      <Option type="QString" value="0" name="UseHtml"/>
+                      <Option value="0" name="IsMultiline" type="QString"/>
+                      <Option value="0" name="UseHtml" type="QString"/>
                     </Option>
                   </config>
                 </editWidget>
@@ -9258,8 +9590,8 @@ def my_form_open(dialog, layer, feature):
                 <editWidget type="TextEdit">
                   <config>
                     <Option type="Map">
-                      <Option type="QString" value="0" name="IsMultiline"/>
-                      <Option type="QString" value="0" name="UseHtml"/>
+                      <Option value="0" name="IsMultiline" type="QString"/>
+                      <Option value="0" name="UseHtml" type="QString"/>
                     </Option>
                   </config>
                 </editWidget>
@@ -9268,8 +9600,8 @@ def my_form_open(dialog, layer, feature):
                 <editWidget type="TextEdit">
                   <config>
                     <Option type="Map">
-                      <Option type="QString" value="0" name="IsMultiline"/>
-                      <Option type="QString" value="0" name="UseHtml"/>
+                      <Option value="0" name="IsMultiline" type="QString"/>
+                      <Option value="0" name="UseHtml" type="QString"/>
                     </Option>
                   </config>
                 </editWidget>
@@ -9278,8 +9610,8 @@ def my_form_open(dialog, layer, feature):
                 <editWidget type="TextEdit">
                   <config>
                     <Option type="Map">
-                      <Option type="QString" value="0" name="IsMultiline"/>
-                      <Option type="QString" value="0" name="UseHtml"/>
+                      <Option value="0" name="IsMultiline" type="QString"/>
+                      <Option value="0" name="UseHtml" type="QString"/>
                     </Option>
                   </config>
                 </editWidget>
@@ -9288,8 +9620,8 @@ def my_form_open(dialog, layer, feature):
                 <editWidget type="TextEdit">
                   <config>
                     <Option type="Map">
-                      <Option type="QString" value="0" name="IsMultiline"/>
-                      <Option type="QString" value="0" name="UseHtml"/>
+                      <Option value="0" name="IsMultiline" type="QString"/>
+                      <Option value="0" name="UseHtml" type="QString"/>
                     </Option>
                   </config>
                 </editWidget>
@@ -9298,8 +9630,8 @@ def my_form_open(dialog, layer, feature):
                 <editWidget type="TextEdit">
                   <config>
                     <Option type="Map">
-                      <Option type="QString" value="0" name="IsMultiline"/>
-                      <Option type="QString" value="0" name="UseHtml"/>
+                      <Option value="0" name="IsMultiline" type="QString"/>
+                      <Option value="0" name="UseHtml" type="QString"/>
                     </Option>
                   </config>
                 </editWidget>
@@ -9308,8 +9640,8 @@ def my_form_open(dialog, layer, feature):
                 <editWidget type="TextEdit">
                   <config>
                     <Option type="Map">
-                      <Option type="QString" value="0" name="IsMultiline"/>
-                      <Option type="QString" value="0" name="UseHtml"/>
+                      <Option value="0" name="IsMultiline" type="QString"/>
+                      <Option value="0" name="UseHtml" type="QString"/>
                     </Option>
                   </config>
                 </editWidget>
@@ -9318,8 +9650,8 @@ def my_form_open(dialog, layer, feature):
                 <editWidget type="TextEdit">
                   <config>
                     <Option type="Map">
-                      <Option type="QString" value="0" name="IsMultiline"/>
-                      <Option type="QString" value="0" name="UseHtml"/>
+                      <Option value="0" name="IsMultiline" type="QString"/>
+                      <Option value="0" name="UseHtml" type="QString"/>
                     </Option>
                   </config>
                 </editWidget>
@@ -9328,8 +9660,8 @@ def my_form_open(dialog, layer, feature):
                 <editWidget type="TextEdit">
                   <config>
                     <Option type="Map">
-                      <Option type="QString" value="0" name="IsMultiline"/>
-                      <Option type="QString" value="0" name="UseHtml"/>
+                      <Option value="0" name="IsMultiline" type="QString"/>
+                      <Option value="0" name="UseHtml" type="QString"/>
                     </Option>
                   </config>
                 </editWidget>
@@ -9338,8 +9670,8 @@ def my_form_open(dialog, layer, feature):
                 <editWidget type="TextEdit">
                   <config>
                     <Option type="Map">
-                      <Option type="QString" value="0" name="IsMultiline"/>
-                      <Option type="QString" value="0" name="UseHtml"/>
+                      <Option value="0" name="IsMultiline" type="QString"/>
+                      <Option value="0" name="UseHtml" type="QString"/>
                     </Option>
                   </config>
                 </editWidget>
@@ -9348,26 +9680,26 @@ def my_form_open(dialog, layer, feature):
                 <editWidget type="TextEdit">
                   <config>
                     <Option type="Map">
-                      <Option type="QString" value="0" name="IsMultiline"/>
-                      <Option type="QString" value="0" name="UseHtml"/>
+                      <Option value="0" name="IsMultiline" type="QString"/>
+                      <Option value="0" name="UseHtml" type="QString"/>
                     </Option>
                   </config>
                 </editWidget>
               </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 name="" field="Name" index="0"/>
+              <alias name="" field="descriptio" index="1"/>
+              <alias name="" field="timestamp" index="2"/>
+              <alias name="" field="begin" index="3"/>
+              <alias name="" field="end" index="4"/>
+              <alias name="" field="Distance" index="5"/>
+              <alias name="" field="RouteLen" index="6"/>
+              <alias name="" field="Source" index="7"/>
+              <alias name="" field="length_m" index="8"/>
+              <alias name="" field="length_km" index="9"/>
+              <alias name="" field="org_fid" index="10"/>
+              <alias name="" field="distance" index="11"/>
             </aliases>
             <excludeAttributesWMS/>
             <excludeAttributesWFS/>
@@ -9386,52 +9718,52 @@ def my_form_open(dialog, layer, feature):
               <default field="distance" expression="" applyOnUpdate="0"/>
             </defaults>
             <constraints>
-              <constraint field="Name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="descriptio" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="timestamp" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="begin" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="end" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="Distance" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="RouteLen" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="Source" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="length_m" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="length_km" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="org_fid" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="distance" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+              <constraint unique_strength="0" notnull_strength="0" field="Name" exp_strength="0" constraints="0"/>
+              <constraint unique_strength="0" notnull_strength="0" field="descriptio" exp_strength="0" constraints="0"/>
+              <constraint unique_strength="0" notnull_strength="0" field="timestamp" exp_strength="0" constraints="0"/>
+              <constraint unique_strength="0" notnull_strength="0" field="begin" exp_strength="0" constraints="0"/>
+              <constraint unique_strength="0" notnull_strength="0" field="end" exp_strength="0" constraints="0"/>
+              <constraint unique_strength="0" notnull_strength="0" field="Distance" exp_strength="0" constraints="0"/>
+              <constraint unique_strength="0" notnull_strength="0" field="RouteLen" exp_strength="0" constraints="0"/>
+              <constraint unique_strength="0" notnull_strength="0" field="Source" exp_strength="0" constraints="0"/>
+              <constraint unique_strength="0" notnull_strength="0" field="length_m" exp_strength="0" constraints="0"/>
+              <constraint unique_strength="0" notnull_strength="0" field="length_km" exp_strength="0" constraints="0"/>
+              <constraint unique_strength="0" notnull_strength="0" field="org_fid" exp_strength="0" constraints="0"/>
+              <constraint unique_strength="0" notnull_strength="0" field="distance" exp_strength="0" constraints="0"/>
             </constraints>
             <constraintExpressions>
-              <constraint field="Name" exp="" desc=""/>
-              <constraint field="descriptio" exp="" desc=""/>
-              <constraint field="timestamp" exp="" desc=""/>
-              <constraint field="begin" exp="" desc=""/>
-              <constraint field="end" exp="" desc=""/>
-              <constraint field="Distance" exp="" desc=""/>
-              <constraint field="RouteLen" exp="" desc=""/>
-              <constraint field="Source" exp="" desc=""/>
-              <constraint field="length_m" exp="" desc=""/>
-              <constraint field="length_km" exp="" desc=""/>
-              <constraint field="org_fid" exp="" desc=""/>
-              <constraint field="distance" exp="" desc=""/>
+              <constraint field="Name" desc="" exp=""/>
+              <constraint field="descriptio" desc="" exp=""/>
+              <constraint field="timestamp" desc="" exp=""/>
+              <constraint field="begin" desc="" exp=""/>
+              <constraint field="end" desc="" exp=""/>
+              <constraint field="Distance" desc="" exp=""/>
+              <constraint field="RouteLen" desc="" exp=""/>
+              <constraint field="Source" desc="" exp=""/>
+              <constraint field="length_m" desc="" exp=""/>
+              <constraint field="length_km" desc="" exp=""/>
+              <constraint field="org_fid" desc="" exp=""/>
+              <constraint field="distance" desc="" exp=""/>
             </constraintExpressions>
             <expressionfields/>
             <attributeactions>
               <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
             </attributeactions>
-            <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;distance&quot;" sortOrder="1">
+            <attributetableconfig sortExpression="&quot;distance&quot;" sortOrder="1" actionWidgetStyle="dropDown">
               <columns>
-                <column hidden="1" type="actions" width="-1"/>
-                <column hidden="0" type="field" width="-1" name="org_fid"/>
-                <column hidden="0" type="field" width="-1" name="distance"/>
-                <column hidden="0" type="field" width="-1" name="Name"/>
-                <column hidden="0" type="field" width="-1" name="Source"/>
-                <column hidden="0" type="field" width="-1" name="RouteLen"/>
-                <column hidden="0" type="field" width="-1" name="descriptio"/>
-                <column hidden="0" type="field" width="-1" name="timestamp"/>
-                <column hidden="0" type="field" width="-1" name="begin"/>
-                <column hidden="0" type="field" width="-1" name="end"/>
-                <column hidden="0" type="field" width="-1" name="Distance"/>
-                <column hidden="0" type="field" width="-1" name="length_km"/>
-                <column hidden="0" type="field" width="-1" name="length_m"/>
+                <column width="-1" hidden="1" type="actions"/>
+                <column width="-1" hidden="0" name="org_fid" type="field"/>
+                <column width="-1" hidden="0" name="distance" type="field"/>
+                <column width="-1" hidden="0" name="Name" type="field"/>
+                <column width="-1" hidden="0" name="Source" type="field"/>
+                <column width="-1" hidden="0" name="RouteLen" type="field"/>
+                <column width="-1" hidden="0" name="descriptio" type="field"/>
+                <column width="-1" hidden="0" name="timestamp" type="field"/>
+                <column width="-1" hidden="0" name="begin" type="field"/>
+                <column width="-1" hidden="0" name="end" type="field"/>
+                <column width="-1" hidden="0" name="Distance" type="field"/>
+                <column width="-1" hidden="0" name="length_km" type="field"/>
+                <column width="-1" hidden="0" name="length_m" type="field"/>
               </columns>
             </attributetableconfig>
             <conditionalstyles>
@@ -9462,34 +9794,34 @@ def my_form_open(dialog, layer, feature):
             <featformsuppress>0</featformsuppress>
             <editorlayout>generatedlayout</editorlayout>
             <editable>
-              <field editable="1" name="Distance"/>
-              <field editable="1" name="Name"/>
-              <field editable="1" name="RouteLen"/>
-              <field editable="1" name="Source"/>
-              <field editable="1" name="begin"/>
-              <field editable="1" name="descriptio"/>
-              <field editable="1" name="distance"/>
-              <field editable="1" name="end"/>
-              <field editable="1" name="length_km"/>
-              <field editable="1" name="length_m"/>
-              <field editable="1" name="org_fid"/>
-              <field editable="1" name="quadrant"/>
-              <field editable="1" name="timestamp"/>
+              <field name="Distance" editable="1"/>
+              <field name="Name" editable="1"/>
+              <field name="RouteLen" editable="1"/>
+              <field name="Source" editable="1"/>
+              <field name="begin" editable="1"/>
+              <field name="descriptio" editable="1"/>
+              <field name="distance" editable="1"/>
+              <field name="end" editable="1"/>
+              <field name="length_km" editable="1"/>
+              <field name="length_m" editable="1"/>
+              <field name="org_fid" editable="1"/>
+              <field name="quadrant" editable="1"/>
+              <field name="timestamp" editable="1"/>
             </editable>
             <labelOnTop>
-              <field 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>
@@ -9507,177 +9839,177 @@ def my_form_open(dialog, layer, feature):
       <renderer-v2 type="nullSymbol"/>
       <labeling type="rule-based">
         <rules key="{3608a1f2-7607-4dc9-9391-a582d9904577}">
-          <rule description="Active routes" key="{6c8d4bc9-8e1a-4cc3-a813-97e2b0ad71f6}" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
+          <rule key="{6c8d4bc9-8e1a-4cc3-a813-97e2b0ad71f6}" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="Active routes">
             <settings>
-              <text-style fontItalic="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="63" blendMode="0" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="10" multilineHeight="1" textOpacity="1" fontSizeUnit="Point" textColor="255,255,255,255" namedStyle="Semibold" fontFamily="Myriad Pro" isExpression="1">
-                <text-buffer bufferOpacity="1" bufferJoinStyle="64" bufferSize="1" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255"/>
-                <background shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeType="0" shapeRadiiY="1" shapeBlendMode="0" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="0,0,0,255" shapeJoinStyle="128" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="1" shapeRadiiX="1" shapeSizeX="1" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-                <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+              <text-style fontWordSpacing="0" fontSize="10" fontItalic="0" textOpacity="1" textColor="255,255,255,255" isExpression="1" fontStrikeout="0" fontCapitals="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWeight="63" fontSizeUnit="Point" fontUnderline="0" fontFamily="Myriad Pro" useSubstitutions="0" namedStyle="Semibold" fontLetterSpacing="0" previewBkgrdColor="#ffffff" multilineHeight="1" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )">
+                <text-buffer bufferBlendMode="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="64" bufferDraw="0" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeDraw="1" shapeSizeUnit="MM" shapeOpacity="1" shapeSizeType="0" shapeSizeX="1" shapeBorderColor="0,0,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeJoinStyle="128" shapeOffsetX="0" shapeOffsetY="0" shapeType="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeRadiiX="1" shapeRotationType="0"/>
+                <shadow shadowRadius="1.5" shadowColor="0,0,0,255" shadowOpacity="0.7" shadowScale="100" shadowBlendMode="6" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" wrapChar="" placeDirectionSymbol="0" decimals="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="3" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-              <placement quadOffset="3" preserveRotation="1" geometryGenerator="" placement="6" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" priority="10" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-20" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" offsetUnits="MapUnit" placementFlags="10" geometryGeneratorEnabled="0" dist="2" offsetType="0"/>
-              <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="1" fontLimitPixelSize="0" displayAll="1" obstacleFactor="2" obstacle="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="0" maxNumLabels="2000" scaleMax="10000000"/>
+              <text-format wrapChar="" autoWrapLength="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0" decimals="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3"/>
+              <placement xOffset="0" repeatDistance="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" geometryGeneratorType="PointGeometry" quadOffset="3" centroidWhole="0" geometryGeneratorEnabled="0" distUnits="MM" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" offsetUnits="MapUnit" preserveRotation="1" offsetType="0" centroidInside="0" repeatDistanceUnits="MM" geometryGenerator="" dist="2" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20"/>
+              <rendering minFeatureSize="0" scaleMax="10000000" maxNumLabels="2000" zIndex="0" drawLabels="1" limitNumLabels="0" scaleVisibility="0" fontLimitPixelSize="0" displayAll="1" obstacleType="0" obstacleFactor="2" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="1" upsidedownLabels="0" fontMinPixelSize="3" fontMaxPixelSize="10000"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <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 type="Map" name="PositionY">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <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 type="Map" name="PredefinedPositionOrder">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="quadrant" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                    <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 type="Map" name="Rotation">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="rotation" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                    <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 type="Map" name="ShapeBorderColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <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 type="Map" name="ShapeFillColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <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 type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </dd_properties>
             </settings>
           </rule>
-          <rule active="0" description="List for legends" key="{762f5e6f-d30c-4752-b4fa-0f22ed862707}" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
-            <rule active="0" description="21KM" key="{cf2c18af-091f-4ce5-8f44-46bd4999f2ba}" filter="&quot;Source&quot; = '21KM'">
+          <rule key="{762f5e6f-d30c-4752-b4fa-0f22ed862707}" active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="List for legends">
+            <rule key="{cf2c18af-091f-4ce5-8f44-46bd4999f2ba}" active="0" filter="&quot;Source&quot; = '21KM'" description="21KM">
               <settings>
-                <text-style fontItalic="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="63" blendMode="0" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="10" multilineHeight="1" textOpacity="1" fontSizeUnit="Point" textColor="255,255,255,255" namedStyle="Semibold" fontFamily="Myriad Pro" isExpression="1">
-                  <text-buffer bufferOpacity="1" bufferJoinStyle="64" bufferSize="1" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255"/>
-                  <background shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeType="0" shapeRadiiY="1" shapeBlendMode="0" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="210,32,39,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="210,32,39,255" shapeJoinStyle="128" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="1" shapeRadiiX="1" shapeSizeX="1" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-                  <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+                <text-style fontWordSpacing="0" fontSize="10" fontItalic="0" textOpacity="1" textColor="255,255,255,255" isExpression="1" fontStrikeout="0" fontCapitals="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWeight="63" fontSizeUnit="Point" fontUnderline="0" fontFamily="Myriad Pro" useSubstitutions="0" namedStyle="Semibold" fontLetterSpacing="0" previewBkgrdColor="#ffffff" multilineHeight="1" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )">
+                  <text-buffer bufferBlendMode="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="64" bufferDraw="0" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <background shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeDraw="1" shapeSizeUnit="MM" shapeOpacity="1" shapeSizeType="0" shapeSizeX="1" shapeBorderColor="210,32,39,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="210,32,39,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeJoinStyle="128" shapeOffsetX="0" shapeOffsetY="0" shapeType="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeRadiiX="1" shapeRotationType="0"/>
+                  <shadow shadowRadius="1.5" shadowColor="0,0,0,255" shadowOpacity="0.7" shadowScale="100" shadowBlendMode="6" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                   <substitutions/>
                 </text-style>
-                <text-format rightDirectionSymbol=">" wrapChar="" placeDirectionSymbol="0" decimals="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="3" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-                <placement quadOffset="3" preserveRotation="1" geometryGenerator="" placement="6" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" priority="10" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-20" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" offsetUnits="MapUnit" placementFlags="10" geometryGeneratorEnabled="0" dist="2" offsetType="0"/>
-                <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="1" fontLimitPixelSize="0" displayAll="1" obstacleFactor="2" obstacle="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="0" maxNumLabels="2000" scaleMax="10000000"/>
+                <text-format wrapChar="" autoWrapLength="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0" decimals="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3"/>
+                <placement xOffset="0" repeatDistance="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" geometryGeneratorType="PointGeometry" quadOffset="3" centroidWhole="0" geometryGeneratorEnabled="0" distUnits="MM" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" offsetUnits="MapUnit" preserveRotation="1" offsetType="0" centroidInside="0" repeatDistanceUnits="MM" geometryGenerator="" dist="2" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20"/>
+                <rendering minFeatureSize="0" scaleMax="10000000" maxNumLabels="2000" zIndex="0" drawLabels="1" limitNumLabels="0" scaleVisibility="0" fontLimitPixelSize="0" displayAll="1" obstacleType="0" obstacleFactor="2" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="1" upsidedownLabels="0" fontMinPixelSize="3" fontMaxPixelSize="10000"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="int" value="1" name="type"/>
-                        <Option type="QString" value="" name="val"/>
+                    <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 type="Map" name="PositionY">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="int" value="1" name="type"/>
-                        <Option type="QString" value="" name="val"/>
+                      <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 type="Map" name="PredefinedPositionOrder">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="quadrant" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                      <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 type="Map" name="Rotation">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="QString" value="rotation" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                      <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 type="QString" value="collection" name="type"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </dd_properties>
               </settings>
             </rule>
-            <rule active="0" description="10KM" key="{85ac541e-ff73-4c62-9c9c-f90872839ec6}" filter="&quot;Source&quot; = '10KM'">
+            <rule key="{85ac541e-ff73-4c62-9c9c-f90872839ec6}" active="0" filter="&quot;Source&quot; = '10KM'" description="10KM">
               <settings>
-                <text-style fontItalic="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="63" blendMode="0" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="10" multilineHeight="1" textOpacity="1" fontSizeUnit="Point" textColor="255,255,255,255" namedStyle="Semibold" fontFamily="Myriad Pro" isExpression="1">
-                  <text-buffer bufferOpacity="1" bufferJoinStyle="64" bufferSize="1" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255"/>
-                  <background shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeType="0" shapeRadiiY="1" shapeBlendMode="0" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="103,34,144,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="103,34,144,255" shapeJoinStyle="128" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="1" shapeRadiiX="1" shapeSizeX="1" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-                  <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+                <text-style fontWordSpacing="0" fontSize="10" fontItalic="0" textOpacity="1" textColor="255,255,255,255" isExpression="1" fontStrikeout="0" fontCapitals="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWeight="63" fontSizeUnit="Point" fontUnderline="0" fontFamily="Myriad Pro" useSubstitutions="0" namedStyle="Semibold" fontLetterSpacing="0" previewBkgrdColor="#ffffff" multilineHeight="1" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )">
+                  <text-buffer bufferBlendMode="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="64" bufferDraw="0" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <background shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeDraw="1" shapeSizeUnit="MM" shapeOpacity="1" shapeSizeType="0" shapeSizeX="1" shapeBorderColor="103,34,144,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="103,34,144,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeJoinStyle="128" shapeOffsetX="0" shapeOffsetY="0" shapeType="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeRadiiX="1" shapeRotationType="0"/>
+                  <shadow shadowRadius="1.5" shadowColor="0,0,0,255" shadowOpacity="0.7" shadowScale="100" shadowBlendMode="6" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                   <substitutions/>
                 </text-style>
-                <text-format rightDirectionSymbol=">" wrapChar="" placeDirectionSymbol="0" decimals="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="3" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-                <placement quadOffset="4" preserveRotation="1" geometryGenerator="" placement="6" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" priority="10" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-20" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" offsetUnits="MapUnit" placementFlags="10" geometryGeneratorEnabled="0" dist="2" offsetType="0"/>
-                <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="1" fontLimitPixelSize="0" displayAll="1" obstacleFactor="2" obstacle="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="0" maxNumLabels="2000" scaleMax="10000000"/>
+                <text-format wrapChar="" autoWrapLength="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0" decimals="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3"/>
+                <placement xOffset="0" repeatDistance="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" geometryGeneratorType="PointGeometry" quadOffset="4" centroidWhole="0" geometryGeneratorEnabled="0" distUnits="MM" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" offsetUnits="MapUnit" preserveRotation="1" offsetType="0" centroidInside="0" repeatDistanceUnits="MM" geometryGenerator="" dist="2" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20"/>
+                <rendering minFeatureSize="0" scaleMax="10000000" maxNumLabels="2000" zIndex="0" drawLabels="1" limitNumLabels="0" scaleVisibility="0" fontLimitPixelSize="0" displayAll="1" obstacleType="0" obstacleFactor="2" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="1" upsidedownLabels="0" fontMinPixelSize="3" fontMaxPixelSize="10000"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="int" value="1" name="type"/>
-                        <Option type="QString" value="" name="val"/>
+                    <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 type="Map" name="PositionY">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="int" value="1" name="type"/>
-                        <Option type="QString" value="" name="val"/>
+                      <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 type="Map" name="PredefinedPositionOrder">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="quadrant" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                      <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 type="Map" name="Rotation">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="QString" value="rotation" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                      <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 type="QString" value="collection" name="type"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </dd_properties>
               </settings>
             </rule>
-            <rule active="0" description="5KM" key="{648c7f2c-5087-45fa-b34c-09d50a7ddedb}" filter="&quot;Source&quot; = '5KM'">
+            <rule key="{648c7f2c-5087-45fa-b34c-09d50a7ddedb}" active="0" filter="&quot;Source&quot; = '5KM'" description="5KM">
               <settings>
-                <text-style fontItalic="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="63" blendMode="0" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="10" multilineHeight="1" textOpacity="1" fontSizeUnit="Point" textColor="255,255,255,255" namedStyle="Semibold" fontFamily="Myriad Pro" isExpression="1">
-                  <text-buffer bufferOpacity="1" bufferJoinStyle="64" bufferSize="1" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255"/>
-                  <background shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeType="0" shapeRadiiY="1" shapeBlendMode="0" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="145,211,55,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="145,211,55,255" shapeJoinStyle="128" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="1" shapeRadiiX="1" shapeSizeX="1" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-                  <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+                <text-style fontWordSpacing="0" fontSize="10" fontItalic="0" textOpacity="1" textColor="255,255,255,255" isExpression="1" fontStrikeout="0" fontCapitals="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWeight="63" fontSizeUnit="Point" fontUnderline="0" fontFamily="Myriad Pro" useSubstitutions="0" namedStyle="Semibold" fontLetterSpacing="0" previewBkgrdColor="#ffffff" multilineHeight="1" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )">
+                  <text-buffer bufferBlendMode="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="64" bufferDraw="0" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <background shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeDraw="1" shapeSizeUnit="MM" shapeOpacity="1" shapeSizeType="0" shapeSizeX="1" shapeBorderColor="145,211,55,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="145,211,55,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeJoinStyle="128" shapeOffsetX="0" shapeOffsetY="0" shapeType="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeRadiiX="1" shapeRotationType="0"/>
+                  <shadow shadowRadius="1.5" shadowColor="0,0,0,255" shadowOpacity="0.7" shadowScale="100" shadowBlendMode="6" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                   <substitutions/>
                 </text-style>
-                <text-format rightDirectionSymbol=">" wrapChar="" placeDirectionSymbol="0" decimals="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="3" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-                <placement quadOffset="4" preserveRotation="1" geometryGenerator="" placement="6" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" priority="10" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-20" maxCurvedCharAngleIn="20" repeatDistanceUnits="MM" offsetUnits="MapUnit" placementFlags="10" geometryGeneratorEnabled="0" dist="2" offsetType="0"/>
-                <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="1" fontLimitPixelSize="0" displayAll="1" obstacleFactor="2" obstacle="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="0" maxNumLabels="2000" scaleMax="10000000"/>
+                <text-format wrapChar="" autoWrapLength="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0" decimals="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3"/>
+                <placement xOffset="0" repeatDistance="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" geometryGeneratorType="PointGeometry" quadOffset="4" centroidWhole="0" geometryGeneratorEnabled="0" distUnits="MM" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" offsetUnits="MapUnit" preserveRotation="1" offsetType="0" centroidInside="0" repeatDistanceUnits="MM" geometryGenerator="" dist="2" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-20" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20"/>
+                <rendering minFeatureSize="0" scaleMax="10000000" maxNumLabels="2000" zIndex="0" drawLabels="1" limitNumLabels="0" scaleVisibility="0" fontLimitPixelSize="0" displayAll="1" obstacleType="0" obstacleFactor="2" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="1" upsidedownLabels="0" fontMinPixelSize="3" fontMaxPixelSize="10000"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="int" value="1" name="type"/>
-                        <Option type="QString" value="" name="val"/>
+                    <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 type="Map" name="PositionY">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="int" value="1" name="type"/>
-                        <Option type="QString" value="" name="val"/>
+                      <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 type="Map" name="PredefinedPositionOrder">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="quadrant" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                      <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 type="Map" name="Rotation">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="QString" value="rotation" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                      <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 type="QString" value="collection" name="type"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </dd_properties>
               </settings>
@@ -9695,21 +10027,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundColor="#ffffff" backgroundAlpha="255" labelPlacementMethod="XHeight" lineSizeType="MM" minimumSize="0" diagramOrientation="Up" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" barWidth="5" penWidth="0" penColor="#000000" width="15" scaleDependency="Area" minScaleDenominator="100000" height="15" scaleBasedVisibility="0" rotationOffset="270" enabled="0">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" color="#000000"/>
+        <DiagramCategory minimumSize="0" penAlpha="255" labelPlacementMethod="XHeight" width="15" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penWidth="0" barWidth="5" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" minScaleDenominator="100000" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" penColor="#000000" enabled="0" height="15" lineSizeType="MM" diagramOrientation="Up">
+          <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="0" zIndex="0" obstacle="0" linePlacementFlags="2" showAll="1">
+      <DiagramLayerSettings linePlacementFlags="2" dist="0" obstacle="0" showAll="1" priority="0" placement="0" zIndex="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option value="" name="name" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -9718,8 +10050,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -9728,8 +10060,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -9738,8 +10070,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -9748,8 +10080,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -9758,8 +10090,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -9768,8 +10100,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -9778,8 +10110,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -9788,8 +10120,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -9798,8 +10130,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -9808,8 +10140,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -9818,8 +10150,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -9828,26 +10160,26 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </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 name="" field="Name" index="0"/>
+        <alias name="" field="descriptio" index="1"/>
+        <alias name="" field="timestamp" index="2"/>
+        <alias name="" field="begin" index="3"/>
+        <alias name="" field="end" index="4"/>
+        <alias name="" field="Distance" index="5"/>
+        <alias name="" field="RouteLen" index="6"/>
+        <alias name="" field="Source" index="7"/>
+        <alias name="" field="length_m" index="8"/>
+        <alias name="" field="length_km" index="9"/>
+        <alias name="" field="org_fid" index="10"/>
+        <alias name="" field="distance" index="11"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -9866,18 +10198,18 @@ def my_form_open(dialog, layer, feature):
         <default field="distance" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="Name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="descriptio" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="timestamp" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="begin" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="end" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Distance" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="RouteLen" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Source" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="length_m" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="length_km" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="org_fid" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="distance" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="Name" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="descriptio" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="timestamp" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="begin" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="end" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="Distance" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="RouteLen" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="Source" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="length_m" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="length_km" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="org_fid" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="distance" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="Name" exp="" desc=""/>
@@ -9897,21 +10229,21 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;distance&quot;" sortOrder="1">
+      <attributetableconfig sortExpression="&quot;distance&quot;" sortOrder="1" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="org_fid"/>
-          <column hidden="0" type="field" width="-1" name="distance"/>
-          <column hidden="0" type="field" width="-1" name="Name"/>
-          <column hidden="0" type="field" width="-1" name="Source"/>
-          <column hidden="0" type="field" width="-1" name="RouteLen"/>
-          <column hidden="0" type="field" width="-1" name="descriptio"/>
-          <column hidden="0" type="field" width="-1" name="timestamp"/>
-          <column hidden="0" type="field" width="-1" name="begin"/>
-          <column hidden="0" type="field" width="-1" name="end"/>
-          <column hidden="0" type="field" width="-1" name="Distance"/>
-          <column hidden="0" type="field" width="-1" name="length_km"/>
-          <column hidden="0" type="field" width="-1" name="length_m"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="org_fid" type="field"/>
+          <column width="-1" hidden="0" name="distance" type="field"/>
+          <column width="-1" hidden="0" name="Name" type="field"/>
+          <column width="-1" hidden="0" name="Source" type="field"/>
+          <column width="-1" hidden="0" name="RouteLen" type="field"/>
+          <column width="-1" hidden="0" name="descriptio" type="field"/>
+          <column width="-1" hidden="0" name="timestamp" type="field"/>
+          <column width="-1" hidden="0" name="begin" type="field"/>
+          <column width="-1" hidden="0" name="end" type="field"/>
+          <column width="-1" hidden="0" name="Distance" type="field"/>
+          <column width="-1" hidden="0" name="length_km" type="field"/>
+          <column width="-1" hidden="0" name="length_m" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9942,40 +10274,40 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Source"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="end"/>
-        <field editable="1" name="length_km"/>
-        <field editable="1" name="length_m"/>
-        <field editable="1" name="org_fid"/>
-        <field editable="1" name="quadrant"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="begin" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="distance" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="length_km" editable="1"/>
+        <field name="length_m" editable="1"/>
+        <field name="org_fid" editable="1"/>
+        <field name="quadrant" editable="1"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
-        <field 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 simplifyDrawingHints="1" readOnly="0" simplifyAlgorithm="0" autoRefreshTime="0" geometry="Polygon" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" type="vector" simplifyLocal="1" refreshOnNotifyMessage="" minScale="1e+08" refreshOnNotifyEnabled="0" labelsEnabled="0" wkbType="MultiPolygon">
+    <maplayer wkbType="MultiPolygon" readOnly="0" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" simplifyDrawingHints="1" simplifyLocal="1" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" autoRefreshTime="0" minScale="1e+08" geometry="Polygon" simplifyDrawingTol="1" simplifyMaxScale="1" autoRefreshEnabled="0" styleCategories="AllStyleCategories" type="vector" maxScale="0">
       <extent>
         <xmin>18.40435736428151614</xmin>
         <ymin>-33.90613600950420903</ymin>
@@ -10039,26 +10371,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" enableorderby="0" symbollevels="0" forceraster="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol type="fill" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="114,155,111,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
+          <symbol name="0" alpha="1" type="fill" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" pass="0" locked="0" 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"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="35,35,35,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0.26"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10073,9 +10405,9 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
-          <Option type="QString" value=""/>
+          <Option value="" type="QString"/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
@@ -10103,9 +10435,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 name="" field="id" index="0"/>
+        <alias name="" field="area" index="1"/>
+        <alias name="" field="rotation" index="2"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -10115,9 +10447,9 @@ def my_form_open(dialog, layer, feature):
         <default field="rotation" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="area" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="rotation" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="area" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="rotation" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -10128,12 +10460,12 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;rotation&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;rotation&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="0" type="field" width="-1" name="area"/>
-          <column hidden="0" type="field" width="-1" name="rotation"/>
-          <column hidden="1" type="actions" width="-1"/>
+          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="0" name="area" type="field"/>
+          <column width="-1" hidden="0" name="rotation" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10153,7 +10485,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="0" readOnly="0" simplifyAlgorithm="0" autoRefreshTime="0" geometry="Point" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" type="vector" simplifyLocal="1" refreshOnNotifyMessage="" minScale="1e+08" refreshOnNotifyEnabled="0" labelsEnabled="0" wkbType="Point">
+    <maplayer wkbType="Point" readOnly="0" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" simplifyDrawingHints="0" simplifyLocal="1" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" autoRefreshTime="0" minScale="1e+08" geometry="Point" simplifyDrawingTol="1" simplifyMaxScale="1" autoRefreshEnabled="0" styleCategories="AllStyleCategories" type="vector" maxScale="0">
       <extent>
         <xmin>18.37527697005977245</xmin>
         <ymin>-33.94584879231483399</ymin>
@@ -10210,7 +10542,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" miny="0" crs="" dimensions="2" maxy="0" maxz="0" maxx="0"/>
+          <spatial maxx="0" maxz="0" minz="0" minx="0" maxy="0" crs="" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -10234,47 +10566,47 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="RuleRenderer" enableorderby="0" symbollevels="0" forceraster="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
         <rules key="{01115dc1-cc6e-4980-a968-7ef94a3b9df6}">
-          <rule label="All distances" checkstate="0" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}" symbol="0"/>
+          <rule key="{e9652330-031e-4b93-b5b4-4caae12a21f9}" symbol="0" checkstate="0" label="All distances"/>
         </rules>
         <symbols>
-          <symbol type="marker" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer locked="1" class="SimpleMarker" enabled="1" pass="0">
-              <prop v="0" k="angle"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,0" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="0.5" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol name="0" alpha="1" type="marker" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" pass="0" locked="1" class="SimpleMarker">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="0,0,0,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="circle"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="35,35,35,0"/>
+              <prop k="outline_style" v="no"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="0.5"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="fillColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="fillColor" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="size" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10298,21 +10630,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundColor="#ffffff" backgroundAlpha="255" labelPlacementMethod="XHeight" lineSizeType="MM" minimumSize="0" diagramOrientation="Up" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" barWidth="5" penWidth="0" penColor="#000000" width="15" scaleDependency="Area" minScaleDenominator="0" height="15" scaleBasedVisibility="0" rotationOffset="270" enabled="0">
-          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" color="#000000"/>
+        <DiagramCategory minimumSize="0" penAlpha="255" labelPlacementMethod="XHeight" width="15" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penWidth="0" barWidth="5" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" minScaleDenominator="0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" penColor="#000000" enabled="0" height="15" lineSizeType="MM" diagramOrientation="Up">
+          <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="0" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
+      <DiagramLayerSettings linePlacementFlags="18" dist="0" obstacle="0" showAll="1" priority="0" placement="0" zIndex="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option value="" name="name" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -10342,8 +10674,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -10359,8 +10691,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -10369,8 +10701,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -10419,28 +10751,28 @@ 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="RouteLen" index="5" name=""/>
-        <alias field="Source" index="6" name=""/>
-        <alias field="length_m" index="7" name=""/>
-        <alias field="length_km" index="8" name=""/>
-        <alias field="org_fid" index="9" name=""/>
-        <alias field="distance" index="10" name=""/>
-        <alias field="first_runn" index="11" name=""/>
-        <alias field="last_runne" index="12" name=""/>
+        <alias name="" field="Name" index="0"/>
+        <alias name="" field="descriptio" index="1"/>
+        <alias name="" field="timestamp" index="2"/>
+        <alias name="" field="begin" index="3"/>
+        <alias name="" field="end" index="4"/>
+        <alias name="" field="RouteLen" index="5"/>
+        <alias name="" field="Source" index="6"/>
+        <alias name="" field="length_m" index="7"/>
+        <alias name="" field="length_km" index="8"/>
+        <alias name="" field="org_fid" index="9"/>
+        <alias name="" field="distance" index="10"/>
+        <alias name="" field="first_runn" index="11"/>
+        <alias name="" field="last_runne" index="12"/>
       </aliases>
       <excludeAttributesWMS>
-        <attribute>Source</attribute>
         <attribute>begin</attribute>
+        <attribute>Source</attribute>
         <attribute>RouteLen</attribute>
       </excludeAttributesWMS>
       <excludeAttributesWFS>
-        <attribute>Source</attribute>
         <attribute>begin</attribute>
+        <attribute>Source</attribute>
         <attribute>RouteLen</attribute>
       </excludeAttributesWFS>
       <defaults>
@@ -10459,19 +10791,19 @@ def my_form_open(dialog, layer, feature):
         <default field="last_runne" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="Name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="descriptio" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="timestamp" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="begin" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="end" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="RouteLen" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Source" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="length_m" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="length_km" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="org_fid" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="distance" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="first_runn" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="last_runne" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="Name" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="descriptio" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="timestamp" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="begin" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="end" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="RouteLen" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="Source" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="length_m" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="length_km" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="org_fid" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="distance" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="first_runn" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="last_runne" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="Name" exp="" desc=""/>
@@ -10492,22 +10824,22 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;first_runn&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;first_runn&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="179" name="begin"/>
-          <column hidden="0" type="field" width="-1" name="RouteLen"/>
-          <column hidden="0" type="field" width="-1" name="Source"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="Name"/>
-          <column hidden="0" type="field" width="-1" name="length_m"/>
-          <column hidden="0" type="field" width="-1" name="length_km"/>
-          <column hidden="0" type="field" width="-1" name="org_fid"/>
-          <column hidden="0" type="field" width="-1" name="first_runn"/>
-          <column hidden="0" type="field" width="-1" name="last_runne"/>
-          <column hidden="0" type="field" width="-1" name="descriptio"/>
-          <column hidden="0" type="field" width="-1" name="timestamp"/>
-          <column hidden="0" type="field" width="-1" name="end"/>
-          <column hidden="0" type="field" width="-1" name="distance"/>
+          <column width="179" hidden="0" name="begin" type="field"/>
+          <column width="-1" hidden="0" name="RouteLen" type="field"/>
+          <column width="-1" hidden="0" name="Source" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="Name" type="field"/>
+          <column width="-1" hidden="0" name="length_m" type="field"/>
+          <column width="-1" hidden="0" name="length_km" type="field"/>
+          <column width="-1" hidden="0" name="org_fid" type="field"/>
+          <column width="-1" hidden="0" name="first_runn" type="field"/>
+          <column width="-1" hidden="0" name="last_runne" type="field"/>
+          <column width="-1" hidden="0" name="descriptio" type="field"/>
+          <column width="-1" hidden="0" name="timestamp" type="field"/>
+          <column width="-1" hidden="0" name="end" type="field"/>
+          <column width="-1" hidden="0" name="distance" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10538,64 +10870,64 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Source"/>
-        <field editable="0" name="auxiliary_storage_labeling_positionx"/>
-        <field editable="0" name="auxiliary_storage_labeling_positiony"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="display"/>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="distance_1"/>
-        <field editable="1" name="end"/>
-        <field editable="1" name="first_run"/>
-        <field editable="1" name="first_runn"/>
-        <field editable="1" name="first_runner"/>
-        <field editable="1" name="first_runner_s"/>
-        <field editable="0" name="last_run"/>
-        <field editable="1" name="last_runn"/>
-        <field editable="1" name="last_runne"/>
-        <field editable="1" name="last_runner"/>
-        <field editable="1" name="last_runner_s"/>
-        <field editable="1" name="length_km"/>
-        <field editable="1" name="length_m"/>
-        <field editable="1" name="org_fid"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="auxiliary_storage_labeling_positionx" editable="0"/>
+        <field name="auxiliary_storage_labeling_positiony" editable="0"/>
+        <field name="begin" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="display" editable="1"/>
+        <field name="distance" editable="1"/>
+        <field name="distance_1" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="first_run" editable="1"/>
+        <field name="first_runn" editable="1"/>
+        <field name="first_runner" editable="1"/>
+        <field name="first_runner_s" editable="1"/>
+        <field name="last_run" editable="0"/>
+        <field name="last_runn" editable="1"/>
+        <field name="last_runne" editable="1"/>
+        <field name="last_runner" editable="1"/>
+        <field name="last_runner_s" editable="1"/>
+        <field name="length_km" editable="1"/>
+        <field name="length_m" editable="1"/>
+        <field name="org_fid" editable="1"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
-        <field 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_runne"/>
-        <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 simplifyDrawingHints="1" readOnly="0" simplifyAlgorithm="0" autoRefreshTime="0" geometry="Line" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" type="vector" simplifyLocal="1" refreshOnNotifyMessage="" minScale="1e+08" refreshOnNotifyEnabled="0" labelsEnabled="0" wkbType="MultiLineString">
+    <maplayer wkbType="MultiLineString" readOnly="0" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" simplifyDrawingHints="1" simplifyLocal="1" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" autoRefreshTime="0" minScale="1e+08" geometry="Line" simplifyDrawingTol="1" simplifyMaxScale="1" autoRefreshEnabled="0" styleCategories="AllStyleCategories" type="vector" maxScale="0">
       <extent>
         <xmin>18.40189262273444371</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -10659,127 +10991,127 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="RuleRenderer" enableorderby="0" symbollevels="0" forceraster="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule label="Car" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" symbol="0" filter="&quot;type&quot; IS 'car'"/>
-          <rule label="Walking" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" symbol="1" filter="&quot;type&quot; IS 'walk'"/>
+          <rule key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" symbol="0" filter="&quot;type&quot; IS 'car'" label="Car"/>
+          <rule key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" symbol="1" filter="&quot;type&quot; IS 'walk'" label="Walking"/>
         </rules>
         <symbols>
-          <symbol type="line" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="123,211,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="1" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol name="0" alpha="1" type="line" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" pass="0" locked="0" class="SimpleLine">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="123,211,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="1"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="1" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-              <prop v="flat" k="capstyle"/>
-              <prop v="4;1;1;1" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="103,34,144,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="1.25" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol name="1" alpha="1" type="line" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" pass="0" locked="0" class="SimpleLine">
+              <prop k="capstyle" v="flat"/>
+              <prop k="customdash" v="4;1;1;1"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="103,34,144,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="1.25"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="1"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="lastvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer enabled="1" pass="0" locked="0" 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"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="lastvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@1@1" clip_to_extent="1" force_rhr="0">
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="103,34,144,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="5" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@1@1" alpha="1" type="marker" clip_to_extent="1" force_rhr="0">
+                <layer enabled="1" pass="0" locked="0" class="FilledMarker">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="103,34,144,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="5"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option value="" name="name" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@1@1@0" clip_to_extent="1" force_rhr="0">
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="103,34,144,255" k="color"/>
-                      <prop v="miter" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="35,35,35,255" k="outline_color"/>
-                      <prop v="no" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol name="@@1@1@0" alpha="1" type="fill" clip_to_extent="1" force_rhr="0">
+                    <layer enabled="1" pass="0" locked="0" 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"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="35,35,35,255"/>
+                      <prop k="outline_style" v="no"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option value="" name="name" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option value="collection" name="type" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -10800,21 +11132,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundColor="#ffffff" backgroundAlpha="255" labelPlacementMethod="XHeight" lineSizeType="MM" minimumSize="0" diagramOrientation="Up" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" barWidth="5" penWidth="0" penColor="#000000" width="15" scaleDependency="Area" minScaleDenominator="0" height="15" scaleBasedVisibility="0" rotationOffset="270" enabled="0">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0" style="0"/>
-          <attribute label="" field="" color="#000000"/>
+        <DiagramCategory minimumSize="0" penAlpha="255" labelPlacementMethod="XHeight" width="15" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penWidth="0" barWidth="5" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" minScaleDenominator="0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" penColor="#000000" enabled="0" height="15" lineSizeType="MM" diagramOrientation="Up">
+          <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="2" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
+      <DiagramLayerSettings linePlacementFlags="18" dist="0" obstacle="0" showAll="1" priority="0" placement="2" zIndex="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option value="" name="name" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -10835,8 +11167,8 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
+        <alias name="" field="id" index="0"/>
+        <alias name="" field="type" index="1"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -10845,8 +11177,8 @@ def my_form_open(dialog, layer, feature):
         <default field="type" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="type" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -10856,11 +11188,11 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="type"/>
+          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="type" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10891,18 +11223,18 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field 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 simplifyDrawingHints="0" readOnly="0" simplifyAlgorithm="0" autoRefreshTime="0" geometry="Point" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" type="vector" simplifyLocal="1" refreshOnNotifyMessage="" minScale="1e+08" refreshOnNotifyEnabled="0" labelsEnabled="1" wkbType="Point">
+    <maplayer wkbType="Point" readOnly="0" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" simplifyDrawingHints="0" simplifyLocal="1" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" autoRefreshTime="0" minScale="1e+08" geometry="Point" simplifyDrawingTol="1" simplifyMaxScale="1" autoRefreshEnabled="0" styleCategories="AllStyleCategories" type="vector" maxScale="0">
       <extent>
         <xmin>18.4043294703937228</xmin>
         <ymin>-33.90631712958812471</ymin>
@@ -10969,20 +11301,20 @@ def my_form_open(dialog, layer, feature):
       <renderer-v2 type="nullSymbol"/>
       <labeling type="simple">
         <settings>
-          <text-style fontItalic="0" fieldName="label" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="63" blendMode="0" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="15" multilineHeight="1" textOpacity="1" fontSizeUnit="Point" textColor="0,0,0,255" namedStyle="Semibold" fontFamily="Myriad Pro" isExpression="0">
-            <text-buffer bufferOpacity="1" bufferJoinStyle="128" bufferSize="1" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="1" bufferColor="255,255,255,255"/>
-            <background shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeType="0" shapeRadiiY="0" shapeBlendMode="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="0" shapeRadiiX="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-            <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+          <text-style fontWordSpacing="0" fontSize="15" fontItalic="0" textOpacity="1" textColor="0,0,0,255" isExpression="0" fontStrikeout="0" fontCapitals="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWeight="63" fontSizeUnit="Point" fontUnderline="0" fontFamily="Myriad Pro" useSubstitutions="0" namedStyle="Semibold" fontLetterSpacing="0" previewBkgrdColor="#ffffff" multilineHeight="1" blendMode="0" fieldName="label">
+            <text-buffer bufferBlendMode="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128" bufferDraw="1" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeDraw="0" shapeSizeUnit="MM" shapeOpacity="1" shapeSizeType="0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeJoinStyle="64" shapeOffsetX="0" shapeOffsetY="0" shapeType="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeRadiiX="0" shapeRotationType="0"/>
+            <shadow shadowRadius="1.5" shadowColor="0,0,0,255" shadowOpacity="0.7" shadowScale="100" shadowBlendMode="6" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
             <substitutions/>
           </text-style>
-          <text-format rightDirectionSymbol=">" wrapChar="" placeDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="3" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-          <placement quadOffset="4" preserveRotation="1" geometryGenerator="" placement="0" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" priority="5" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-25" maxCurvedCharAngleIn="25" repeatDistanceUnits="MM" offsetUnits="MM" placementFlags="10" geometryGeneratorEnabled="0" dist="0" offsetType="0"/>
-          <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="0" fontLimitPixelSize="0" displayAll="0" obstacleFactor="1" obstacle="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="0" maxNumLabels="2000" scaleMax="0"/>
+          <text-format wrapChar="" autoWrapLength="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0" decimals="3" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3"/>
+          <placement xOffset="0" repeatDistance="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" priority="5" geometryGeneratorType="PointGeometry" quadOffset="4" centroidWhole="0" geometryGeneratorEnabled="0" distUnits="MM" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" offsetUnits="MM" preserveRotation="1" offsetType="0" centroidInside="0" repeatDistanceUnits="MM" geometryGenerator="" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" placement="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25"/>
+          <rendering minFeatureSize="0" scaleMax="0" maxNumLabels="2000" zIndex="0" drawLabels="1" limitNumLabels="0" scaleVisibility="0" fontLimitPixelSize="0" displayAll="0" obstacleType="0" obstacleFactor="1" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="0" upsidedownLabels="0" fontMinPixelSize="3" fontMaxPixelSize="10000"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dd_properties>
         </settings>
@@ -10996,21 +11328,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundColor="#ffffff" backgroundAlpha="255" labelPlacementMethod="XHeight" lineSizeType="MM" minimumSize="0" diagramOrientation="Up" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" barWidth="5" penWidth="0" penColor="#000000" width="15" scaleDependency="Area" minScaleDenominator="0" height="15" scaleBasedVisibility="0" rotationOffset="270" enabled="0">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0" style="0"/>
-          <attribute label="" field="" color="#000000"/>
+        <DiagramCategory minimumSize="0" penAlpha="255" labelPlacementMethod="XHeight" width="15" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penWidth="0" barWidth="5" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" minScaleDenominator="0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" penColor="#000000" enabled="0" height="15" lineSizeType="MM" diagramOrientation="Up">
+          <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="0" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
+      <DiagramLayerSettings linePlacementFlags="18" dist="0" obstacle="0" showAll="1" priority="0" placement="0" zIndex="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option value="" name="name" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -11031,8 +11363,8 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="label" index="1" name=""/>
+        <alias name="" field="id" index="0"/>
+        <alias name="" field="label" index="1"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -11041,8 +11373,8 @@ def my_form_open(dialog, layer, feature):
         <default field="label" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="label" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -11052,11 +11384,11 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="0" type="field" width="-1" name="label"/>
-          <column hidden="1" type="actions" width="-1"/>
+          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="0" name="label" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11087,18 +11419,18 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="label"/>
+        <field name="id" editable="1"/>
+        <field name="label" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="label"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="label" labelOnTop="0"/>
       </labelOnTop>
       <widgets/>
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="1" readOnly="0" simplifyAlgorithm="0" autoRefreshTime="0" geometry="Polygon" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" type="vector" simplifyLocal="1" refreshOnNotifyMessage="" minScale="1e+08" refreshOnNotifyEnabled="0" labelsEnabled="1" wkbType="MultiPolygon">
+    <maplayer wkbType="MultiPolygon" readOnly="0" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" simplifyDrawingHints="1" simplifyLocal="1" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" autoRefreshTime="0" minScale="1e+08" geometry="Polygon" simplifyDrawingTol="1" simplifyMaxScale="1" autoRefreshEnabled="0" styleCategories="AllStyleCategories" type="vector" maxScale="0">
       <extent>
         <xmin>18.37549461152003971</xmin>
         <ymin>-33.94162201868364548</ymin>
@@ -11155,7 +11487,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" miny="0" crs="" dimensions="2" maxy="0" maxz="0" maxx="0"/>
+          <spatial maxx="0" maxz="0" minz="0" minx="0" maxy="0" crs="" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -11182,22 +11514,22 @@ def my_form_open(dialog, layer, feature):
       <renderer-v2 type="nullSymbol"/>
       <labeling type="rule-based">
         <rules key="{5dc8b36b-2058-4678-ad09-9a66ad011982}">
-          <rule description="Show water tables" key="{6ef417ce-9c3a-42d0-a533-3a83b1a257ea}" filter="CASE&#xa;WHEN attribute( @atlas_feature , 'RouteLen' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'RouteLen' ) ) THEN 1&#xa;ELSE 0&#xa;END">
+          <rule key="{6ef417ce-9c3a-42d0-a533-3a83b1a257ea}" filter="CASE&#xa;WHEN attribute( @atlas_feature , 'RouteLen' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'RouteLen' ) ) THEN 1&#xa;ELSE 0&#xa;END" description="Show water tables">
             <settings>
-              <text-style fontItalic="0" fieldName="label" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="75" blendMode="0" fontUnderline="0" fontCapitals="0" fontWordSpacing="0" fontSize="8" multilineHeight="1" textOpacity="0.9" fontSizeUnit="Point" textColor="31,120,180,255" namedStyle="Bold" fontFamily="Myriad Pro" isExpression="0">
-                <text-buffer bufferOpacity="0.4" bufferJoinStyle="128" bufferSize="0.75" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255"/>
-                <background shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.6" shapeSizeType="0" shapeRadiiY="0.5" shapeBlendMode="0" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.3" shapeBorderColor="31,120,206,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,204" shapeJoinStyle="128" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="-0.15" shapeBorderWidth="0.75" shapeRadiiX="0.5" shapeSizeX="0.75" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-                <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+              <text-style fontWordSpacing="0" fontSize="8" fontItalic="0" textOpacity="0.9" textColor="31,120,180,255" isExpression="0" fontStrikeout="0" fontCapitals="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWeight="75" fontSizeUnit="Point" fontUnderline="0" fontFamily="Myriad Pro" useSubstitutions="0" namedStyle="Bold" fontLetterSpacing="0" previewBkgrdColor="#ffffff" multilineHeight="1" blendMode="0" fieldName="label">
+                <text-buffer bufferBlendMode="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="128" bufferDraw="0" bufferOpacity="0.4" bufferSize="0.75" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBorderWidth="0.75" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0.5" shapeDraw="1" shapeSizeUnit="MM" shapeOpacity="0.6" shapeSizeType="0" shapeSizeX="0.75" shapeBorderColor="31,120,206,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.3" shapeFillColor="255,255,255,204" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeJoinStyle="128" shapeOffsetX="0" shapeOffsetY="-0.15" shapeType="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeRadiiX="0.5" shapeRotationType="0"/>
+                <shadow shadowRadius="1.5" shadowColor="0,0,0,255" shadowOpacity="0.7" shadowScale="100" shadowBlendMode="6" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" wrapChar="" placeDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" multilineAlign="1" plussign="0" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-              <placement quadOffset="1" preserveRotation="1" geometryGenerator="" placement="0" centroidWhole="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" distUnits="MM" rotationAngle="0" xOffset="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" priority="5" geometryGeneratorType="PointGeometry" repeatDistance="0" maxCurvedCharAngleOut="-25" maxCurvedCharAngleIn="25" repeatDistanceUnits="MM" offsetUnits="MapUnit" placementFlags="10" geometryGeneratorEnabled="0" dist="0" offsetType="0"/>
-              <rendering limitNumLabels="0" scaleVisibility="0" obstacleType="0" labelPerPart="0" scaleMin="1" fontLimitPixelSize="0" displayAll="0" obstacleFactor="0.76" obstacle="1" mergeLines="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" upsidedownLabels="0" fontMaxPixelSize="10000" zIndex="5" maxNumLabels="6" scaleMax="10000000"/>
+              <text-format wrapChar="" autoWrapLength="0" placeDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0" decimals="3" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="1"/>
+              <placement xOffset="1" repeatDistance="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" priority="5" geometryGeneratorType="PointGeometry" quadOffset="1" centroidWhole="1" geometryGeneratorEnabled="0" distUnits="MM" yOffset="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" offsetUnits="MapUnit" preserveRotation="1" offsetType="0" centroidInside="0" repeatDistanceUnits="MM" geometryGenerator="" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" placement="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25"/>
+              <rendering minFeatureSize="0" scaleMax="10000000" maxNumLabels="6" zIndex="5" drawLabels="1" limitNumLabels="0" scaleVisibility="0" fontLimitPixelSize="0" displayAll="0" obstacleType="0" obstacleFactor="0.76" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="1" upsidedownLabels="0" fontMinPixelSize="3" fontMaxPixelSize="10000"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </dd_properties>
             </settings>
@@ -11214,21 +11546,21 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundColor="#ffffff" backgroundAlpha="255" labelPlacementMethod="XHeight" lineSizeType="MM" minimumSize="0" diagramOrientation="Up" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" barWidth="5" penWidth="0" penColor="#000000" width="15" scaleDependency="Area" minScaleDenominator="0" height="15" scaleBasedVisibility="0" rotationOffset="270" enabled="0">
-          <fontProperties description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" color="#000000"/>
+        <DiagramCategory minimumSize="0" penAlpha="255" labelPlacementMethod="XHeight" width="15" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penWidth="0" barWidth="5" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" minScaleDenominator="0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" penColor="#000000" enabled="0" height="15" lineSizeType="MM" diagramOrientation="Up">
+          <fontProperties style="" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="0" zIndex="0" obstacle="0" linePlacementFlags="2" showAll="1">
+      <DiagramLayerSettings linePlacementFlags="2" dist="0" obstacle="0" showAll="1" priority="0" placement="0" zIndex="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option value="" name="name" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -11237,8 +11569,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -11247,8 +11579,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -11257,8 +11589,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -11272,10 +11604,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 name="" field="id" index="0"/>
+        <alias name="" field="table_set" index="1"/>
+        <alias name="" field="label" index="2"/>
+        <alias name="" field="races" index="3"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
@@ -11286,10 +11618,10 @@ def my_form_open(dialog, layer, feature):
         <default field="races" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="table_set" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="races" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="table_set" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="label" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" field="races" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -11301,13 +11633,13 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;table_set&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;table_set&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="table_set"/>
-          <column hidden="0" type="field" width="-1" name="label"/>
-          <column hidden="0" type="field" width="130" name="races"/>
+          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="table_set" type="field"/>
+          <column width="-1" hidden="0" name="label" type="field"/>
+          <column width="130" hidden="0" name="races" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11338,16 +11670,16 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="label"/>
-        <field editable="1" name="races"/>
-        <field editable="1" name="table_set"/>
+        <field name="id" editable="1"/>
+        <field name="label" editable="1"/>
+        <field name="races" editable="1"/>
+        <field name="table_set" editable="1"/>
       </editable>
       <labelOnTop>
-        <field 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>
@@ -11379,6 +11711,7 @@ def my_form_open(dialog, layer, feature):
     <layer id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
     <layer id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
     <layer id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792"/>
+    <layer id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
   </layerorder>
   <properties>
     <DefaultStyles>
@@ -11554,7 +11887,7 @@ def my_form_open(dialog, layer, feature):
       <disabledLayers type="QStringList"/>
     </Identify>
     <Layouts>
-      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/Fencing</lastLayoutExportDir>
+      <lastLayoutExportDir type="QString">/home/tim/Documents/GunRunMaps/GIS Base Map/Marshals</lastLayoutExportDir>
     </Layouts>
     <Legend>
       <filterByMap type="bool">false</filterByMap>
@@ -11695,265 +12028,265 @@ def my_form_open(dialog, layer, feature):
   </properties>
   <visibility-presets>
     <visibility-preset name="Access Routes" has-expanded-info="1">
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" style="default"/>
+      <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 expanded="0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="0"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Elevation"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Elevation"/>
         <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="All Routes" has-expanded-info="1">
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <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 expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
+      <layer id="water_tables20170921142016467" style="default" expanded="1"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="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"/>
-      <layer expanded="1" id="water_tables20170921142016467" style="default"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer 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="Start and Finish pages"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Ask Me" has-expanded-info="1">
-      <layer expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" style="default"/>
-      <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <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 expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" style="default"/>
-      <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
-      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="1"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <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="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" style="default" expanded="1"/>
+      <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Ask Me"/>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Ask Me"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Fencing" has-expanded-info="1">
-      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" expanded="1"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
         <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
+      <layer id="water_tables20170921142016467" style="default" expanded="1"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <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="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="1" id="water_tables20170921142016467" style="default"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default"/>
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" expanded="1"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Map"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <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="Map"/>
-        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Marshal map - inset" has-expanded-info="1">
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <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 expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <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 expanded="1" id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" style="default"/>
+      <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="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" style="default" expanded="1"/>
       <expanded-legend-nodes id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83"/>
-      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Marshal map - main" has-expanded-info="1">
-      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <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 expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}"/>
-        <checked-legend-node id="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="1" id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" style="default"/>
-      <expanded-legend-nodes id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83"/>
-      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing"/>
+      <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="{bb4463e8-e33a-4475-878c-fd2d7b636418}"/>
         <checked-legend-node id="{9da1c54c-0ca9-4db9-a722-ce3f53ccd358}"/>
+        <checked-legend-node id="{bb4463e8-e33a-4475-878c-fd2d7b636418}"/>
         <checked-legend-node id="{b3b38ee9-c245-4839-b078-3b966a2a5c4e}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="OSM data"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset name="Marshal overview" has-expanded-info="1">
-      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
+      <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="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}"/>
         <checked-legend-node id="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="1" id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" style="default"/>
+      <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="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" style="default" expanded="1"/>
       <expanded-legend-nodes id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Routes"/>
+      </expanded-group-nodes>
+    </visibility-preset>
+    <visibility-preset name="Marshal overview" has-expanded-info="1">
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="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="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}"/>
+        <checked-legend-node id="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <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="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" style="default" expanded="1"/>
+      <expanded-legend-nodes id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83"/>
+      <expanded-group-nodes>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Proposed Routes" has-expanded-info="1">
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <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 expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
+      <layer id="water_tables20170921142016467" style="default" expanded="1"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="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 expanded="1" id="water_tables20170921142016467" style="default"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer 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="Start and Finish pages"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Routes" has-expanded-info="1">
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <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 expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
+      <layer id="water_tables20170921142016467" style="default" expanded="1"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="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 expanded="1" id="water_tables20170921142016467" style="default"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer 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="Start and Finish pages"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Start/Finish" has-expanded-info="1">
-      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <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 expanded="1" id="water_tables20170921142016467" style="default"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" expanded="1"/>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer expanded="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" style="default"/>
+      <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="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" style="default" expanded="1"/>
       <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Marshal pages"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Marshal pages"/>
         <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
   </visibility-presets>
@@ -11980,41 +12313,41 @@ def my_form_open(dialog, layer, feature):
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout worldFileMap="" name="Routes" units="mm" printResolution="144">
-      <Snapper snapToItems="1" tolerance="5" snapToGrid="0" snapToGuides="1"/>
-      <Grid offsetY="0" resUnits="mm" offsetX="0" resolution="10" offsetUnits="mm"/>
+    <Layout printResolution="144" name="Routes" worldFileMap="" units="mm">
+      <Snapper snapToGuides="1" tolerance="5" snapToItems="1" snapToGrid="0"/>
+      <Grid offsetX="0" offsetY="0" resUnits="mm" resolution="10" offsetUnits="mm"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" alpha="1" type="fill" clip_to_extent="1" force_rhr="0">
+          <layer enabled="1" pass="0" locked="0" 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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="no"/>
+            <prop k="outline_width" v="0.26"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem size="297,210,mm" outlineWidthM="0.3,mm" opacity="1" positionOnPage="0,0,mm" templateUuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" frame="false" blendMode="0" frameJoinStyle="miter" background="true" uuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" positionLock="false" type="65638" itemRotation="0" excludeFromExports="0" position="0,0,mm" groupUuid="" visibility="1" zValue="0" referencePoint="0" id="">
-          <FrameColor green="0" red="0" blue="0" alpha="255"/>
-          <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+        <LayoutItem position="0,0,mm" id="" itemRotation="0" visibility="1" groupUuid="" size="297,210,mm" positionLock="false" opacity="1" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" background="true" frameJoinStyle="miter" frame="false" type="65638" uuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" blendMode="0" excludeFromExports="0" zValue="0">
+          <FrameColor alpha="255" red="0" green="0" blue="0"/>
+          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
@@ -12024,171 +12357,171 @@ def my_form_open(dialog, layer, feature):
           <Guide orientation="2" page="0" units="mm" position="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem size="14.1764,7.471,mm" valign="64" outlineWidthM="0.3,mm" opacity="1" positionOnPage="9.44946,191.611,mm" templateUuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="[%&quot;Distance&quot;%]" position="9.44946,191.611,mm" groupUuid="" htmlState="0" visibility="1" zValue="9" referencePoint="0" marginY="1" id="" marginX="1" halign="1">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="9.44946,191.611,mm" id="" itemRotation="0" labelText="[%&quot;Distance&quot;%]" htmlState="0" visibility="1" groupUuid="" size="14.1764,7.471,mm" halign="1" positionLock="true" opacity="1" positionOnPage="9.44946,191.611,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" marginX="1" valign="64" background="false" frameJoinStyle="miter" frame="false" type="65641" uuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" blendMode="0" excludeFromExports="0" marginY="1" zValue="9">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <LabelFont style="Semibold" description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold"/>
+        <FontColor alpha="255" red="0" green="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem size="29.2025,7.272,mm" valign="64" outlineWidthM="0.3,mm" opacity="1" positionOnPage="24.2445,191.81,mm" templateUuid="{d9f4225c-620f-4a62-a293-599f109f5206}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{d9f4225c-620f-4a62-a293-599f109f5206}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="RACE ROUTE" position="24.2445,191.81,mm" groupUuid="" htmlState="0" visibility="1" zValue="8" referencePoint="0" marginY="1" id="" marginX="0" halign="1">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="24.2445,191.81,mm" id="" itemRotation="0" labelText="RACE ROUTE" htmlState="0" visibility="1" groupUuid="" size="29.2025,7.272,mm" halign="1" positionLock="true" opacity="1" positionOnPage="24.2445,191.81,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{d9f4225c-620f-4a62-a293-599f109f5206}" marginX="0" valign="64" background="false" frameJoinStyle="miter" frame="false" type="65641" uuid="{d9f4225c-620f-4a62-a293-599f109f5206}" blendMode="0" excludeFromExports="0" marginY="1" zValue="8">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <LabelFont style="Regular" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor alpha="255" red="0" green="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem size="57.4836,6.8714,mm" valign="64" outlineWidthM="0.3,mm" opacity="1" positionOnPage="204.225,191.81,mm" templateUuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="REVISION 3.0" position="204.225,191.81,mm" groupUuid="" htmlState="0" visibility="1" zValue="6" referencePoint="0" marginY="1" id="" marginX="1" halign="2">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="204.225,191.81,mm" id="" itemRotation="0" labelText="REVISION 3.0" htmlState="0" visibility="1" groupUuid="" size="57.4836,6.8714,mm" halign="2" positionLock="true" opacity="1" positionOnPage="204.225,191.81,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" marginX="1" valign="64" background="false" frameJoinStyle="miter" frame="false" type="65641" uuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" blendMode="0" excludeFromExports="0" marginY="1" zValue="6">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor alpha="255" red="0" green="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem size="51.6706,6.60801,mm" valign="64" outlineWidthM="0.3,mm" opacity="1" positionOnPage="210.038,199.082,mm" templateUuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="Sunday, 20 October 2019" position="210.038,199.082,mm" groupUuid="" htmlState="0" visibility="1" zValue="5" referencePoint="0" marginY="1" id="" marginX="1" halign="2">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="210.038,199.082,mm" id="" itemRotation="0" labelText="Sunday, 20 October 2019" htmlState="0" visibility="1" groupUuid="" size="51.6706,6.60801,mm" halign="2" positionLock="true" opacity="1" positionOnPage="210.038,199.082,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" marginX="1" valign="64" background="false" frameJoinStyle="miter" frame="false" type="65641" uuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" blendMode="0" excludeFromExports="0" marginY="1" zValue="5">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor alpha="255" red="0" green="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem size="29.7523,17.4718,mm" mapUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" outlineWidthM="0.3,mm" opacity="1" positionOnPage="262.196,188.218,mm" resizeMode="0" northOffset="0" templateUuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" frame="false" pictureWidth="29.7523" anchorPoint="4" pictureHeight="17.4074" pictureRotation="0" svgBorderColor="0,0,0,255" blendMode="0" svgFillColor="255,255,255,255" frameJoinStyle="miter" background="false" uuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" positionLock="true" svgBorderWidth="0.2" type="65640" itemRotation="0" excludeFromExports="0" position="262.196,188.218,mm" file="../Gun_Run_Logo.png" northMode="0" groupUuid="" visibility="1" zValue="4" referencePoint="0" id="">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="262.196,188.218,mm" id="" itemRotation="0" visibility="1" groupUuid="" mapUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" size="29.7523,17.4718,mm" positionLock="true" opacity="1" positionOnPage="262.196,188.218,mm" outlineWidthM="0.3,mm" referencePoint="0" pictureRotation="0" northOffset="0" pictureWidth="29.7523" templateUuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" svgBorderWidth="0.2" pictureHeight="17.4074" background="false" resizeMode="0" anchorPoint="4" frameJoinStyle="miter" frame="false" type="65640" svgBorderColor="0,0,0,255" uuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" blendMode="0" excludeFromExports="0" file="../Gun_Run_Logo.png" svgFillColor="255,255,255,255" northMode="0" zValue="4">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem size="251.959,0.1,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" cornerRadiusMeasure="0,mm" positionOnPage="9.59946,198.832,mm" templateUuid="{5e005555-54ea-40fd-a5a7-20254950b890}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{5e005555-54ea-40fd-a5a7-20254950b890}" positionLock="true" type="65643" itemRotation="0" excludeFromExports="0" position="9.59946,198.832,mm" groupUuid="" visibility="1" zValue="3" referencePoint="0" id="">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="9.59946,198.832,mm" id="" itemRotation="0" visibility="1" groupUuid="" size="251.959,0.1,mm" positionLock="true" opacity="1" positionOnPage="9.59946,198.832,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{5e005555-54ea-40fd-a5a7-20254950b890}" cornerRadiusMeasure="0,mm" background="false" frameJoinStyle="miter" shapeType="1" frame="false" type="65643" uuid="{5e005555-54ea-40fd-a5a7-20254950b890}" blendMode="0" excludeFromExports="0" zValue="3">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" alpha="1" type="fill" clip_to_extent="1" force_rhr="0">
+          <layer enabled="1" pass="0" locked="0" 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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="solid"/>
+            <prop k="outline_width" v="0.3"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem size="67.7828,166.874,mm" outlineWidthM="0.3,mm" opacity="1" positionOnPage="5.86559,4.09761,mm" templateUuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" frame="true" blendMode="0" frameJoinStyle="miter" labelMargin="0,mm" background="true" uuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" mapFlags="0" positionLock="true" followPresetName="Routes" type="65639" itemRotation="0" excludeFromExports="0" position="5.86559,4.09761,mm" groupUuid="" visibility="1" zValue="2" referencePoint="0" drawCanvasItems="false" mapRotation="0" id="" keepLayerSet="false" followPreset="true">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="5.86559,4.09761,mm" id="" labelMargin="0,mm" itemRotation="0" visibility="1" groupUuid="" size="67.7828,166.874,mm" followPresetName="Routes" positionLock="true" opacity="1" keepLayerSet="false" drawCanvasItems="false" positionOnPage="5.86559,4.09761,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" followPreset="true" mapFlags="0" background="true" frameJoinStyle="miter" frame="true" type="65639" uuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" mapRotation="0" blendMode="0" excludeFromExports="0" zValue="2">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMax">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapXMax" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMax">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapYMax" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent ymin="-33.94652930000000168" xmin="18.37288570000000121" xmax="18.38563681624126289" ymax="-33.91513741583252539"/>
+        <Extent xmin="18.37288570000000121" ymin="-33.94652930000000168" ymax="-33.91513741583252539" xmax="18.38563681624126289"/>
         <crs>
           <spatialrefsys>
             <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
@@ -12202,102 +12535,102 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" topAnnotationPosition="1" rightFrameDivisions="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" gridFramePenThickness="0.5" unit="0" rightAnnotationPosition="1" leftAnnotationDirection="0" topAnnotationDisplay="0" gridFrameSideFlags="15" leftAnnotationDisplay="0" crossLength="3" topFrameDivisions="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" bottomAnnotationDisplay="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" show="0" showAnnotation="0" intervalX="0" topAnnotationDirection="0" frameAnnotationDistance="1" leftFrameDivisions="0" frameFillColor2="0,0,0,255" annotationFormat="0" intervalY="0" rightAnnotationDisplay="0" annotationFontColor="0,0,0,255" gridFrameStyle="0" gridFrameWidth="2" gridStyle="0" rightAnnotationDirection="0" annotationExpression="" offsetX="0" bottomAnnotationPosition="1" annotationPrecision="3" name="Grid 1" offsetY="0" leftAnnotationPosition="1" position="3">
+        <ComposerMapGrid topAnnotationDisplay="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" topFrameDivisions="0" crossLength="3" gridFrameSideFlags="15" unit="0" annotationFormat="0" gridFramePenThickness="0.5" annotationExpression="" gridFramePenColor="0,0,0,255" bottomAnnotationDisplay="0" frameFillColor1="255,255,255,255" bottomAnnotationDirection="0" annotationFontColor="0,0,0,255" rightAnnotationDisplay="0" position="3" gridStyle="0" topAnnotationPosition="1" bottomFrameDivisions="0" offsetY="0" rightAnnotationPosition="1" show="0" rightFrameDivisions="0" gridFrameWidth="2" rightAnnotationDirection="0" intervalY="0" leftFrameDivisions="0" frameAnnotationDistance="1" showAnnotation="0" annotationPrecision="3" topAnnotationDirection="0" blendMode="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" intervalX="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" leftAnnotationDirection="0" offsetX="0" gridFrameMargin="0" name="Grid 1">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <symbol name="" alpha="1" type="line" clip_to_extent="1" force_rhr="0">
+              <layer enabled="1" pass="0" locked="0" class="SimpleLine">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol name="" alpha="1" type="marker" clip_to_extent="1" force_rhr="0">
+              <layer enabled="1" pass="0" locked="0" class="SimpleMarker">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
         <AtlasMap atlasDriven="0" scalingMode="2" margin="0.05"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutItem size="282.012,175.592,mm" outlineWidthM="0.15,mm" opacity="1" positionOnPage="9.44946,9.08557,mm" templateUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" frame="true" blendMode="0" frameJoinStyle="round" labelMargin="0,mm" background="true" uuid="{b35d820c-6054-4426-a840-5216bed2ca94}" mapFlags="0" positionLock="true" followPresetName="Routes" type="65639" itemRotation="0" excludeFromExports="0" position="9.44946,9.08557,mm" groupUuid="" visibility="1" zValue="1" referencePoint="0" drawCanvasItems="false" mapRotation="0" id="" keepLayerSet="false" followPreset="true">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="9.44946,9.08557,mm" id="" labelMargin="0,mm" itemRotation="0" visibility="1" groupUuid="" size="282.012,175.592,mm" followPresetName="Routes" positionLock="true" opacity="1" keepLayerSet="false" drawCanvasItems="false" positionOnPage="9.44946,9.08557,mm" outlineWidthM="0.15,mm" referencePoint="0" templateUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" followPreset="true" mapFlags="0" background="true" frameJoinStyle="round" frame="true" type="65639" uuid="{b35d820c-6054-4426-a840-5216bed2ca94}" mapRotation="0" blendMode="0" excludeFromExports="0" zValue="1">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent ymin="-33.92999999999999972" xmin="18.37000000000000099" xmax="18.42303507276714569" ymax="-33.89697816223931426"/>
+        <Extent xmin="18.37000000000000099" ymin="-33.92999999999999972" ymax="-33.89697816223931426" xmax="18.42303507276714569"/>
         <crs>
           <spatialrefsys>
             <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
@@ -12311,68 +12644,68 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" topAnnotationPosition="1" rightFrameDivisions="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" gridFramePenThickness="0.5" unit="0" rightAnnotationPosition="1" leftAnnotationDirection="0" topAnnotationDisplay="0" gridFrameSideFlags="15" leftAnnotationDisplay="0" crossLength="3" topFrameDivisions="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" bottomAnnotationDisplay="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" show="0" showAnnotation="0" intervalX="0" topAnnotationDirection="0" frameAnnotationDistance="1" leftFrameDivisions="0" frameFillColor2="0,0,0,255" annotationFormat="0" intervalY="0" rightAnnotationDisplay="0" annotationFontColor="0,0,0,255" gridFrameStyle="0" gridFrameWidth="2" gridStyle="0" rightAnnotationDirection="0" annotationExpression="" offsetX="0" bottomAnnotationPosition="1" annotationPrecision="3" name="Grid 1" offsetY="0" leftAnnotationPosition="1" position="3">
+        <ComposerMapGrid topAnnotationDisplay="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" topFrameDivisions="0" crossLength="3" gridFrameSideFlags="15" unit="0" annotationFormat="0" gridFramePenThickness="0.5" annotationExpression="" gridFramePenColor="0,0,0,255" bottomAnnotationDisplay="0" frameFillColor1="255,255,255,255" bottomAnnotationDirection="0" annotationFontColor="0,0,0,255" rightAnnotationDisplay="0" position="3" gridStyle="0" topAnnotationPosition="1" bottomFrameDivisions="0" offsetY="0" rightAnnotationPosition="1" show="0" rightFrameDivisions="0" gridFrameWidth="2" rightAnnotationDirection="0" intervalY="0" leftFrameDivisions="0" frameAnnotationDistance="1" showAnnotation="0" annotationPrecision="3" topAnnotationDirection="0" blendMode="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" intervalX="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" leftAnnotationDirection="0" offsetX="0" gridFrameMargin="0" name="Grid 1">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <symbol name="" alpha="1" type="line" clip_to_extent="1" force_rhr="0">
+              <layer enabled="1" pass="0" locked="0" class="SimpleLine">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol name="" alpha="1" type="marker" clip_to_extent="1" force_rhr="0">
+              <layer enabled="1" pass="0" locked="0" class="SimpleMarker">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
         <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
         <labelBlockingItems/>
@@ -12391,43 +12724,43 @@ def my_form_open(dialog, layer, feature):
         <property key="pdfTextFormat" value="0"/>
         <property key="singleFile" value="true"/>
       </customproperties>
-      <Atlas coverageLayerName="all_routes" hideCoverage="0" sortFeatures="1" pageNameExpression="&quot;Distance&quot;" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortKey="length_m" filterFeatures="1" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21)' )" enabled="1" sortAscending="0" coverageLayerProvider="ogr"/>
+      <Atlas enabled="1" sortKey="length_m" hideCoverage="0" sortFeatures="1" pageNameExpression="&quot;Distance&quot;" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" filterFeatures="1" coverageLayerName="all_routes" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" coverageLayerSource="/home/tim/Documents/GunRunMaps/GIS Base Map/all_routes.shp|layername=all_routes" coverageLayerProvider="ogr" sortAscending="0" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21)' )"/>
     </Layout>
-    <Layout worldFileMap="" name="Marshals" units="mm" printResolution="120">
-      <Snapper snapToItems="1" tolerance="5" snapToGrid="0" snapToGuides="1"/>
-      <Grid offsetY="0" resUnits="mm" offsetX="0" resolution="10" offsetUnits="mm"/>
+    <Layout printResolution="120" name="Marshals" worldFileMap="" units="mm">
+      <Snapper snapToGuides="1" tolerance="5" snapToItems="1" snapToGrid="0"/>
+      <Grid offsetX="0" offsetY="0" resUnits="mm" resolution="10" offsetUnits="mm"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" alpha="1" type="fill" clip_to_extent="1" force_rhr="0">
+          <layer enabled="1" pass="0" locked="0" 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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="no"/>
+            <prop k="outline_width" v="0.26"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem size="297,210,mm" outlineWidthM="0.3,mm" opacity="1" positionOnPage="0,0,mm" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" frame="false" blendMode="0" frameJoinStyle="miter" background="true" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" positionLock="false" type="65638" itemRotation="0" excludeFromExports="0" position="0,0,mm" groupUuid="" visibility="1" zValue="0" referencePoint="0" id="">
-          <FrameColor green="0" red="0" blue="0" alpha="255"/>
-          <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+        <LayoutItem position="0,0,mm" id="" itemRotation="0" visibility="1" groupUuid="" size="297,210,mm" positionLock="false" opacity="1" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" background="true" frameJoinStyle="miter" frame="false" type="65638" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" blendMode="0" excludeFromExports="0" zValue="0">
+          <FrameColor alpha="255" red="0" green="0" blue="0"/>
+          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
@@ -12435,50 +12768,50 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem title="" outlineWidthM="0.1,mm" blendMode="0" background="true" fontColor="#000000" referencePoint="0" itemRotation="0" size="35.7078,48,mm" frame="true" titleAlignment="1" opacity="1" columnCount="1" equalColumnWidth="1" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" rasterBorderColor="0,0,0,255" excludeFromExports="0" wmsLegendHeight="25" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" resizeToContents="1" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" boxSpace="2" frameJoinStyle="bevel" rasterBorderWidth="0" positionLock="true" wmsLegendWidth="50" symbolHeight="4" symbolWidth="7" type="65642" legendFilterByAtlas="0" splitLayer="0" rasterBorder="1" symbolAlignment="1" groupUuid="" visibility="1" zValue="5" lineSpacing="1" columnSpace="2" id="" wrapChar="" positionOnPage="115.486,4.6628,mm" position="115.486,4.6628,mm">
-        <FrameColor green="128" red="128" blue="128" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem type="65642" zValue="5" rasterBorderWidth="0" outlineWidthM="0.1,mm" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" wmsLegendWidth="50" groupUuid="" size="39.4344,45.9,mm" rasterBorderColor="0,0,0,255" symbolAlignment="1" columnCount="1" titleAlignment="1" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" itemRotation="0" wmsLegendHeight="25" referencePoint="0" splitLayer="0" boxSpace="2" background="true" lineSpacing="1" equalColumnWidth="1" symbolHeight="4" fontColor="#000000" resizeToContents="1" title="" position="115.486,4.6628,mm" wrapChar="" positionOnPage="115.486,4.6628,mm" symbolWidth="7" frameJoinStyle="bevel" positionLock="true" excludeFromExports="0" id="" blendMode="0" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" columnSpace="2" visibility="1" rasterBorder="1" opacity="1" frame="true" legendFilterByAtlas="0">
+        <FrameColor alpha="255" red="128" green="128" blue="128"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <styles>
           <style name="title" alignment="1">
-            <styleFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
+            <styleFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
           </style>
           <style name="group" alignment="1">
-            <styleFont description="Myriad Pro,11,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+            <styleFont style="Semibold" description="Myriad Pro,11,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
-          <style name="subgroup" marginTop="1" alignment="1">
-            <styleFont description="Myriad Pro,9,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style name="subgroup" alignment="1" marginTop="1">
+            <styleFont style="Semibold" description="Myriad Pro,9,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
-          <style name="symbol" marginTop="2" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <style name="symbol" alignment="1" marginTop="2">
+            <styleFont style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style marginLeft="2" name="symbolLabel" marginTop="2" alignment="1">
-            <styleFont description="Myriad Pro,8,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style marginLeft="2" name="symbolLabel" alignment="1" marginTop="2">
+            <styleFont style="Semibold" description="Myriad Pro,8,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties/>
-          <layer-tree-group expanded="1" checked="Qt::Checked" name="Routes">
+          <layer-tree-group name="Routes" checked="Qt::Checked" expanded="1">
             <customproperties/>
-            <layer-tree-layer providerKey="ogr" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" checked="Qt::Checked" source="./all_routes.shp|layername=all_routes" name="all_routes">
+            <layer-tree-layer source="./all_routes.shp|layername=all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" name="all_routes" providerKey="ogr" checked="Qt::Checked" expanded="1">
               <customproperties>
                 <property key="legend/node-order" value="1,2,3"/>
                 <property key="legend/title-style" value="hidden"/>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group expanded="1" checked="Qt::Unchecked" name="Fencing and Cones">
+          <layer-tree-group name="Fencing and Cones" checked="Qt::Unchecked" expanded="1">
             <customproperties/>
-            <layer-tree-layer providerKey="ogr" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" checked="Qt::Checked" source="./fencing.shp|layername=fencing" name="fencing">
+            <layer-tree-layer source="./fencing.shp|layername=fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" name="fencing" providerKey="ogr" checked="Qt::Checked" expanded="1">
               <customproperties>
                 <property key="legend/node-order" value="0,1,2"/>
                 <property key="legend/title-style" value="hidden"/>
@@ -12488,103 +12821,103 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem size="56.5192,54.5647,mm" outlineWidthM="0.2,mm" opacity="1" positionOnPage="96.8723,149.218,mm" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" frame="true" blendMode="0" frameJoinStyle="miter" labelMargin="0,mm" background="true" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" mapFlags="0" positionLock="true" followPresetName="Marshal map - inset" type="65639" itemRotation="0" excludeFromExports="0" position="96.8723,149.218,mm" groupUuid="" visibility="1" zValue="4" referencePoint="0" drawCanvasItems="false" mapRotation="0" id="" keepLayerSet="false" followPreset="true">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="96.8723,149.218,mm" id="" labelMargin="0,mm" itemRotation="0" visibility="1" groupUuid="" size="56.5192,54.5647,mm" followPresetName="Marshal map - inset" positionLock="true" opacity="1" keepLayerSet="false" drawCanvasItems="false" positionOnPage="96.8723,149.218,mm" outlineWidthM="0.2,mm" referencePoint="0" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" followPreset="true" mapFlags="0" background="true" frameJoinStyle="miter" frame="true" type="65639" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" mapRotation="0" blendMode="0" excludeFromExports="0" zValue="4">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent ymin="-33.9468506100902232" xmin="18.37543947857280457" xmax="18.37973432449689781" ymax="-33.94270428739947931"/>
+        <Extent xmin="18.41748259350183403" ymin="-33.91732122378612502" ymax="-33.91317706456215575" xmax="18.42177519846275047"/>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" topAnnotationPosition="1" rightFrameDivisions="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" gridFramePenThickness="0.5" unit="0" rightAnnotationPosition="1" leftAnnotationDirection="0" topAnnotationDisplay="0" gridFrameSideFlags="15" leftAnnotationDisplay="0" crossLength="3" topFrameDivisions="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" bottomAnnotationDisplay="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" show="0" showAnnotation="0" intervalX="0" topAnnotationDirection="0" frameAnnotationDistance="1" leftFrameDivisions="0" frameFillColor2="0,0,0,255" annotationFormat="0" intervalY="0" rightAnnotationDisplay="0" annotationFontColor="0,0,0,255" gridFrameStyle="0" gridFrameWidth="2" gridStyle="0" rightAnnotationDirection="0" annotationExpression="" offsetX="0" bottomAnnotationPosition="1" annotationPrecision="3" name="Grid 1" offsetY="0" leftAnnotationPosition="1" position="3">
+        <ComposerMapGrid topAnnotationDisplay="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" topFrameDivisions="0" crossLength="3" gridFrameSideFlags="15" unit="0" annotationFormat="0" gridFramePenThickness="0.5" annotationExpression="" gridFramePenColor="0,0,0,255" bottomAnnotationDisplay="0" frameFillColor1="255,255,255,255" bottomAnnotationDirection="0" annotationFontColor="0,0,0,255" rightAnnotationDisplay="0" position="3" gridStyle="0" topAnnotationPosition="1" bottomFrameDivisions="0" offsetY="0" rightAnnotationPosition="1" show="0" rightFrameDivisions="0" gridFrameWidth="2" rightAnnotationDirection="0" intervalY="0" leftFrameDivisions="0" frameAnnotationDistance="1" showAnnotation="0" annotationPrecision="3" topAnnotationDirection="0" blendMode="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" intervalX="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" leftAnnotationDirection="0" offsetX="0" gridFrameMargin="0" name="Grid 1">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <symbol name="" alpha="1" type="line" clip_to_extent="1" force_rhr="0">
+              <layer enabled="1" pass="0" locked="0" class="SimpleLine">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol name="" alpha="1" type="marker" clip_to_extent="1" force_rhr="0">
+              <layer enabled="1" pass="0" locked="0" class="SimpleMarker">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <ComposerMapOverview blendMode="0" inverted="0" centered="1" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" name="Overview 1" show="1" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" position="3">
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="0,65,170,127" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,102" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
+        <ComposerMapOverview frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" centered="1" name="Overview 1" blendMode="0" inverted="0" show="1" position="3" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}">
+          <symbol name="" alpha="1" type="fill" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" pass="0" locked="0" class="SimpleFill">
+              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="color" v="0,65,170,127"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="35,35,35,102"/>
+              <prop k="outline_style" v="no"/>
+              <prop k="outline_width" v="0.26"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -12593,129 +12926,129 @@ def my_form_open(dialog, layer, feature):
         <AtlasMap atlasDriven="1" scalingMode="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutItem size="142,187.018,mm" outlineWidthM="0.3,mm" opacity="1" positionOnPage="3.53,6.0007,mm" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" frame="false" blendMode="0" frameJoinStyle="miter" labelMargin="0,mm" background="false" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" mapFlags="0" positionLock="true" followPresetName="Marshal map - main" type="65639" itemRotation="0" excludeFromExports="0" position="3.53,6.0007,mm" groupUuid="" visibility="1" zValue="3" referencePoint="0" drawCanvasItems="false" mapRotation="0" id="" keepLayerSet="false" followPreset="true">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="3.53,6.0007,mm" id="" labelMargin="0,mm" itemRotation="0" visibility="1" groupUuid="" size="142,187.018,mm" followPresetName="Marshal map - main" positionLock="true" opacity="1" keepLayerSet="false" drawCanvasItems="false" positionOnPage="3.53,6.0007,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" followPreset="true" mapFlags="0" background="false" frameJoinStyle="miter" frame="false" type="65639" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" mapRotation="0" blendMode="0" excludeFromExports="0" zValue="3">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent ymin="-33.94545417898715556" xmin="18.37707307000128054" xmax="18.37810073306842185" ymax="-33.94410071850254695"/>
+        <Extent xmin="18.419115332555549" ymin="-33.91592552131238847" ymax="-33.9145727670358923" xmax="18.4201424594090355"/>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" topAnnotationPosition="1" rightFrameDivisions="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" gridFramePenThickness="0.5" unit="0" rightAnnotationPosition="1" leftAnnotationDirection="0" topAnnotationDisplay="0" gridFrameSideFlags="15" leftAnnotationDisplay="0" crossLength="3" topFrameDivisions="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" bottomAnnotationDisplay="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" show="0" showAnnotation="0" intervalX="0" topAnnotationDirection="0" frameAnnotationDistance="1" leftFrameDivisions="0" frameFillColor2="0,0,0,255" annotationFormat="0" intervalY="0" rightAnnotationDisplay="0" annotationFontColor="0,0,0,255" gridFrameStyle="0" gridFrameWidth="2" gridStyle="0" rightAnnotationDirection="0" annotationExpression="" offsetX="0" bottomAnnotationPosition="1" annotationPrecision="3" name="Grid 1" offsetY="0" leftAnnotationPosition="1" position="3">
+        <ComposerMapGrid topAnnotationDisplay="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" topFrameDivisions="0" crossLength="3" gridFrameSideFlags="15" unit="0" annotationFormat="0" gridFramePenThickness="0.5" annotationExpression="" gridFramePenColor="0,0,0,255" bottomAnnotationDisplay="0" frameFillColor1="255,255,255,255" bottomAnnotationDirection="0" annotationFontColor="0,0,0,255" rightAnnotationDisplay="0" position="3" gridStyle="0" topAnnotationPosition="1" bottomFrameDivisions="0" offsetY="0" rightAnnotationPosition="1" show="0" rightFrameDivisions="0" gridFrameWidth="2" rightAnnotationDirection="0" intervalY="0" leftFrameDivisions="0" frameAnnotationDistance="1" showAnnotation="0" annotationPrecision="3" topAnnotationDirection="0" blendMode="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" intervalX="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" leftAnnotationDirection="0" offsetX="0" gridFrameMargin="0" name="Grid 1">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <symbol name="" alpha="1" type="line" clip_to_extent="1" force_rhr="0">
+              <layer enabled="1" pass="0" locked="0" class="SimpleLine">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol name="" alpha="1" type="marker" clip_to_extent="1" force_rhr="0">
+              <layer enabled="1" pass="0" locked="0" class="SimpleMarker">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
         <AtlasMap atlasDriven="1" scalingMode="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutItem size="142.117,187.018,mm" outlineWidthM="0.3,mm" opacity="1" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" sectionY="0" sectionHeight="187.018" hideBackgroundIfEmpty="0" positionOnPage="290.617,6.0007,mm" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" frame="false" sectionX="0" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" blendMode="0" frameJoinStyle="round" background="false" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" hidePageIfEmpty="0" positionLock="true" type="65647" itemRotation="0" excludeFromExports="0" position="290.617,6.0007,mm" sectionWidth="142.117" groupUuid="" visibility="1" zValue="2" referencePoint="2" id="">
-        <FrameColor green="119" red="119" blue="119" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="290.617,6.0007,mm" id="" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" itemRotation="0" visibility="1" sectionHeight="187.018" groupUuid="" size="142.117,187.018,mm" positionLock="true" opacity="1" positionOnPage="290.617,6.0007,mm" outlineWidthM="0.3,mm" referencePoint="2" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" sectionX="0" sectionY="0" sectionWidth="142.117" background="false" hideBackgroundIfEmpty="0" frameJoinStyle="round" frame="false" type="65647" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" hidePageIfEmpty="0" blendMode="0" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" excludeFromExports="0" zValue="2">
+        <FrameColor alpha="255" red="119" green="119" blue="119"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem size="47.1065,27.6,mm" mapUuid="" outlineWidthM="0.3,mm" opacity="1" positionOnPage="246.665,178.41,mm" resizeMode="0" northOffset="0" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" frame="false" pictureWidth="47.1065" anchorPoint="0" pictureHeight="27.561" pictureRotation="0" svgBorderColor="0,0,0,255" blendMode="0" svgFillColor="255,255,255,255" frameJoinStyle="miter" background="false" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" positionLock="true" svgBorderWidth="0.2" type="65640" itemRotation="0" excludeFromExports="0" position="246.665,178.41,mm" file="../Gun_Run_Logo.png" northMode="0" groupUuid="" visibility="1" zValue="1" referencePoint="0" id="">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="246.665,178.41,mm" id="" itemRotation="0" visibility="1" groupUuid="" mapUuid="" size="47.1065,27.6,mm" positionLock="true" opacity="1" positionOnPage="246.665,178.41,mm" outlineWidthM="0.3,mm" referencePoint="0" pictureRotation="0" northOffset="0" pictureWidth="47.1065" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" svgBorderWidth="0.2" pictureHeight="27.561" background="false" resizeMode="0" anchorPoint="0" frameJoinStyle="miter" frame="false" type="65640" svgBorderColor="0,0,0,255" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" blendMode="0" excludeFromExports="0" file="../Gun_Run_Logo.png" svgFillColor="255,255,255,255" northMode="0" zValue="1">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutMultiFrame uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" url="" evaluateExpressions="true" useSmartBreaks="true" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;tr>&lt;td>Name&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', &quot;csv_name&quot;, '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;/td>&lt;/tr>', '')%]&#xa;&lt;tr>&lt;td>Club&lt;/td>&lt;td>[%csv_club%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%csv_captain%]&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>VOC&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;tr>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&amp;nbsp;&lt;/td>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain_phone&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;/td>&lt;tr>')%]&#xa;&#xa;&lt;tr>&lt;td>Timothy Allen&lt;/td>&lt;td>072 703 9574&lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please return your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephen Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" type="65648" contentMode="1" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}" resizeMode="0" maxBreakDistance="12" stylesheetEnabled="true">
-        <childFrame uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}"/>
+      <LayoutMultiFrame evaluateExpressions="true" resizeMode="0" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;tr>&lt;td>Name&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', &quot;csv_name&quot;, '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;/td>&lt;/tr>', '')%]&#xa;&lt;tr>&lt;td>Club&lt;/td>&lt;td>[%csv_club%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%csv_captain%]&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>VOC&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;tr>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&amp;nbsp;&lt;/td>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain_phone&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;/td>&lt;tr>')%]&#xa;&#xa;&lt;tr>&lt;td>Timothy Allen&lt;/td>&lt;td>072 703 9574&lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please return your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephen Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>" type="65648" maxBreakDistance="12" contentMode="1" useSmartBreaks="true" url="" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" stylesheetEnabled="true">
+        <childFrame templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
@@ -12741,43 +13074,43 @@ def my_form_open(dialog, layer, feature):
         <property key="resizeToContentsTopMargin" value="3.53"/>
         <property key="singleFile" value="false"/>
       </customproperties>
-      <Atlas coverageLayerName="marshal_positions" hideCoverage="0" sortFeatures="1" pageNameExpression="&quot;position&quot;" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" sortKey="position" filterFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" enabled="1" sortAscending="1" coverageLayerProvider="ogr"/>
+      <Atlas enabled="1" sortKey="position" hideCoverage="0" sortFeatures="1" pageNameExpression="&quot;position&quot;" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" filterFeatures="0" coverageLayerName="marshal_positions" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" coverageLayerSource="/home/tim/Documents/GunRunMaps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" coverageLayerProvider="ogr" sortAscending="1"/>
     </Layout>
-    <Layout worldFileMap="" name="Marshal Plan" units="mm" printResolution="120">
-      <Snapper snapToItems="1" tolerance="5" snapToGrid="0" snapToGuides="1"/>
-      <Grid offsetY="0" resUnits="mm" offsetX="0" resolution="10" offsetUnits="mm"/>
+    <Layout printResolution="120" name="Marshal Plan" worldFileMap="" units="mm">
+      <Snapper snapToGuides="1" tolerance="5" snapToItems="1" snapToGrid="0"/>
+      <Grid offsetX="0" offsetY="0" resUnits="mm" resolution="10" offsetUnits="mm"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" alpha="1" type="fill" clip_to_extent="1" force_rhr="0">
+          <layer enabled="1" pass="0" locked="0" 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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="no"/>
+            <prop k="outline_width" v="0.26"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem size="297,420,mm" outlineWidthM="0.3,mm" opacity="1" positionOnPage="0,0,mm" templateUuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" frame="false" blendMode="0" frameJoinStyle="miter" background="true" uuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" positionLock="false" type="65638" itemRotation="0" excludeFromExports="0" position="0,0,mm" groupUuid="" visibility="1" zValue="0" referencePoint="0" id="">
-          <FrameColor green="0" red="0" blue="0" alpha="255"/>
-          <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+        <LayoutItem position="0,0,mm" id="" itemRotation="0" visibility="1" groupUuid="" size="297,420,mm" positionLock="false" opacity="1" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" background="true" frameJoinStyle="miter" frame="false" type="65638" uuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" blendMode="0" excludeFromExports="0" zValue="0">
+          <FrameColor alpha="255" red="0" green="0" blue="0"/>
+          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
@@ -12785,41 +13118,41 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem title="" outlineWidthM="0.3,mm" blendMode="0" background="true" fontColor="#000000" referencePoint="0" itemRotation="0" size="21.6797,27,mm" frame="false" titleAlignment="1" opacity="1" columnCount="1" equalColumnWidth="1" templateUuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" rasterBorderColor="0,0,0,255" excludeFromExports="0" wmsLegendHeight="25" uuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" resizeToContents="1" map_uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" boxSpace="2" frameJoinStyle="miter" rasterBorderWidth="0" positionLock="true" wmsLegendWidth="50" symbolHeight="4" symbolWidth="7" type="65642" legendFilterByAtlas="0" splitLayer="0" rasterBorder="1" symbolAlignment="1" groupUuid="" visibility="1" zValue="8" lineSpacing="1" columnSpace="2" id="" wrapChar="" positionOnPage="15.6525,12.5708,mm" position="15.6525,12.5708,mm">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem type="65642" zValue="8" rasterBorderWidth="0" outlineWidthM="0.3,mm" uuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" wmsLegendWidth="50" groupUuid="" size="21.6797,27,mm" rasterBorderColor="0,0,0,255" symbolAlignment="1" columnCount="1" titleAlignment="1" templateUuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" itemRotation="0" wmsLegendHeight="25" referencePoint="0" splitLayer="0" boxSpace="2" background="true" lineSpacing="1" equalColumnWidth="1" symbolHeight="4" fontColor="#000000" resizeToContents="1" title="" position="15.6525,12.5708,mm" wrapChar="" positionOnPage="15.6525,12.5708,mm" symbolWidth="7" frameJoinStyle="miter" positionLock="true" excludeFromExports="0" id="" blendMode="0" map_uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" columnSpace="2" visibility="1" rasterBorder="1" opacity="1" frame="false" legendFilterByAtlas="0">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <styles>
           <style name="title" alignment="1">
-            <styleFont description="Myriad Pro,16,-1,5,50,0,0,0,0,0" style=""/>
+            <styleFont style="" description="Myriad Pro,16,-1,5,50,0,0,0,0,0"/>
           </style>
           <style name="group" alignment="1">
-            <styleFont description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+            <styleFont style="Semibold" description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
-          <style name="subgroup" marginTop="1" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style name="subgroup" alignment="1" marginTop="1">
+            <styleFont style="Semibold" description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
-          <style name="symbol" marginTop="2" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <style name="symbol" alignment="1" marginTop="2">
+            <styleFont style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style marginLeft="2" name="symbolLabel" marginTop="2" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style marginLeft="2" name="symbolLabel" alignment="1" marginTop="2">
+            <styleFont style="Semibold" description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties/>
-          <layer-tree-group expanded="1" checked="Qt::Checked" name="Routes">
+          <layer-tree-group name="Routes" checked="Qt::Checked" expanded="1">
             <customproperties/>
-            <layer-tree-layer providerKey="ogr" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" checked="Qt::Checked" source="./all_routes.shp|layername=all_routes" name="all_routes">
+            <layer-tree-layer source="./all_routes.shp|layername=all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" name="all_routes" providerKey="ogr" checked="Qt::Checked" expanded="1">
               <customproperties>
                 <property key="legend/node-order" value="1,2,3"/>
                 <property key="legend/title-style" value="hidden"/>
@@ -12829,156 +13162,156 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem size="45.1194,7.36972,mm" valign="64" outlineWidthM="0.3,mm" opacity="1" positionOnPage="5.69321,399.106,mm" templateUuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="MARSHAL POSITIONS" position="5.69321,399.106,mm" groupUuid="" htmlState="0" visibility="1" zValue="7" referencePoint="0" marginY="1" id="" marginX="1" halign="1">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="5.69321,399.106,mm" id="" itemRotation="0" labelText="MARSHAL POSITIONS" htmlState="0" visibility="1" groupUuid="" size="45.1194,7.36972,mm" halign="1" positionLock="true" opacity="1" positionOnPage="5.69321,399.106,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" marginX="1" valign="64" background="false" frameJoinStyle="miter" frame="false" type="65641" uuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" blendMode="0" excludeFromExports="0" marginY="1" zValue="7">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <LabelFont style="Semibold" description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold"/>
+        <FontColor alpha="255" red="0" green="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem size="16.2476,7.80192,mm" valign="32" outlineWidthM="0.3,mm" opacity="1" positionOnPage="5.69321,406.988,mm" templateUuid="{619c5aac-2a47-4730-9726-57b172205ef7}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{619c5aac-2a47-4730-9726-57b172205ef7}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="Page [% &quot;page&quot; %]" position="5.69321,406.988,mm" groupUuid="" htmlState="0" visibility="1" zValue="6" referencePoint="0" marginY="1" id="" marginX="1" halign="1">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="5.69321,406.988,mm" id="" itemRotation="0" labelText="Page [% &quot;page&quot; %]" htmlState="0" visibility="1" groupUuid="" size="16.2476,7.80192,mm" halign="1" positionLock="true" opacity="1" positionOnPage="5.69321,406.988,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{619c5aac-2a47-4730-9726-57b172205ef7}" marginX="1" valign="32" background="false" frameJoinStyle="miter" frame="false" type="65641" uuid="{619c5aac-2a47-4730-9726-57b172205ef7}" blendMode="0" excludeFromExports="0" marginY="1" zValue="6">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor alpha="255" red="0" green="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem size="27.7839,7.51682,mm" valign="32" outlineWidthM="0.3,mm" opacity="1" positionOnPage="214.292,406.988,mm" templateUuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="REVISION 1.2" position="214.292,406.988,mm" groupUuid="" htmlState="0" visibility="1" zValue="5" referencePoint="0" marginY="1" id="" marginX="1" halign="2">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="214.292,406.988,mm" id="" itemRotation="0" labelText="REVISION 1.2" htmlState="0" visibility="1" groupUuid="" size="27.7839,7.51682,mm" halign="2" positionLock="true" opacity="1" positionOnPage="214.292,406.988,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" marginX="1" valign="32" background="false" frameJoinStyle="miter" frame="false" type="65641" uuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" blendMode="0" excludeFromExports="0" marginY="1" zValue="5">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor alpha="255" red="0" green="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem size="56.3557,7.36902,mm" valign="64" outlineWidthM="0.3,mm" opacity="1" positionOnPage="185.72,399.107,mm" templateUuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="Sunday, 20 October 2019" position="185.72,399.107,mm" groupUuid="" htmlState="0" visibility="1" zValue="4" referencePoint="0" marginY="1" id="" marginX="1" halign="2">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="185.72,399.107,mm" id="" itemRotation="0" labelText="Sunday, 20 October 2019" htmlState="0" visibility="1" groupUuid="" size="56.3557,7.36902,mm" halign="2" positionLock="true" opacity="1" positionOnPage="185.72,399.107,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" marginX="1" valign="64" background="false" frameJoinStyle="miter" frame="false" type="65641" uuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" blendMode="0" excludeFromExports="0" marginY="1" zValue="4">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor alpha="255" red="0" green="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem size="49.3143,31.2967,mm" mapUuid="" outlineWidthM="0.3,mm" opacity="1" positionOnPage="243.319,382.696,mm" resizeMode="0" northOffset="0" templateUuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" frame="false" pictureWidth="49.3143" anchorPoint="8" pictureHeight="28.8527" pictureRotation="0" svgBorderColor="0,0,0,255" blendMode="0" svgFillColor="255,255,255,255" frameJoinStyle="miter" background="false" uuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" positionLock="true" svgBorderWidth="0.2" type="65640" itemRotation="0" excludeFromExports="0" position="243.319,382.696,mm" file="../Gun_Run_Logo.png" northMode="0" groupUuid="" visibility="1" zValue="3" referencePoint="0" id="">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="243.319,382.696,mm" id="" itemRotation="0" visibility="1" groupUuid="" mapUuid="" size="49.3143,31.2967,mm" positionLock="true" opacity="1" positionOnPage="243.319,382.696,mm" outlineWidthM="0.3,mm" referencePoint="0" pictureRotation="0" northOffset="0" pictureWidth="49.3143" templateUuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" svgBorderWidth="0.2" pictureHeight="28.8527" background="false" resizeMode="0" anchorPoint="8" frameJoinStyle="miter" frame="false" type="65640" svgBorderColor="0,0,0,255" uuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" blendMode="0" excludeFromExports="0" file="../Gun_Run_Logo.png" svgFillColor="255,255,255,255" northMode="0" zValue="3">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem size="236.083,0.14328,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" cornerRadiusMeasure="0,mm" positionOnPage="5.84321,406.626,mm" templateUuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" positionLock="true" type="65643" itemRotation="0" excludeFromExports="0" position="5.84321,406.626,mm" groupUuid="" visibility="1" zValue="2" referencePoint="0" id="">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="5.84321,406.626,mm" id="" itemRotation="0" visibility="1" groupUuid="" size="236.083,0.14328,mm" positionLock="true" opacity="1" positionOnPage="5.84321,406.626,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" cornerRadiusMeasure="0,mm" background="false" frameJoinStyle="miter" shapeType="1" frame="false" type="65643" uuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" blendMode="0" excludeFromExports="0" zValue="2">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" alpha="1" type="fill" clip_to_extent="1" force_rhr="0">
+          <layer enabled="1" pass="0" locked="0" 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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="solid"/>
+            <prop k="outline_width" v="0.3"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem size="286.94,392.396,mm" outlineWidthM="0.3,mm" opacity="1" positionOnPage="5.03,5.9483,mm" templateUuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" frame="false" blendMode="0" frameJoinStyle="miter" labelMargin="0,mm" background="true" uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" mapFlags="0" positionLock="true" followPresetName="Marshal overview" type="65639" itemRotation="0" excludeFromExports="0" position="5.03,5.9483,mm" groupUuid="" visibility="1" zValue="1" referencePoint="0" drawCanvasItems="false" mapRotation="0" id="" keepLayerSet="false" followPreset="true">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="5.03,5.9483,mm" id="" labelMargin="0,mm" itemRotation="0" visibility="1" groupUuid="" size="286.94,392.396,mm" followPresetName="Marshal overview" positionLock="true" opacity="1" keepLayerSet="false" drawCanvasItems="false" positionOnPage="5.03,5.9483,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" followPreset="true" mapFlags="0" background="true" frameJoinStyle="miter" frame="false" type="65639" uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" mapRotation="0" blendMode="0" excludeFromExports="0" zValue="1">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent ymin="-33.94797288016832226" xmin="18.36924763341120581" xmax="18.38613924055453452" ymax="-33.9248732774534929"/>
+        <Extent xmin="18.36924763341120581" ymin="-33.94797288016832226" ymax="-33.9248732774534929" xmax="18.38613924055453452"/>
         <LayerSet/>
         <AtlasMap atlasDriven="1" scalingMode="2" margin="0"/>
         <labelBlockingItems/>
@@ -12990,43 +13323,43 @@ def my_form_open(dialog, layer, feature):
         <property key="pdfIncludeMetadata" value="1"/>
         <property key="pdfTextFormat" value="0"/>
       </customproperties>
-      <Atlas coverageLayerName="marshal_overviews" hideCoverage="1" sortFeatures="1" pageNameExpression="&quot;page&quot;" filenamePattern="'output_'||@atlas_featurenumber" sortKey="page" filterFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" enabled="1" sortAscending="1" coverageLayerProvider="ogr"/>
+      <Atlas enabled="1" sortKey="page" hideCoverage="1" sortFeatures="1" pageNameExpression="&quot;page&quot;" filenamePattern="'output_'||@atlas_featurenumber" filterFeatures="0" coverageLayerName="marshal_overviews" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" coverageLayerSource="/home/tim/Documents/GunRunMaps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" coverageLayerProvider="ogr" sortAscending="1"/>
     </Layout>
-    <Layout worldFileMap="" name="Start &amp; Finish Backgrounds" units="mm" printResolution="300">
-      <Snapper snapToItems="1" tolerance="5" snapToGrid="0" snapToGuides="1"/>
-      <Grid offsetY="0" resUnits="mm" offsetX="0" resolution="10" offsetUnits="mm"/>
+    <Layout printResolution="300" name="Start &amp; Finish Backgrounds" worldFileMap="" units="mm">
+      <Snapper snapToGuides="1" tolerance="5" snapToItems="1" snapToGrid="0"/>
+      <Grid offsetX="0" offsetY="0" resUnits="mm" resolution="10" offsetUnits="mm"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" alpha="1" type="fill" clip_to_extent="1" force_rhr="0">
+          <layer enabled="1" pass="0" locked="0" 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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="no"/>
+            <prop k="outline_width" v="0.26"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem size="297,210,mm" outlineWidthM="0.3,mm" opacity="1" positionOnPage="0,0,mm" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" frame="false" blendMode="0" frameJoinStyle="miter" background="true" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" positionLock="false" type="65638" itemRotation="0" excludeFromExports="0" position="0,0,mm" groupUuid="" visibility="1" zValue="0" referencePoint="0" id="">
-          <FrameColor green="0" red="0" blue="0" alpha="255"/>
-          <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+        <LayoutItem position="0,0,mm" id="" itemRotation="0" visibility="1" groupUuid="" size="297,210,mm" positionLock="false" opacity="1" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" background="true" frameJoinStyle="miter" frame="false" type="65638" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" blendMode="0" excludeFromExports="0" zValue="0">
+          <FrameColor alpha="255" red="0" green="0" blue="0"/>
+          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
@@ -13034,151 +13367,151 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem size="9.45865,11,mm" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" outlineWidthM="0.3,mm" opacity="1" positionOnPage="286.027,2,mm" resizeMode="0" northOffset="0" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" frame="false" pictureWidth="6.31767" anchorPoint="0" pictureHeight="7.97477" pictureRotation="330" svgBorderColor="0,0,0,255" blendMode="0" svgFillColor="255,255,255,255" frameJoinStyle="miter" background="false" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" positionLock="true" svgBorderWidth="0.2" type="65640" itemRotation="0" excludeFromExports="0" position="286.027,2,mm" file="arrows/NorthArrow_11.svg" northMode="0" groupUuid="" visibility="1" zValue="4" referencePoint="0" id="">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="286.027,2,mm" id="" itemRotation="0" visibility="1" groupUuid="" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" size="9.45865,11,mm" positionLock="true" opacity="1" positionOnPage="286.027,2,mm" outlineWidthM="0.3,mm" referencePoint="0" pictureRotation="330" northOffset="0" pictureWidth="6.31767" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" svgBorderWidth="0.2" pictureHeight="7.97477" background="false" resizeMode="0" anchorPoint="0" frameJoinStyle="miter" frame="false" type="65640" svgBorderColor="0,0,0,255" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" blendMode="0" excludeFromExports="0" file="arrows/NorthArrow_11.svg" svgFillColor="255,255,255,255" northMode="0" zValue="4">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem size="142.543,10.3185,mm" valign="64" outlineWidthM="0.3,mm" opacity="1" positionOnPage="285.027,205.886,mm" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" positionLock="true" type="65641" itemRotation="270" excludeFromExports="0" labelText="[%upper( &quot;area&quot; )%]" position="285.027,205.886,mm" groupUuid="" htmlState="0" visibility="1" zValue="3" referencePoint="0" marginY="1" id="" marginX="1" halign="1">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="285.027,205.886,mm" id="" itemRotation="270" labelText="[%upper( &quot;area&quot; )%]" htmlState="0" visibility="1" groupUuid="" size="142.543,10.3185,mm" halign="1" positionLock="true" opacity="1" positionOnPage="285.027,205.886,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" marginX="1" valign="64" background="false" frameJoinStyle="miter" frame="false" type="65641" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" blendMode="0" excludeFromExports="0" marginY="1" zValue="3">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor alpha="255" red="0" green="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem height="3" outlineWidthM="0.3,mm" blendMode="0" background="false" minBarWidth="50" style="Single Box" referencePoint="0" itemRotation="0" lineJoinStyle="miter" size="155.102,16.2165,mm" unitType="meters" frame="false" opacity="1" segmentSizeMode="1" alignment="0" lineCapStyle="square" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" numSegments="4" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" excludeFromExports="0" boxContentSpace="1" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" labelBarSpace="3" frameJoinStyle="miter" positionLock="true" outlineWidth="0.3" maxBarWidth="150" type="65646" numMapUnitsPerScaleBarUnit="1" groupUuid="" visibility="1" zValue="2" numSegmentsLeft="2" numUnitsPerSegment="90" segmentMillimeters="28.5458" unitLabel="m" id="" positionOnPage="7,189.669,mm" position="7,189.669,mm">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem type="65646" zValue="2" outlineWidthM="0.3,mm" minBarWidth="50" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" alignment="0" groupUuid="" size="155.102,16.2165,mm" unitType="meters" lineJoinStyle="miter" numUnitsPerSegment="90" numSegmentsLeft="2" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" itemRotation="0" unitLabel="m" labelBarSpace="3" referencePoint="0" background="false" segmentSizeMode="1" segmentMillimeters="28.5458" position="7,189.669,mm" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" numSegments="4" maxBarWidth="150" style="Single Box" boxContentSpace="1" positionOnPage="7,189.669,mm" numMapUnitsPerScaleBarUnit="1" frameJoinStyle="miter" positionLock="true" lineCapStyle="square" excludeFromExports="0" height="3" id="" blendMode="0" visibility="1" opacity="1" outlineWidth="0.3" frame="false">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <text-style fontItalic="0" fontWeight="50" blendMode="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontCapitals="0" fontSize="12" textColor="0,0,0,255" multilineHeight="1" namedStyle="" fontLetterSpacing="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" fontStrikeout="0" fontFamily="Myriad Pro">
-          <text-buffer bufferOpacity="1" bufferJoinStyle="128" bufferSize="1" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255"/>
-          <background shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeType="0" shapeRadiiY="0" shapeBlendMode="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="0" shapeRadiiX="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-          <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+        <text-style textColor="0,0,0,255" fontUnderline="0" namedStyle="" fontItalic="0" fontWordSpacing="0" fontWeight="50" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0" fontCapitals="0" fontStrikeout="0" fontSize="12" textOpacity="1" multilineHeight="1" fontSizeUnit="Point" fontLetterSpacing="0" fontFamily="Myriad Pro">
+          <text-buffer bufferBlendMode="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128" bufferDraw="0" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeDraw="0" shapeSizeUnit="MM" shapeOpacity="1" shapeSizeType="0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeJoinStyle="64" shapeOffsetX="0" shapeOffsetY="0" shapeType="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeRadiiX="0" shapeRotationType="0"/>
+          <shadow shadowRadius="1.5" shadowColor="0,0,0,255" shadowOpacity="0.7" shadowScale="100" shadowBlendMode="6" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
         </text-style>
-        <fillColor green="0" red="0" blue="0" alpha="255"/>
-        <fillColor2 green="255" red="255" blue="255" alpha="255"/>
-        <strokeColor green="0" red="0" blue="0" alpha="255"/>
+        <fillColor alpha="255" red="0" green="0" blue="0"/>
+        <fillColor2 alpha="255" red="255" green="255" blue="255"/>
+        <strokeColor alpha="255" red="0" green="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem size="278.027,180.318,mm" outlineWidthM="0.3,mm" opacity="1" positionOnPage="7,5.5,mm" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" frame="false" blendMode="0" frameJoinStyle="miter" labelMargin="0,mm" background="false" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" mapFlags="0" positionLock="true" followPresetName="Start/Finish" type="65639" itemRotation="0" excludeFromExports="0" position="7,5.5,mm" groupUuid="" visibility="1" zValue="1" referencePoint="0" drawCanvasItems="false" mapRotation="330" id="" keepLayerSet="false" followPreset="true">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="7,5.5,mm" id="" labelMargin="0,mm" itemRotation="0" visibility="1" groupUuid="" size="278.027,180.318,mm" followPresetName="Start/Finish" positionLock="true" opacity="1" keepLayerSet="false" drawCanvasItems="false" positionOnPage="7,5.5,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" followPreset="true" mapFlags="0" background="false" frameJoinStyle="miter" frame="false" type="65639" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" mapRotation="330" blendMode="0" excludeFromExports="0" zValue="1">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapRotation">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="rotation" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapRotation" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="rotation" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="id" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="id" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedRotation">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="angle" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                <Option name="dataDefinedRotation" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="angle" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent ymin="-33.90494830469008747" xmin="18.40843143571575169" xmax="18.41790915398017958" ymax="-33.89880140828828559"/>
+        <Extent xmin="18.40843143571575169" ymin="-33.90494830469008747" ymax="-33.89880140828828559" xmax="18.41790915398017958"/>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" topAnnotationPosition="1" rightFrameDivisions="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" gridFramePenThickness="0.5" unit="1" rightAnnotationPosition="1" leftAnnotationDirection="0" topAnnotationDisplay="3" gridFrameSideFlags="15" leftAnnotationDisplay="3" crossLength="3" topFrameDivisions="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" bottomAnnotationDisplay="3" gridFrameMargin="0" gridFramePenColor="0,0,0,255" show="0" showAnnotation="0" intervalX="5" topAnnotationDirection="0" frameAnnotationDistance="1" leftFrameDivisions="0" frameFillColor2="0,0,0,255" annotationFormat="4" intervalY="5" rightAnnotationDisplay="3" annotationFontColor="0,0,0,255" gridFrameStyle="0" gridFrameWidth="2" gridStyle="0" rightAnnotationDirection="0" annotationExpression="" offsetX="0" bottomAnnotationPosition="1" annotationPrecision="3" name="Grid 1" offsetY="0" leftAnnotationPosition="1" position="3">
+        <ComposerMapGrid topAnnotationDisplay="3" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" topFrameDivisions="0" crossLength="3" gridFrameSideFlags="15" unit="1" annotationFormat="4" gridFramePenThickness="0.5" annotationExpression="" gridFramePenColor="0,0,0,255" bottomAnnotationDisplay="3" frameFillColor1="255,255,255,255" bottomAnnotationDirection="0" annotationFontColor="0,0,0,255" rightAnnotationDisplay="3" position="3" gridStyle="0" topAnnotationPosition="1" bottomFrameDivisions="0" offsetY="0" rightAnnotationPosition="1" show="0" rightFrameDivisions="0" gridFrameWidth="2" rightAnnotationDirection="0" intervalY="5" leftFrameDivisions="0" frameAnnotationDistance="1" showAnnotation="0" annotationPrecision="3" topAnnotationDirection="0" blendMode="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" intervalX="5" bottomAnnotationPosition="1" leftAnnotationDisplay="3" leftAnnotationDirection="0" offsetX="0" gridFrameMargin="0" name="Grid 1">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="195,195,195,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <symbol name="" alpha="1" type="line" clip_to_extent="1" force_rhr="0">
+              <layer enabled="1" pass="0" locked="0" class="SimpleLine">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="195,195,195,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol name="" alpha="1" type="marker" clip_to_extent="1" force_rhr="0">
+              <layer enabled="1" pass="0" locked="0" class="SimpleMarker">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -13194,7 +13527,7 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>WGS84</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
         <AtlasMap atlasDriven="1" scalingMode="2" margin="0.05"/>
         <labelBlockingItems/>
@@ -13222,43 +13555,43 @@ def my_form_open(dialog, layer, feature):
         <property key="svgIncludeMetadata" value="1"/>
         <property key="svgTextFormat" value="0"/>
       </customproperties>
-      <Atlas coverageLayerName="start_finish_area" hideCoverage="1" sortFeatures="1" pageNameExpression="&quot;area&quot;" filenamePattern="'output_'||@atlas_featurenumber" sortKey="area" filterFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/start_finish_area.shp" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" enabled="1" sortAscending="1" coverageLayerProvider="ogr"/>
+      <Atlas enabled="1" sortKey="area" hideCoverage="1" sortFeatures="1" pageNameExpression="&quot;area&quot;" filenamePattern="'output_'||@atlas_featurenumber" filterFeatures="0" coverageLayerName="start_finish_area" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" coverageLayerSource="/home/tim/Documents/GunRunMaps/GIS Base Map/start_finish_area.shp" coverageLayerProvider="ogr" sortAscending="1"/>
     </Layout>
-    <Layout worldFileMap="" name="Fencing" units="mm" printResolution="300">
-      <Snapper snapToItems="1" tolerance="5" snapToGrid="0" snapToGuides="1"/>
-      <Grid offsetY="0" resUnits="mm" offsetX="0" resolution="10" offsetUnits="mm"/>
+    <Layout printResolution="300" name="Fencing" worldFileMap="" units="mm">
+      <Snapper snapToGuides="1" tolerance="5" snapToItems="1" snapToGrid="0"/>
+      <Grid offsetX="0" offsetY="0" resUnits="mm" resolution="10" offsetUnits="mm"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" alpha="1" type="fill" clip_to_extent="1" force_rhr="0">
+          <layer enabled="1" pass="0" locked="0" 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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="no"/>
+            <prop k="outline_width" v="0.26"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem size="297,210,mm" outlineWidthM="0.3,mm" opacity="1" positionOnPage="0,0,mm" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" frame="false" blendMode="0" frameJoinStyle="miter" background="true" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" positionLock="false" type="65638" itemRotation="0" excludeFromExports="0" position="0,0,mm" groupUuid="" visibility="1" zValue="0" referencePoint="0" id="">
-          <FrameColor green="0" red="0" blue="0" alpha="255"/>
-          <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+        <LayoutItem position="0,0,mm" id="" itemRotation="0" visibility="1" groupUuid="" size="297,210,mm" positionLock="false" opacity="1" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" background="true" frameJoinStyle="miter" frame="false" type="65638" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" blendMode="0" excludeFromExports="0" zValue="0">
+          <FrameColor alpha="255" red="0" green="0" blue="0"/>
+          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
@@ -13266,215 +13599,215 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem size="148.46,7.36972,mm" valign="64" outlineWidthM="0.3,mm" opacity="1" positionOnPage="6.76779,190.27,mm" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="FENCING: [% &quot;name&quot; %]" position="6.76779,190.27,mm" groupUuid="" htmlState="0" visibility="1" zValue="11" referencePoint="0" marginY="1" id="" marginX="1" halign="1">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="6.76779,190.27,mm" id="" itemRotation="0" labelText="FENCING: [% &quot;name&quot; %]" htmlState="0" visibility="1" groupUuid="" size="148.46,7.36972,mm" halign="1" positionLock="true" opacity="1" positionOnPage="6.76779,190.27,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" marginX="1" valign="64" background="false" frameJoinStyle="miter" frame="false" type="65641" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" blendMode="0" excludeFromExports="0" marginY="1" zValue="11">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <LabelFont style="Semibold" description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold"/>
+        <FontColor alpha="255" red="0" green="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem size="27.7839,7.51682,mm" valign="32" outlineWidthM="0.3,mm" opacity="1" positionOnPage="211.295,197.64,mm" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="REVISION 2.6" position="211.295,197.64,mm" groupUuid="" htmlState="0" visibility="1" zValue="10" referencePoint="0" marginY="1" id="" marginX="1" halign="2">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="211.295,197.64,mm" id="" itemRotation="0" labelText="REVISION 2.7" htmlState="0" visibility="1" groupUuid="" size="27.7839,7.51682,mm" halign="2" positionLock="true" opacity="1" positionOnPage="211.295,197.64,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" marginX="1" valign="32" background="false" frameJoinStyle="miter" frame="false" type="65641" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" blendMode="0" excludeFromExports="0" marginY="1" zValue="10">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor alpha="255" red="0" green="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem size="67.0856,7.80192,mm" valign="32" outlineWidthM="0.3,mm" opacity="1" positionOnPage="115.637,198.083,mm" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" position="115.637,198.083,mm" groupUuid="" htmlState="0" visibility="1" zValue="9" referencePoint="0" marginY="1" id="" marginX="1" halign="1">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="115.637,198.083,mm" id="" itemRotation="0" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" htmlState="0" visibility="1" groupUuid="" size="67.0856,7.80192,mm" halign="1" positionLock="true" opacity="1" positionOnPage="115.637,198.083,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" marginX="1" valign="32" background="false" frameJoinStyle="miter" frame="false" type="65641" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" blendMode="0" excludeFromExports="0" marginY="1" zValue="9">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor alpha="255" red="0" green="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem size="53.0017,7.80192,mm" valign="32" outlineWidthM="0.3,mm" opacity="1" positionOnPage="59.5581,198.083,mm" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" position="59.5581,198.083,mm" groupUuid="" htmlState="0" visibility="1" zValue="8" referencePoint="0" marginY="1" id="" marginX="1" halign="1">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="59.5581,198.083,mm" id="" itemRotation="0" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" htmlState="0" visibility="1" groupUuid="" size="53.0017,7.80192,mm" halign="1" positionLock="true" opacity="1" positionOnPage="59.5581,198.083,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" marginX="1" valign="32" background="false" frameJoinStyle="miter" frame="false" type="65641" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" blendMode="0" excludeFromExports="0" marginY="1" zValue="8">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor alpha="255" red="0" green="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem size="52.7903,7.80192,mm" valign="32" outlineWidthM="0.3,mm" opacity="1" positionOnPage="6.76779,198.083,mm" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="Page [% @atlas_featurenumber %]" position="6.76779,198.083,mm" groupUuid="" htmlState="0" visibility="1" zValue="7" referencePoint="0" marginY="1" id="" marginX="1" halign="1">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="6.76779,198.083,mm" id="" itemRotation="0" labelText="Page [% @atlas_featurenumber %]" htmlState="0" visibility="1" groupUuid="" size="52.7903,7.80192,mm" halign="1" positionLock="true" opacity="1" positionOnPage="6.76779,198.083,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" marginX="1" valign="32" background="false" frameJoinStyle="miter" frame="false" type="65641" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" blendMode="0" excludeFromExports="0" marginY="1" zValue="7">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor alpha="255" red="0" green="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem size="49.3143,29.8354,mm" mapUuid="" outlineWidthM="0.3,mm" opacity="1" positionOnPage="243.098,175.353,mm" resizeMode="0" northOffset="0" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" frame="false" pictureWidth="49.3143" anchorPoint="8" pictureHeight="28.8527" pictureRotation="0" svgBorderColor="0,0,0,255" blendMode="0" svgFillColor="255,255,255,255" frameJoinStyle="miter" background="false" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" positionLock="true" svgBorderWidth="0.2" type="65640" itemRotation="0" excludeFromExports="0" position="243.098,175.353,mm" file="../Gun_Run_Logo.png" northMode="0" groupUuid="" visibility="1" zValue="6" referencePoint="0" id="">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="243.098,175.353,mm" id="" itemRotation="0" visibility="1" groupUuid="" mapUuid="" size="49.3143,29.8354,mm" positionLock="true" opacity="1" positionOnPage="243.098,175.353,mm" outlineWidthM="0.3,mm" referencePoint="0" pictureRotation="0" northOffset="0" pictureWidth="49.3143" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" svgBorderWidth="0.2" pictureHeight="28.8527" background="false" resizeMode="0" anchorPoint="8" frameJoinStyle="miter" frame="false" type="65640" svgBorderColor="0,0,0,255" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" blendMode="0" excludeFromExports="0" file="../Gun_Run_Logo.png" svgFillColor="255,255,255,255" northMode="0" zValue="6">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem size="56.3557,7.36902,mm" valign="64" outlineWidthM="0.3,mm" opacity="1" positionOnPage="182.723,190.271,mm" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="Sunday, 20 October 2019" position="182.723,190.271,mm" groupUuid="" htmlState="0" visibility="1" zValue="5" referencePoint="0" marginY="1" id="" marginX="1" halign="2">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="182.723,190.271,mm" id="" itemRotation="0" labelText="Sunday, 20 October 2019" htmlState="0" visibility="1" groupUuid="" size="56.3557,7.36902,mm" halign="2" positionLock="true" opacity="1" positionOnPage="182.723,190.271,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" marginX="1" valign="64" background="false" frameJoinStyle="miter" frame="false" type="65641" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" blendMode="0" excludeFromExports="0" marginY="1" zValue="5">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor alpha="255" red="0" green="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem size="232.01,0.14328,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" cornerRadiusMeasure="0,mm" positionOnPage="6.91779,197.79,mm" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" positionLock="true" type="65643" itemRotation="0" excludeFromExports="0" position="6.91779,197.79,mm" groupUuid="" visibility="1" zValue="4" referencePoint="0" id="">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="6.91779,197.79,mm" id="" itemRotation="0" visibility="1" groupUuid="" size="232.01,0.14328,mm" positionLock="true" opacity="1" positionOnPage="6.91779,197.79,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" cornerRadiusMeasure="0,mm" background="false" frameJoinStyle="miter" shapeType="1" frame="false" type="65643" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" blendMode="0" excludeFromExports="0" zValue="4">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" alpha="1" type="fill" clip_to_extent="1" force_rhr="0">
+          <layer enabled="1" pass="0" locked="0" 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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="solid"/>
+            <prop k="outline_width" v="0.3"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem height="2" outlineWidthM="0.3,mm" blendMode="0" background="false" minBarWidth="25" style="Double Box" referencePoint="0" itemRotation="0" lineJoinStyle="round" size="102.997,15.8378,mm" unitType="meters" frame="false" opacity="1" segmentSizeMode="1" alignment="0" lineCapStyle="square" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" numSegments="2" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" excludeFromExports="0" boxContentSpace="0.2" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" labelBarSpace="1" frameJoinStyle="miter" positionLock="true" outlineWidth="0.2" maxBarWidth="100" type="65646" numMapUnitsPerScaleBarUnit="1" groupUuid="" visibility="1" zValue="3" numSegmentsLeft="2" numUnitsPerSegment="10" segmentMillimeters="31.1668" unitLabel="m" id="" positionOnPage="6.76779,2.8482,mm" position="6.76779,2.8482,mm">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem type="65646" zValue="3" outlineWidthM="0.3,mm" minBarWidth="25" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" alignment="0" groupUuid="" size="78.3053,15.8378,mm" unitType="meters" lineJoinStyle="round" numUnitsPerSegment="20" numSegmentsLeft="2" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" itemRotation="0" unitLabel="m" labelBarSpace="1" referencePoint="0" background="false" segmentSizeMode="1" segmentMillimeters="22.9361" position="6.76779,2.8482,mm" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" numSegments="2" maxBarWidth="100" style="Double Box" boxContentSpace="0.2" positionOnPage="6.76779,2.8482,mm" numMapUnitsPerScaleBarUnit="1" frameJoinStyle="miter" positionLock="true" lineCapStyle="square" excludeFromExports="0" height="2" id="" blendMode="0" visibility="1" opacity="1" outlineWidth="0.2" frame="false">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <text-style fontItalic="0" fontWeight="50" blendMode="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontCapitals="0" fontSize="12" textColor="0,0,0,255" multilineHeight="1" namedStyle="" fontLetterSpacing="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" fontStrikeout="0" fontFamily="Myriad Pro">
-          <text-buffer bufferOpacity="1" bufferJoinStyle="128" bufferSize="1" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255"/>
-          <background shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeType="0" shapeRadiiY="0" shapeBlendMode="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeRotation="0" shapeRotationType="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="0" shapeRadiiX="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM"/>
-          <shadow shadowOffsetAngle="135" shadowScale="100" shadowColor="0,0,0,255" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowDraw="0" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
+        <text-style textColor="0,0,0,255" fontUnderline="0" namedStyle="" fontItalic="0" fontWordSpacing="0" fontWeight="50" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0" fontCapitals="0" fontStrikeout="0" fontSize="12" textOpacity="1" multilineHeight="1" fontSizeUnit="Point" fontLetterSpacing="0" fontFamily="Myriad Pro">
+          <text-buffer bufferBlendMode="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128" bufferDraw="0" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeDraw="0" shapeSizeUnit="MM" shapeOpacity="1" shapeSizeType="0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeJoinStyle="64" shapeOffsetX="0" shapeOffsetY="0" shapeType="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeRadiiX="0" shapeRotationType="0"/>
+          <shadow shadowRadius="1.5" shadowColor="0,0,0,255" shadowOpacity="0.7" shadowScale="100" shadowBlendMode="6" shadowUnder="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
         </text-style>
-        <fillColor green="0" red="0" blue="0" alpha="255"/>
-        <fillColor2 green="255" red="255" blue="255" alpha="255"/>
-        <strokeColor green="0" red="0" blue="0" alpha="255"/>
+        <fillColor alpha="255" red="0" green="0" blue="0"/>
+        <fillColor2 alpha="255" red="255" green="255" blue="255"/>
+        <strokeColor alpha="255" red="0" green="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem title="" outlineWidthM="0.3,mm" blendMode="0" background="true" fontColor="#000000" referencePoint="0" itemRotation="0" size="38.1563,54.9504,mm" frame="true" titleAlignment="1" opacity="1" columnCount="1" equalColumnWidth="1" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" rasterBorderColor="0,0,0,255" excludeFromExports="0" wmsLegendHeight="25" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" resizeToContents="0" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" boxSpace="2" frameJoinStyle="miter" rasterBorderWidth="0" positionLock="true" wmsLegendWidth="50" symbolHeight="4" symbolWidth="7" type="65642" legendFilterByAtlas="0" splitLayer="0" rasterBorder="1" symbolAlignment="1" groupUuid="" visibility="1" zValue="2" lineSpacing="1" columnSpace="2" id="" wrapChar="" positionOnPage="256.808,2.9982,mm" position="256.808,2.9982,mm">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem type="65642" zValue="2" rasterBorderWidth="0" outlineWidthM="0.3,mm" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" wmsLegendWidth="50" groupUuid="" size="38.1563,54.9504,mm" rasterBorderColor="0,0,0,255" symbolAlignment="1" columnCount="1" titleAlignment="1" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" itemRotation="0" wmsLegendHeight="25" referencePoint="0" splitLayer="0" boxSpace="2" background="true" lineSpacing="1" equalColumnWidth="1" symbolHeight="4" fontColor="#000000" resizeToContents="0" title="" position="256.808,2.9982,mm" wrapChar="" positionOnPage="256.808,2.9982,mm" symbolWidth="7" frameJoinStyle="miter" positionLock="true" excludeFromExports="0" id="" blendMode="0" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" columnSpace="2" visibility="1" rasterBorder="1" opacity="1" frame="true" legendFilterByAtlas="0">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <styles>
           <style name="title" alignment="1">
-            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" style="Bold"/>
+            <styleFont style="Bold" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold"/>
           </style>
-          <style name="group" marginTop="3" alignment="1">
-            <styleFont description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style name="group" alignment="1" marginTop="3">
+            <styleFont style="Semibold" description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
-          <style name="subgroup" marginTop="3" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style name="subgroup" alignment="1" marginTop="3">
+            <styleFont style="Semibold" description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
-          <style name="symbol" marginTop="2.5" alignment="1">
-            <styleFont description="Myriad Pro,9,-1,5,50,0,0,0,0,0" style=""/>
+          <style name="symbol" alignment="1" marginTop="2.5">
+            <styleFont style="" description="Myriad Pro,9,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style marginLeft="2" name="symbolLabel" marginTop="2" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
+          <style marginLeft="2" name="symbolLabel" alignment="1" marginTop="2">
+            <styleFont style="Regular" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties/>
-          <layer-tree-group expanded="1" checked="Qt::Checked" name="Fencing and Cones">
+          <layer-tree-group name="Fencing and Cones" checked="Qt::Checked" expanded="1">
             <customproperties/>
-            <layer-tree-layer providerKey="ogr" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" checked="Qt::Checked" source="./fencing.shp|layername=fencing" name="fencing">
+            <layer-tree-layer source="./fencing.shp|layername=fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" name="fencing" providerKey="ogr" checked="Qt::Checked" expanded="1">
               <customproperties>
                 <property key="expandedLegendNodes" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
                 <property key="legend/expressionFilter" value=""/>
@@ -13484,9 +13817,9 @@ def my_form_open(dialog, layer, feature):
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group expanded="1" checked="Qt::Checked" name="Routes">
+          <layer-tree-group name="Routes" checked="Qt::Checked" expanded="1">
             <customproperties/>
-            <layer-tree-layer providerKey="ogr" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" checked="Qt::Checked" source="./all_routes.shp|layername=all_routes" name="all_routes">
+            <layer-tree-layer source="./all_routes.shp|layername=all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" name="all_routes" providerKey="ogr" checked="Qt::Checked" expanded="1">
               <customproperties>
                 <property key="expandedLegendNodes"/>
                 <property key="legend/node-order" value="1,2,3"/>
@@ -13494,48 +13827,45 @@ def my_form_open(dialog, layer, feature):
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <custom-order enabled="0">
-            <item>fencing_70522fe0_a771_4170_98b2_d5843f62a7ab</item>
-            <item>all_routes_5833accf_77da_42ef_a24a_197208cd2190</item>
-          </custom-order>
+          <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem size="283.418,180.92,mm" outlineWidthM="0.3,mm" opacity="0.9" positionOnPage="6.76779,9.35102,mm" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" frame="false" blendMode="0" frameJoinStyle="miter" labelMargin="0,mm" background="false" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" mapFlags="0" positionLock="true" followPresetName="Fencing" type="65639" itemRotation="0" excludeFromExports="0" position="6.76779,9.35102,mm" groupUuid="" visibility="1" zValue="1" referencePoint="0" drawCanvasItems="false" mapRotation="0" id="" keepLayerSet="false" followPreset="true">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="6.76779,9.35102,mm" id="" labelMargin="0,mm" itemRotation="0" visibility="1" groupUuid="" size="283.418,180.92,mm" followPresetName="Fencing" positionLock="true" opacity="0.9" keepLayerSet="false" drawCanvasItems="false" positionOnPage="6.76779,9.35102,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" followPreset="true" mapFlags="0" background="false" frameJoinStyle="miter" frame="false" type="65639" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" mapRotation="0" blendMode="0" excludeFromExports="0" zValue="1">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapRotation">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="expression"/>
-                  <Option type="Map" name="transformer">
-                    <Option type="Map" name="d">
-                      <Option type="double" value="1" name="exponent"/>
-                      <Option type="double" value="360" name="maxOutput"/>
-                      <Option type="double" value="0" name="maxValue"/>
-                      <Option type="double" value="0" name="minOutput"/>
-                      <Option type="double" value="0" name="minValue"/>
-                      <Option type="double" value="0" name="nullOutput"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapRotation" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="expression" type="QString"/>
+                  <Option name="transformer" type="Map">
+                    <Option name="d" type="Map">
+                      <Option value="1" name="exponent" type="double"/>
+                      <Option value="360" name="maxOutput" type="double"/>
+                      <Option value="0" name="maxValue" type="double"/>
+                      <Option value="0" name="minOutput" type="double"/>
+                      <Option value="0" name="minValue" type="double"/>
+                      <Option value="0" name="nullOutput" type="double"/>
                     </Option>
-                    <Option type="int" value="0" name="t"/>
+                    <Option value="0" name="t" type="int"/>
                   </Option>
-                  <Option type="int" value="3" name="type"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedRotation">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="angle" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                <Option name="dataDefinedRotation" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="angle" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent ymin="-33.90016889833408698" xmin="18.40766169031488175" xmax="18.40864485748149804" ymax="-33.89954129414520878"/>
+        <Extent xmin="18.40867869996568729" ymin="-33.90700438237571035" ymax="-33.90529860282031649" xmax="18.41135087214374622"/>
         <crs>
           <spatialrefsys>
             <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
@@ -13549,62 +13879,62 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" topAnnotationPosition="1" rightFrameDivisions="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" gridFramePenThickness="0.5" unit="1" rightAnnotationPosition="1" leftAnnotationDirection="0" topAnnotationDisplay="3" gridFrameSideFlags="15" leftAnnotationDisplay="3" crossLength="3" topFrameDivisions="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" bottomAnnotationDisplay="3" gridFrameMargin="0" gridFramePenColor="0,0,0,255" show="0" showAnnotation="0" intervalX="5" topAnnotationDirection="0" frameAnnotationDistance="1" leftFrameDivisions="0" frameFillColor2="0,0,0,255" annotationFormat="4" intervalY="5" rightAnnotationDisplay="3" annotationFontColor="0,0,0,255" gridFrameStyle="0" gridFrameWidth="2" gridStyle="0" rightAnnotationDirection="0" annotationExpression="" offsetX="0" bottomAnnotationPosition="1" annotationPrecision="3" name="Grid 1" offsetY="0" leftAnnotationPosition="1" position="3">
+        <ComposerMapGrid topAnnotationDisplay="3" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" topFrameDivisions="0" crossLength="3" gridFrameSideFlags="15" unit="1" annotationFormat="4" gridFramePenThickness="0.5" annotationExpression="" gridFramePenColor="0,0,0,255" bottomAnnotationDisplay="3" frameFillColor1="255,255,255,255" bottomAnnotationDirection="0" annotationFontColor="0,0,0,255" rightAnnotationDisplay="3" position="3" gridStyle="0" topAnnotationPosition="1" bottomFrameDivisions="0" offsetY="0" rightAnnotationPosition="1" show="0" rightFrameDivisions="0" gridFrameWidth="2" rightAnnotationDirection="0" intervalY="5" leftFrameDivisions="0" frameAnnotationDistance="1" showAnnotation="0" annotationPrecision="3" topAnnotationDirection="0" blendMode="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" intervalX="5" bottomAnnotationPosition="1" leftAnnotationDisplay="3" leftAnnotationDirection="0" offsetX="0" gridFrameMargin="0" name="Grid 1">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="195,195,195,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <symbol name="" alpha="1" type="line" clip_to_extent="1" force_rhr="0">
+              <layer enabled="1" pass="0" locked="0" class="SimpleLine">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="195,195,195,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol name="" alpha="1" type="marker" clip_to_extent="1" force_rhr="0">
+              <layer enabled="1" pass="0" locked="0" class="SimpleMarker">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -13620,7 +13950,7 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>WGS84</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
         <AtlasMap atlasDriven="1" scalingMode="2" margin="0.40000000000000002"/>
         <labelBlockingItems/>
@@ -13639,43 +13969,43 @@ def my_form_open(dialog, layer, feature):
         <property key="pdfTextFormat" value="0"/>
         <property key="rasterize" value="true"/>
       </customproperties>
-      <Atlas coverageLayerName="fence_groups" hideCoverage="1" sortFeatures="1" pageNameExpression="&quot;name&quot;" filenamePattern="'output_'||@atlas_featurenumber" sortKey="group" filterFeatures="0" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" coverageLayer="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" enabled="1" sortAscending="1" coverageLayerProvider="virtual"/>
+      <Atlas enabled="1" sortKey="group" hideCoverage="1" sortFeatures="1" pageNameExpression="&quot;name&quot;" filenamePattern="'output_'||@atlas_featurenumber" filterFeatures="0" coverageLayerName="fence_groups" coverageLayer="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" coverageLayerProvider="virtual" sortAscending="1"/>
     </Layout>
-    <Layout worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" name="Ask Me" units="mm" printResolution="144">
-      <Snapper snapToItems="1" tolerance="5" snapToGrid="0" snapToGuides="1"/>
-      <Grid offsetY="0" resUnits="mm" offsetX="0" resolution="9" offsetUnits="mm"/>
+    <Layout printResolution="144" name="Ask Me" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" units="mm">
+      <Snapper snapToGuides="1" tolerance="5" snapToItems="1" snapToGrid="0"/>
+      <Grid offsetX="0" offsetY="0" resUnits="mm" resolution="9" offsetUnits="mm"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" alpha="1" type="fill" clip_to_extent="1" force_rhr="0">
+          <layer enabled="1" pass="0" locked="0" 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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="no"/>
+            <prop k="outline_width" v="0.26"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem size="297,210,mm" outlineWidthM="0.3,mm" opacity="1" positionOnPage="0,0,mm" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" frame="false" blendMode="0" frameJoinStyle="miter" background="true" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" positionLock="false" type="65638" itemRotation="0" excludeFromExports="0" position="0,0,mm" groupUuid="" visibility="1" zValue="0" referencePoint="0" id="">
-          <FrameColor green="0" red="0" blue="0" alpha="255"/>
-          <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+        <LayoutItem position="0,0,mm" id="" itemRotation="0" visibility="1" groupUuid="" size="297,210,mm" positionLock="false" opacity="1" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" background="true" frameJoinStyle="miter" frame="false" type="65638" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" blendMode="0" excludeFromExports="0" zValue="0">
+          <FrameColor alpha="255" red="0" green="0" blue="0"/>
+          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
@@ -13685,75 +14015,75 @@ def my_form_open(dialog, layer, feature):
           <Guide orientation="2" page="0" units="mm" position="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem size="83.9998,10.4638,mm" valign="64" outlineWidthM="0.3,mm" opacity="1" positionOnPage="4.43449,186.634,mm" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" positionLock="false" type="65641" itemRotation="0" excludeFromExports="0" labelText="Directions to Start of Race" position="4.43449,186.634,mm" groupUuid="" htmlState="0" visibility="1" zValue="8" referencePoint="0" marginY="1" id="" marginX="1" halign="1">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="4.43449,186.634,mm" id="" itemRotation="0" labelText="Directions to Start of Race" htmlState="0" visibility="1" groupUuid="" size="83.9998,10.4638,mm" halign="1" positionLock="false" opacity="1" positionOnPage="4.43449,186.634,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" marginX="1" valign="64" background="false" frameJoinStyle="miter" frame="false" type="65641" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" blendMode="0" excludeFromExports="0" marginY="1" zValue="8">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <LabelFont style="Regular" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor alpha="255" red="0" green="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem size="48.2923,9.511,mm" valign="32" outlineWidthM="0.3,mm" opacity="1" positionOnPage="4.43449,197.498,mm" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" positionLock="false" type="65641" itemRotation="0" excludeFromExports="0" labelText="Gun Run" position="4.43449,197.498,mm" groupUuid="" htmlState="0" visibility="1" zValue="7" referencePoint="0" marginY="1" id="" marginX="1" halign="1">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="4.43449,197.498,mm" id="" itemRotation="0" labelText="Gun Run" htmlState="0" visibility="1" groupUuid="" size="48.2923,9.511,mm" halign="1" positionLock="false" opacity="1" positionOnPage="4.43449,197.498,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" marginX="1" valign="32" background="false" frameJoinStyle="miter" frame="false" type="65641" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" blendMode="0" excludeFromExports="0" marginY="1" zValue="7">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor alpha="255" red="0" green="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem title="" outlineWidthM="0.3,mm" blendMode="0" background="true" fontColor="#000000" referencePoint="0" itemRotation="0" size="59.0766,76,mm" frame="true" titleAlignment="1" opacity="1" columnCount="1" equalColumnWidth="0" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" rasterBorderColor="0,0,0,255" excludeFromExports="0" wmsLegendHeight="25" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" resizeToContents="1" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" boxSpace="2" frameJoinStyle="round" rasterBorderWidth="0" positionLock="false" wmsLegendWidth="50" symbolHeight="5" symbolWidth="9" type="65642" legendFilterByAtlas="0" splitLayer="0" rasterBorder="1" symbolAlignment="1" groupUuid="" visibility="1" zValue="6" lineSpacing="2" legendFilterByMap="1" columnSpace="0" id="" wrapChar="" positionOnPage="10.096,10.8563,mm" position="10.096,10.8563,mm">
-        <FrameColor green="139" red="139" blue="139" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem type="65642" zValue="6" rasterBorderWidth="0" outlineWidthM="0.3,mm" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" wmsLegendWidth="50" groupUuid="" size="59.0766,76,mm" rasterBorderColor="0,0,0,255" symbolAlignment="1" legendFilterByMap="1" columnCount="1" titleAlignment="1" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" itemRotation="0" wmsLegendHeight="25" referencePoint="0" splitLayer="0" boxSpace="2" background="true" lineSpacing="2" equalColumnWidth="0" symbolHeight="5" fontColor="#000000" resizeToContents="1" title="" position="10.096,10.8563,mm" wrapChar="" positionOnPage="10.096,10.8563,mm" symbolWidth="9" frameJoinStyle="round" positionLock="false" excludeFromExports="0" id="" blendMode="0" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" columnSpace="0" visibility="1" rasterBorder="1" opacity="1" frame="true" legendFilterByAtlas="0">
+        <FrameColor alpha="255" red="139" green="139" blue="139"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <styles>
           <style name="title" alignment="1">
-            <styleFont description="Myriad Pro,16,-1,5,50,0,0,0,0,0" style=""/>
+            <styleFont style="" description="Myriad Pro,16,-1,5,50,0,0,0,0,0"/>
           </style>
           <style name="group" alignment="1">
-            <styleFont description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+            <styleFont style="Semibold" description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
           <style name="subgroup" alignment="1">
-            <styleFont description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+            <styleFont style="Semibold" description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
-          <style name="symbol" marginTop="2.5" alignment="1">
-            <styleFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0" style=""/>
+          <style name="symbol" alignment="1" marginTop="2.5">
+            <styleFont style="" description="Myriad Pro,12,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style marginLeft="3" name="symbolLabel" marginTop="2.5" alignment="1">
-            <styleFont description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
+          <style marginLeft="3" name="symbolLabel" alignment="1" marginTop="2.5">
+            <styleFont style="Regular" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties/>
-          <layer-tree-group expanded="1" checked="Qt::Checked" name="Ask Me">
+          <layer-tree-group name="Ask Me" checked="Qt::Checked" expanded="1">
             <customproperties>
               <property key="legend/title-style" value="hidden"/>
             </customproperties>
-            <layer-tree-layer providerKey="ogr" expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" checked="Qt::Checked" source="./poi_labels.shp|layername=poi_labels" name="poi_labels">
+            <layer-tree-layer source="./poi_labels.shp|layername=poi_labels" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" name="poi_labels" providerKey="ogr" checked="Qt::Checked" expanded="1">
               <customproperties>
                 <property key="legend/label-0" value="Start/Finish"/>
                 <property key="legend/label-1" value="Toilets"/>
@@ -13764,7 +14094,7 @@ def my_form_open(dialog, layer, feature):
                 <property key="legend/title-style" value="hidden"/>
               </customproperties>
             </layer-tree-layer>
-            <layer-tree-layer providerKey="ogr" expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" checked="Qt::Checked" source="./directions_to_start.shp|layername=directions_to_start" name="directions_to_start">
+            <layer-tree-layer source="./directions_to_start.shp|layername=directions_to_start" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" name="directions_to_start" providerKey="ogr" checked="Qt::Checked" 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)"/>
@@ -13776,124 +14106,124 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem size="27.7839,6.871,mm" valign="32" outlineWidthM="0.3,mm" opacity="1" positionOnPage="221.862,190.027,mm" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" positionLock="false" type="65641" itemRotation="0" excludeFromExports="0" labelText="REVISION 1.0" position="221.862,190.027,mm" groupUuid="" htmlState="0" visibility="1" zValue="5" referencePoint="0" marginY="1" id="" marginX="1" halign="2">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="221.862,190.027,mm" id="" itemRotation="0" labelText="REVISION 1.0" htmlState="0" visibility="1" groupUuid="" size="27.7839,6.871,mm" halign="2" positionLock="false" opacity="1" positionOnPage="221.862,190.027,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" marginX="1" valign="32" background="false" frameJoinStyle="miter" frame="false" type="65641" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" blendMode="0" excludeFromExports="0" marginY="1" zValue="5">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor alpha="255" red="0" green="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem size="51.6706,6.60801,mm" valign="64" outlineWidthM="0.3,mm" opacity="1" positionOnPage="197.975,197.498,mm" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" positionLock="false" type="65641" itemRotation="0" excludeFromExports="0" labelText="Sunday, 20 October 2019" position="197.975,197.498,mm" groupUuid="" htmlState="0" visibility="1" zValue="4" referencePoint="0" marginY="1" id="" marginX="1" halign="2">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="197.975,197.498,mm" id="" itemRotation="0" labelText="Sunday, 20 October 2019" htmlState="0" visibility="1" groupUuid="" size="51.6706,6.60801,mm" halign="2" positionLock="false" opacity="1" positionOnPage="197.975,197.498,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" marginX="1" valign="64" background="false" frameJoinStyle="miter" frame="false" type="65641" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" blendMode="0" excludeFromExports="0" marginY="1" zValue="4">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor alpha="255" red="0" green="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem size="42.9838,24.3824,mm" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" outlineWidthM="0.3,mm" opacity="1" positionOnPage="249.646,179.724,mm" resizeMode="0" northOffset="0" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" frame="false" pictureWidth="41.6737" anchorPoint="4" pictureHeight="24.3824" pictureRotation="0" svgBorderColor="0,0,0,255" blendMode="0" svgFillColor="255,255,255,255" frameJoinStyle="miter" background="false" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" positionLock="false" svgBorderWidth="0.2" type="65640" itemRotation="0" excludeFromExports="0" position="249.646,179.724,mm" file="../Gun_Run_Logo.png" northMode="0" groupUuid="" visibility="1" zValue="3" referencePoint="0" id="">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="249.646,179.724,mm" id="" itemRotation="0" visibility="1" groupUuid="" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" size="42.9838,24.3824,mm" positionLock="false" opacity="1" positionOnPage="249.646,179.724,mm" outlineWidthM="0.3,mm" referencePoint="0" pictureRotation="0" northOffset="0" pictureWidth="41.6737" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" svgBorderWidth="0.2" pictureHeight="24.3824" background="false" resizeMode="0" anchorPoint="4" frameJoinStyle="miter" frame="false" type="65640" svgBorderColor="0,0,0,255" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" blendMode="0" excludeFromExports="0" file="../Gun_Run_Logo.png" svgFillColor="255,255,255,255" northMode="0" zValue="3">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem size="244.912,0.1,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" cornerRadiusMeasure="0,mm" positionOnPage="4.58449,197.248,mm" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" positionLock="false" type="65643" itemRotation="0" excludeFromExports="0" position="4.58449,197.248,mm" groupUuid="" visibility="1" zValue="2" referencePoint="0" id="">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="4.58449,197.248,mm" id="" itemRotation="0" visibility="1" groupUuid="" size="244.912,0.1,mm" positionLock="false" opacity="1" positionOnPage="4.58449,197.248,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" cornerRadiusMeasure="0,mm" background="false" frameJoinStyle="miter" shapeType="1" frame="false" type="65643" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" blendMode="0" excludeFromExports="0" zValue="2">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" alpha="1" type="fill" clip_to_extent="1" force_rhr="0">
+          <layer enabled="1" pass="0" locked="0" 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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="solid"/>
+            <prop k="outline_width" v="0.3"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem size="288.007,183.616,mm" outlineWidthM="0.3,mm" opacity="1" positionOnPage="4.43449,6.411,mm" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" frame="false" blendMode="0" frameJoinStyle="miter" labelMargin="0,mm" background="true" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" mapFlags="0" positionLock="false" followPresetName="Ask Me" type="65639" itemRotation="0" excludeFromExports="0" position="4.43449,6.411,mm" groupUuid="" visibility="1" zValue="1" referencePoint="0" drawCanvasItems="false" mapRotation="0" id="" keepLayerSet="false" followPreset="true">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="4.43449,6.411,mm" id="" labelMargin="0,mm" itemRotation="0" visibility="1" groupUuid="" size="288.007,183.616,mm" followPresetName="Ask Me" positionLock="false" opacity="1" keepLayerSet="false" drawCanvasItems="false" positionOnPage="4.43449,6.411,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" followPreset="true" mapFlags="0" background="true" frameJoinStyle="miter" frame="false" type="65639" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" mapRotation="0" blendMode="0" excludeFromExports="0" zValue="1">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="int" value="1" name="type"/>
-                  <Option type="QString" value="" name="val"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="1" name="type" type="int"/>
+                  <Option value="" name="val" type="QString"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="int" value="1" name="type"/>
-                  <Option type="QString" value="" name="val"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="1" name="type" type="int"/>
+                  <Option value="" name="val" type="QString"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="int" value="1" name="type"/>
-                  <Option type="QString" value="" name="val"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="1" name="type" type="int"/>
+                  <Option value="" name="val" type="QString"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent ymin="-33.90994364588821952" xmin="18.39762336729721071" xmax="18.41789384089274151" ymax="-33.8970204297764468"/>
+        <Extent xmin="18.39762336729721071" ymin="-33.90994364588821952" ymax="-33.8970204297764468" xmax="18.41789384089274151"/>
         <crs>
           <spatialrefsys>
             <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
@@ -13907,68 +14237,68 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" topAnnotationPosition="1" rightFrameDivisions="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" gridFramePenThickness="0.5" unit="0" rightAnnotationPosition="1" leftAnnotationDirection="0" topAnnotationDisplay="0" gridFrameSideFlags="15" leftAnnotationDisplay="0" crossLength="3" topFrameDivisions="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" bottomAnnotationDisplay="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" show="0" showAnnotation="0" intervalX="0" topAnnotationDirection="0" frameAnnotationDistance="1" leftFrameDivisions="0" frameFillColor2="0,0,0,255" annotationFormat="0" intervalY="0" rightAnnotationDisplay="0" annotationFontColor="0,0,0,255" gridFrameStyle="0" gridFrameWidth="2" gridStyle="0" rightAnnotationDirection="0" annotationExpression="" offsetX="0" bottomAnnotationPosition="1" annotationPrecision="3" name="Grid 1" offsetY="0" leftAnnotationPosition="1" position="3">
+        <ComposerMapGrid topAnnotationDisplay="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" topFrameDivisions="0" crossLength="3" gridFrameSideFlags="15" unit="0" annotationFormat="0" gridFramePenThickness="0.5" annotationExpression="" gridFramePenColor="0,0,0,255" bottomAnnotationDisplay="0" frameFillColor1="255,255,255,255" bottomAnnotationDirection="0" annotationFontColor="0,0,0,255" rightAnnotationDisplay="0" position="3" gridStyle="0" topAnnotationPosition="1" bottomFrameDivisions="0" offsetY="0" rightAnnotationPosition="1" show="0" rightFrameDivisions="0" gridFrameWidth="2" rightAnnotationDirection="0" intervalY="0" leftFrameDivisions="0" frameAnnotationDistance="1" showAnnotation="0" annotationPrecision="3" topAnnotationDirection="0" blendMode="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" intervalX="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" leftAnnotationDirection="0" offsetX="0" gridFrameMargin="0" name="Grid 1">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <symbol name="" alpha="1" type="line" clip_to_extent="1" force_rhr="0">
+              <layer enabled="1" pass="0" locked="0" class="SimpleLine">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol name="" alpha="1" type="marker" clip_to_extent="1" force_rhr="0">
+              <layer enabled="1" pass="0" locked="0" class="SimpleMarker">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
         <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
         <labelBlockingItems/>
@@ -13987,43 +14317,43 @@ def my_form_open(dialog, layer, feature):
         <property key="pdfTextFormat" value="0"/>
         <property key="singleFile" value="true"/>
       </customproperties>
-      <Atlas hideCoverage="0" sortFeatures="0" pageNameExpression="" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" filterFeatures="0" coverageLayer="" enabled="0"/>
+      <Atlas enabled="0" hideCoverage="0" sortFeatures="0" pageNameExpression="" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" filterFeatures="0" coverageLayer=""/>
     </Layout>
-    <Layout worldFileMap="" name="All Routes" units="mm" printResolution="144">
-      <Snapper snapToItems="1" tolerance="5" snapToGrid="0" snapToGuides="1"/>
-      <Grid offsetY="0" resUnits="mm" offsetX="0" resolution="10" offsetUnits="mm"/>
+    <Layout printResolution="144" name="All Routes" worldFileMap="" units="mm">
+      <Snapper snapToGuides="1" tolerance="5" snapToItems="1" snapToGrid="0"/>
+      <Grid offsetX="0" offsetY="0" resUnits="mm" resolution="10" offsetUnits="mm"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" alpha="1" type="fill" clip_to_extent="1" force_rhr="0">
+          <layer enabled="1" pass="0" locked="0" 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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="no"/>
+            <prop k="outline_width" v="0.26"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem size="297,210,mm" outlineWidthM="0.3,mm" opacity="1" positionOnPage="0,0,mm" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" frame="false" blendMode="0" frameJoinStyle="miter" background="true" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" positionLock="false" type="65638" itemRotation="0" excludeFromExports="0" position="0,0,mm" groupUuid="" visibility="1" zValue="0" referencePoint="0" id="">
-          <FrameColor green="0" red="0" blue="0" alpha="255"/>
-          <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+        <LayoutItem position="0,0,mm" id="" itemRotation="0" visibility="1" groupUuid="" size="297,210,mm" positionLock="false" opacity="1" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" background="true" frameJoinStyle="miter" frame="false" type="65638" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" blendMode="0" excludeFromExports="0" zValue="0">
+          <FrameColor alpha="255" red="0" green="0" blue="0"/>
+          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
@@ -14033,299 +14363,299 @@ def my_form_open(dialog, layer, feature):
           <Guide orientation="2" page="0" units="mm" position="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem size="57.4836,6.8714,mm" valign="64" outlineWidthM="0.3,mm" opacity="1" positionOnPage="204.225,191.81,mm" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="REVISION 1.6" position="204.225,191.81,mm" groupUuid="" htmlState="0" visibility="1" zValue="6" referencePoint="0" marginY="1" id="" marginX="1" halign="2">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="204.225,191.81,mm" id="" itemRotation="0" labelText="REVISION 1.6" htmlState="0" visibility="1" groupUuid="" size="57.4836,6.8714,mm" halign="2" positionLock="true" opacity="1" positionOnPage="204.225,191.81,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" marginX="1" valign="64" background="false" frameJoinStyle="miter" frame="false" type="65641" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" blendMode="0" excludeFromExports="0" marginY="1" zValue="6">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor alpha="255" red="0" green="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem size="51.6706,6.60801,mm" valign="64" outlineWidthM="0.3,mm" opacity="1" positionOnPage="210.038,199.082,mm" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="Sunday, 20 October 2019" position="210.038,199.082,mm" groupUuid="" htmlState="0" visibility="1" zValue="5" referencePoint="0" marginY="1" id="" marginX="1" halign="2">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="210.038,199.082,mm" id="" itemRotation="0" labelText="Sunday, 20 October 2019" htmlState="0" visibility="1" groupUuid="" size="51.6706,6.60801,mm" halign="2" positionLock="true" opacity="1" positionOnPage="210.038,199.082,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" marginX="1" valign="64" background="false" frameJoinStyle="miter" frame="false" type="65641" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" blendMode="0" excludeFromExports="0" marginY="1" zValue="5">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor alpha="255" red="0" green="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem size="29.7523,17.4718,mm" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" outlineWidthM="0.3,mm" opacity="1" positionOnPage="262.196,188.218,mm" resizeMode="0" northOffset="0" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" frame="false" pictureWidth="29.7523" anchorPoint="4" pictureHeight="17.4074" pictureRotation="0" svgBorderColor="0,0,0,255" blendMode="0" svgFillColor="255,255,255,255" frameJoinStyle="miter" background="false" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" positionLock="true" svgBorderWidth="0.2" type="65640" itemRotation="0" excludeFromExports="0" position="262.196,188.218,mm" file="../Gun_Run_Logo.png" northMode="0" groupUuid="" visibility="1" zValue="4" referencePoint="0" id="">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="262.196,188.218,mm" id="" itemRotation="0" visibility="1" groupUuid="" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" size="29.7523,17.4718,mm" positionLock="true" opacity="1" positionOnPage="262.196,188.218,mm" outlineWidthM="0.3,mm" referencePoint="0" pictureRotation="0" northOffset="0" pictureWidth="29.7523" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" svgBorderWidth="0.2" pictureHeight="17.4074" background="false" resizeMode="0" anchorPoint="4" frameJoinStyle="miter" frame="false" type="65640" svgBorderColor="0,0,0,255" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" blendMode="0" excludeFromExports="0" file="../Gun_Run_Logo.png" svgFillColor="255,255,255,255" northMode="0" zValue="4">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem size="251.959,0.1,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" cornerRadiusMeasure="0,mm" positionOnPage="9.59946,198.832,mm" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" positionLock="true" type="65643" itemRotation="0" excludeFromExports="0" position="9.59946,198.832,mm" groupUuid="" visibility="1" zValue="3" referencePoint="0" id="">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="9.59946,198.832,mm" id="" itemRotation="0" visibility="1" groupUuid="" size="251.959,0.1,mm" positionLock="true" opacity="1" positionOnPage="9.59946,198.832,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" cornerRadiusMeasure="0,mm" background="false" frameJoinStyle="miter" shapeType="1" frame="false" type="65643" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" blendMode="0" excludeFromExports="0" zValue="3">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" alpha="1" type="fill" clip_to_extent="1" force_rhr="0">
+          <layer enabled="1" pass="0" locked="0" 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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="solid"/>
+            <prop k="outline_width" v="0.3"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem size="67.7828,166.874,mm" outlineWidthM="0.3,mm" opacity="1" positionOnPage="5.86559,4.09761,mm" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" frame="true" blendMode="0" frameJoinStyle="miter" labelMargin="0,mm" background="true" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" mapFlags="0" positionLock="true" followPresetName="Routes" type="65639" itemRotation="0" excludeFromExports="0" position="5.86559,4.09761,mm" groupUuid="" visibility="1" zValue="2" referencePoint="0" drawCanvasItems="false" mapRotation="0" id="" keepLayerSet="false" followPreset="false">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="5.86559,4.09761,mm" id="" labelMargin="0,mm" itemRotation="0" visibility="1" groupUuid="" size="67.7828,166.874,mm" followPresetName="Routes" positionLock="true" opacity="1" keepLayerSet="false" drawCanvasItems="false" positionOnPage="5.86559,4.09761,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" followPreset="false" mapFlags="0" background="true" frameJoinStyle="miter" frame="true" type="65639" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" mapRotation="0" blendMode="0" excludeFromExports="0" zValue="2">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMax">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapXMax" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMax">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapYMax" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent ymin="-33.94652930000000168" xmin="18.37288570000000121" xmax="18.38563681624126289" ymax="-33.91513741583252539"/>
+        <Extent xmin="18.37288570000000121" ymin="-33.94652930000000168" ymax="-33.91513741583252539" xmax="18.38563681624126289"/>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" topAnnotationPosition="1" rightFrameDivisions="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" gridFramePenThickness="0.5" unit="0" rightAnnotationPosition="1" leftAnnotationDirection="0" topAnnotationDisplay="0" gridFrameSideFlags="15" leftAnnotationDisplay="0" crossLength="3" topFrameDivisions="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" bottomAnnotationDisplay="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" show="0" showAnnotation="0" intervalX="0" topAnnotationDirection="0" frameAnnotationDistance="1" leftFrameDivisions="0" frameFillColor2="0,0,0,255" annotationFormat="0" intervalY="0" rightAnnotationDisplay="0" annotationFontColor="0,0,0,255" gridFrameStyle="0" gridFrameWidth="2" gridStyle="0" rightAnnotationDirection="0" annotationExpression="" offsetX="0" bottomAnnotationPosition="1" annotationPrecision="3" name="Grid 1" offsetY="0" leftAnnotationPosition="1" position="3">
+        <ComposerMapGrid topAnnotationDisplay="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" topFrameDivisions="0" crossLength="3" gridFrameSideFlags="15" unit="0" annotationFormat="0" gridFramePenThickness="0.5" annotationExpression="" gridFramePenColor="0,0,0,255" bottomAnnotationDisplay="0" frameFillColor1="255,255,255,255" bottomAnnotationDirection="0" annotationFontColor="0,0,0,255" rightAnnotationDisplay="0" position="3" gridStyle="0" topAnnotationPosition="1" bottomFrameDivisions="0" offsetY="0" rightAnnotationPosition="1" show="0" rightFrameDivisions="0" gridFrameWidth="2" rightAnnotationDirection="0" intervalY="0" leftFrameDivisions="0" frameAnnotationDistance="1" showAnnotation="0" annotationPrecision="3" topAnnotationDirection="0" blendMode="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" intervalX="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" leftAnnotationDirection="0" offsetX="0" gridFrameMargin="0" name="Grid 1">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <symbol name="" alpha="1" type="line" clip_to_extent="1" force_rhr="0">
+              <layer enabled="1" pass="0" locked="0" class="SimpleLine">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol name="" alpha="1" type="marker" clip_to_extent="1" force_rhr="0">
+              <layer enabled="1" pass="0" locked="0" class="SimpleMarker">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
         <AtlasMap atlasDriven="0" scalingMode="2" margin="0.05"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutItem size="282.012,182.649,mm" outlineWidthM="0.15,mm" opacity="1" positionOnPage="9.44946,9.08557,mm" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" frame="true" blendMode="0" frameJoinStyle="round" labelMargin="0,mm" background="true" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" mapFlags="0" positionLock="true" followPresetName="Routes" type="65639" itemRotation="0" excludeFromExports="0" position="9.44946,9.08557,mm" groupUuid="" visibility="1" zValue="1" referencePoint="0" drawCanvasItems="false" mapRotation="0" id="" keepLayerSet="false" followPreset="false">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="9.44946,9.08557,mm" id="" labelMargin="0,mm" itemRotation="0" visibility="1" groupUuid="" size="282.012,182.649,mm" followPresetName="Routes" positionLock="true" opacity="1" keepLayerSet="false" drawCanvasItems="false" positionOnPage="9.44946,9.08557,mm" outlineWidthM="0.15,mm" referencePoint="0" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" followPreset="false" mapFlags="0" background="true" frameJoinStyle="round" frame="true" type="65639" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" mapRotation="0" blendMode="0" excludeFromExports="0" zValue="1">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.368'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.368'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent ymin="-33.92999999999999972" xmin="18.36799999999999855" xmax="18.42103445111282056" ymax="-33.89565141814492932"/>
+        <Extent xmin="18.36799999999999855" ymin="-33.92999999999999972" ymax="-33.89565141814492932" xmax="18.42103445111282056"/>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" topAnnotationPosition="1" rightFrameDivisions="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" gridFramePenThickness="0.5" unit="0" rightAnnotationPosition="1" leftAnnotationDirection="0" topAnnotationDisplay="0" gridFrameSideFlags="15" leftAnnotationDisplay="0" crossLength="3" topFrameDivisions="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" bottomAnnotationDisplay="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" show="0" showAnnotation="0" intervalX="0" topAnnotationDirection="0" frameAnnotationDistance="1" leftFrameDivisions="0" frameFillColor2="0,0,0,255" annotationFormat="0" intervalY="0" rightAnnotationDisplay="0" annotationFontColor="0,0,0,255" gridFrameStyle="0" gridFrameWidth="2" gridStyle="0" rightAnnotationDirection="0" annotationExpression="" offsetX="0" bottomAnnotationPosition="1" annotationPrecision="3" name="Grid 1" offsetY="0" leftAnnotationPosition="1" position="3">
+        <ComposerMapGrid topAnnotationDisplay="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" topFrameDivisions="0" crossLength="3" gridFrameSideFlags="15" unit="0" annotationFormat="0" gridFramePenThickness="0.5" annotationExpression="" gridFramePenColor="0,0,0,255" bottomAnnotationDisplay="0" frameFillColor1="255,255,255,255" bottomAnnotationDirection="0" annotationFontColor="0,0,0,255" rightAnnotationDisplay="0" position="3" gridStyle="0" topAnnotationPosition="1" bottomFrameDivisions="0" offsetY="0" rightAnnotationPosition="1" show="0" rightFrameDivisions="0" gridFrameWidth="2" rightAnnotationDirection="0" intervalY="0" leftFrameDivisions="0" frameAnnotationDistance="1" showAnnotation="0" annotationPrecision="3" topAnnotationDirection="0" blendMode="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" intervalX="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" leftAnnotationDirection="0" offsetX="0" gridFrameMargin="0" name="Grid 1">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <symbol name="" alpha="1" type="line" clip_to_extent="1" force_rhr="0">
+              <layer enabled="1" pass="0" locked="0" class="SimpleLine">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol name="" alpha="1" type="marker" clip_to_extent="1" force_rhr="0">
+              <layer enabled="1" pass="0" locked="0" class="SimpleMarker">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
         <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
         <labelBlockingItems/>
@@ -14344,43 +14674,43 @@ def my_form_open(dialog, layer, feature):
         <property key="pdfTextFormat" value="0"/>
         <property key="singleFile" value="true"/>
       </customproperties>
-      <Atlas hideCoverage="0" sortFeatures="1" pageNameExpression="&quot;Distance&quot;" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortKey="length_m" filterFeatures="1" coverageLayer="" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21)' )" enabled="0" sortAscending="0"/>
+      <Atlas enabled="0" sortKey="length_m" hideCoverage="0" sortFeatures="1" pageNameExpression="&quot;Distance&quot;" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" filterFeatures="1" coverageLayer="" sortAscending="0" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21)' )"/>
     </Layout>
-    <Layout worldFileMap="" name="Marshal Plan A1" units="mm" printResolution="120">
-      <Snapper snapToItems="1" tolerance="5" snapToGrid="0" snapToGuides="1"/>
-      <Grid offsetY="0" resUnits="mm" offsetX="0" resolution="10" offsetUnits="mm"/>
+    <Layout printResolution="120" name="Marshal Plan A1" worldFileMap="" units="mm">
+      <Snapper snapToGuides="1" tolerance="5" snapToItems="1" snapToGrid="0"/>
+      <Grid offsetX="0" offsetY="0" resUnits="mm" resolution="10" offsetUnits="mm"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" alpha="1" type="fill" clip_to_extent="1" force_rhr="0">
+          <layer enabled="1" pass="0" locked="0" 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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="no"/>
+            <prop k="outline_width" v="0.26"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem size="594,841,mm" outlineWidthM="0.3,mm" opacity="1" positionOnPage="0,0,mm" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" frame="false" blendMode="0" frameJoinStyle="miter" background="true" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" positionLock="false" type="65638" itemRotation="0" excludeFromExports="0" position="0,0,mm" groupUuid="" visibility="1" zValue="0" referencePoint="0" id="">
-          <FrameColor green="0" red="0" blue="0" alpha="255"/>
-          <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+        <LayoutItem position="0,0,mm" id="" itemRotation="0" visibility="1" groupUuid="" size="594,841,mm" positionLock="false" opacity="1" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" background="true" frameJoinStyle="miter" frame="false" type="65638" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" blendMode="0" excludeFromExports="0" zValue="0">
+          <FrameColor alpha="255" red="0" green="0" blue="0"/>
+          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
@@ -14388,41 +14718,41 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem title="" outlineWidthM="0.3,mm" blendMode="0" background="true" fontColor="#000000" referencePoint="0" itemRotation="0" size="18.6109,9,mm" frame="false" titleAlignment="1" opacity="1" columnCount="1" equalColumnWidth="1" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" rasterBorderColor="0,0,0,255" excludeFromExports="0" wmsLegendHeight="25" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" resizeToContents="1" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" boxSpace="2" frameJoinStyle="miter" rasterBorderWidth="0" positionLock="true" wmsLegendWidth="50" symbolHeight="4" symbolWidth="7" type="65642" legendFilterByAtlas="0" splitLayer="0" rasterBorder="1" symbolAlignment="1" groupUuid="" visibility="1" zValue="8" lineSpacing="1" columnSpace="2" id="" wrapChar="" positionOnPage="25.5925,18.7971,mm" position="25.5925,18.7971,mm">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem type="65642" zValue="8" rasterBorderWidth="0" outlineWidthM="0.3,mm" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" wmsLegendWidth="50" groupUuid="" size="18.6109,9,mm" rasterBorderColor="0,0,0,255" symbolAlignment="1" columnCount="1" titleAlignment="1" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" itemRotation="0" wmsLegendHeight="25" referencePoint="0" splitLayer="0" boxSpace="2" background="true" lineSpacing="1" equalColumnWidth="1" symbolHeight="4" fontColor="#000000" resizeToContents="1" title="" position="25.5925,18.7971,mm" wrapChar="" positionOnPage="25.5925,18.7971,mm" symbolWidth="7" frameJoinStyle="miter" positionLock="true" excludeFromExports="0" id="" blendMode="0" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" columnSpace="2" visibility="1" rasterBorder="1" opacity="1" frame="false" legendFilterByAtlas="0">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <styles>
           <style name="title" alignment="1">
-            <styleFont description="Myriad Pro,16,-1,5,50,0,0,0,0,0" style=""/>
+            <styleFont style="" description="Myriad Pro,16,-1,5,50,0,0,0,0,0"/>
           </style>
           <style name="group" alignment="1">
-            <styleFont description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+            <styleFont style="Semibold" description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
-          <style name="subgroup" marginTop="1" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style name="subgroup" alignment="1" marginTop="1">
+            <styleFont style="Semibold" description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
-          <style name="symbol" marginTop="2" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <style name="symbol" alignment="1" marginTop="2">
+            <styleFont style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style marginLeft="2" name="symbolLabel" marginTop="2" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style marginLeft="2" name="symbolLabel" alignment="1" marginTop="2">
+            <styleFont style="Semibold" description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties/>
-          <layer-tree-group expanded="1" checked="Qt::Checked" name="Routes">
+          <layer-tree-group name="Routes" checked="Qt::Checked" expanded="1">
             <customproperties/>
-            <layer-tree-layer expanded="1" id="all_routes20170907054841602" checked="Qt::Checked" name="all_routes">
+            <layer-tree-layer id="all_routes20170907054841602" name="all_routes" checked="Qt::Checked" expanded="1">
               <customproperties>
                 <property key="expandedLegendNodes" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
                 <property key="legend/node-order" value="1,2,3"/>
@@ -14434,140 +14764,140 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem size="91.9494,15.0649,mm" valign="64" outlineWidthM="0.3,mm" opacity="1" positionOnPage="5.2963,808.939,mm" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="MARSHAL POSITIONS" position="5.2963,808.939,mm" groupUuid="" htmlState="0" visibility="1" zValue="7" referencePoint="0" marginY="1" id="" marginX="1" halign="1">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="5.2963,808.939,mm" id="" itemRotation="0" labelText="MARSHAL POSITIONS" htmlState="0" visibility="1" groupUuid="" size="91.9494,15.0649,mm" halign="1" positionLock="true" opacity="1" positionOnPage="5.2963,808.939,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" marginX="1" valign="64" background="false" frameJoinStyle="miter" frame="false" type="65641" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" blendMode="0" excludeFromExports="0" marginY="1" zValue="7">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <LabelFont style="Semibold" description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold"/>
+        <FontColor alpha="255" red="0" green="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem size="56.6212,15.3656,mm" valign="32" outlineWidthM="0.3,mm" opacity="1" positionOnPage="430.403,825.052,mm" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="REVISION 1.2" position="430.403,825.052,mm" groupUuid="" htmlState="0" visibility="1" zValue="5" referencePoint="0" marginY="1" id="" marginX="1" halign="2">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="430.403,825.052,mm" id="" itemRotation="0" labelText="REVISION 1.2" htmlState="0" visibility="1" groupUuid="" size="56.6212,15.3656,mm" halign="2" positionLock="true" opacity="1" positionOnPage="430.403,825.052,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" marginX="1" valign="32" background="false" frameJoinStyle="miter" frame="false" type="65641" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" blendMode="0" excludeFromExports="0" marginY="1" zValue="5">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor alpha="255" red="0" green="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem size="114.848,15.0635,mm" valign="64" outlineWidthM="0.3,mm" opacity="1" positionOnPage="372.175,808.942,mm" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{d177957c-7ab6-40ae-8769-347428500538}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="Sunday, 20 October 2019" position="372.175,808.942,mm" groupUuid="" htmlState="0" visibility="1" zValue="4" referencePoint="0" marginY="1" id="" marginX="1" halign="2">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="372.175,808.942,mm" id="" itemRotation="0" labelText="Sunday, 20 October 2019" htmlState="0" visibility="1" groupUuid="" size="114.848,15.0635,mm" halign="2" positionLock="true" opacity="1" positionOnPage="372.175,808.942,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" marginX="1" valign="64" background="false" frameJoinStyle="miter" frame="false" type="65641" uuid="{d177957c-7ab6-40ae-8769-347428500538}" blendMode="0" excludeFromExports="0" marginY="1" zValue="4">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor alpha="255" red="0" green="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem size="100.498,63.9757,mm" mapUuid="" outlineWidthM="0.3,mm" opacity="1" positionOnPage="489.557,775.395,mm" resizeMode="0" northOffset="0" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" frame="false" pictureWidth="100.498" anchorPoint="8" pictureHeight="58.7992" pictureRotation="0" svgBorderColor="0,0,0,255" blendMode="0" svgFillColor="255,255,255,255" frameJoinStyle="miter" background="false" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" positionLock="true" svgBorderWidth="0.2" type="65640" itemRotation="0" excludeFromExports="0" position="489.557,775.395,mm" file="../Gun_Run_Logo.png" northMode="0" groupUuid="" visibility="1" zValue="3" referencePoint="0" id="">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="489.557,775.395,mm" id="" itemRotation="0" visibility="1" groupUuid="" mapUuid="" size="100.498,63.9757,mm" positionLock="true" opacity="1" positionOnPage="489.557,775.395,mm" outlineWidthM="0.3,mm" referencePoint="0" pictureRotation="0" northOffset="0" pictureWidth="100.498" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" svgBorderWidth="0.2" pictureHeight="58.7992" background="false" resizeMode="0" anchorPoint="8" frameJoinStyle="miter" frame="false" type="65640" svgBorderColor="0,0,0,255" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" blendMode="0" excludeFromExports="0" file="../Gun_Run_Logo.png" svgFillColor="255,255,255,255" northMode="0" zValue="3">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem size="481.428,0.606138,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" cornerRadiusMeasure="0,mm" positionOnPage="5.4463,824.155,mm" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" positionLock="true" type="65643" itemRotation="0" excludeFromExports="0" position="5.4463,824.155,mm" groupUuid="" visibility="1" zValue="2" referencePoint="0" id="">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="5.4463,824.155,mm" id="" itemRotation="0" visibility="1" groupUuid="" size="481.428,0.606138,mm" positionLock="true" opacity="1" positionOnPage="5.4463,824.155,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" cornerRadiusMeasure="0,mm" background="false" frameJoinStyle="miter" shapeType="1" frame="false" type="65643" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" blendMode="0" excludeFromExports="0" zValue="2">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" alpha="1" type="fill" clip_to_extent="1" force_rhr="0">
+          <layer enabled="1" pass="0" locked="0" 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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="solid"/>
+            <prop k="outline_width" v="0.3"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem size="584.759,811.213,mm" outlineWidthM="0.3,mm" opacity="1" positionOnPage="3.94474,5.25965,mm" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" frame="true" blendMode="0" frameJoinStyle="miter" labelMargin="0,mm" background="true" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" mapFlags="0" positionLock="true" followPresetName="Marshal overview" type="65639" itemRotation="0" excludeFromExports="0" position="3.94474,5.25965,mm" groupUuid="" visibility="1" zValue="1" referencePoint="0" drawCanvasItems="false" mapRotation="0" id="" keepLayerSet="false" followPreset="true">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="3.94474,5.25965,mm" id="" labelMargin="0,mm" itemRotation="0" visibility="1" groupUuid="" size="584.759,811.213,mm" followPresetName="Marshal overview" positionLock="true" opacity="1" keepLayerSet="false" drawCanvasItems="false" positionOnPage="3.94474,5.25965,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" followPreset="true" mapFlags="0" background="true" frameJoinStyle="miter" frame="true" type="65639" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" mapRotation="0" blendMode="0" excludeFromExports="0" zValue="1">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent ymin="-33.95821655848814657" xmin="18.37434415142052657" xmax="18.42299397558693741" ymax="-33.89072661913806428"/>
+        <Extent xmin="18.37434415142052657" ymin="-33.95821655848814657" ymax="-33.89072661913806428" xmax="18.42299397558693741"/>
         <LayerSet/>
         <AtlasMap atlasDriven="0" scalingMode="2" margin="0"/>
         <labelBlockingItems/>
@@ -14579,43 +14909,43 @@ def my_form_open(dialog, layer, feature):
         <property key="pdfIncludeMetadata" value="1"/>
         <property key="pdfTextFormat" value="0"/>
       </customproperties>
-      <Atlas coverageLayerName="complete_marshal_overview" hideCoverage="1" sortFeatures="1" pageNameExpression="&quot;page&quot;" filenamePattern="'output_'||@atlas_featurenumber" sortKey="page" filterFeatures="0" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" enabled="1" sortAscending="1" coverageLayerProvider="virtual"/>
+      <Atlas enabled="1" sortKey="page" hideCoverage="1" sortFeatures="1" pageNameExpression="&quot;page&quot;" filenamePattern="'output_'||@atlas_featurenumber" filterFeatures="0" coverageLayerName="complete_marshal_overview" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" coverageLayerProvider="virtual" sortAscending="1"/>
     </Layout>
-    <Layout worldFileMap="" name="Access Roads" units="mm" printResolution="144">
-      <Snapper snapToItems="1" tolerance="5" snapToGrid="0" snapToGuides="1"/>
-      <Grid offsetY="0" resUnits="mm" offsetX="0" resolution="10" offsetUnits="mm"/>
+    <Layout printResolution="144" name="Access Roads" worldFileMap="" units="mm">
+      <Snapper snapToGuides="1" tolerance="5" snapToItems="1" snapToGrid="0"/>
+      <Grid offsetX="0" offsetY="0" resUnits="mm" resolution="10" offsetUnits="mm"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" alpha="1" type="fill" clip_to_extent="1" force_rhr="0">
+          <layer enabled="1" pass="0" locked="0" 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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="no"/>
+            <prop k="outline_width" v="0.26"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem size="297,210,mm" outlineWidthM="0.3,mm" opacity="1" positionOnPage="0,0,mm" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" frame="false" blendMode="0" frameJoinStyle="miter" background="true" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" positionLock="false" type="65638" itemRotation="0" excludeFromExports="0" position="0,0,mm" groupUuid="" visibility="1" zValue="0" referencePoint="0" id="">
-          <FrameColor green="0" red="0" blue="0" alpha="255"/>
-          <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+        <LayoutItem position="0,0,mm" id="" itemRotation="0" visibility="1" groupUuid="" size="297,210,mm" positionLock="false" opacity="1" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" background="true" frameJoinStyle="miter" frame="false" type="65638" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" blendMode="0" excludeFromExports="0" zValue="0">
+          <FrameColor alpha="255" red="0" green="0" blue="0"/>
+          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
@@ -14625,41 +14955,41 @@ def my_form_open(dialog, layer, feature):
           <Guide orientation="2" page="0" units="mm" position="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem title="" outlineWidthM="0.3,mm" blendMode="0" background="true" fontColor="#000000" referencePoint="0" itemRotation="0" size="34.45,40.8,mm" frame="true" titleAlignment="1" opacity="1" columnCount="1" equalColumnWidth="0" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" rasterBorderColor="0,0,0,255" excludeFromExports="0" wmsLegendHeight="25" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" resizeToContents="1" boxSpace="2" frameJoinStyle="miter" rasterBorderWidth="0" positionLock="true" wmsLegendWidth="50" symbolHeight="4" symbolWidth="7" type="65642" legendFilterByAtlas="0" splitLayer="0" rasterBorder="1" symbolAlignment="1" groupUuid="" visibility="1" zValue="15" lineSpacing="1" columnSpace="2" id="" wrapChar="" positionOnPage="244.484,130.172,mm" position="244.484,130.172,mm">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="185"/>
+      <LayoutItem type="65642" zValue="15" rasterBorderWidth="0" outlineWidthM="0.3,mm" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" wmsLegendWidth="50" groupUuid="" size="34.45,40.8,mm" rasterBorderColor="0,0,0,255" symbolAlignment="1" columnCount="1" titleAlignment="1" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" itemRotation="0" wmsLegendHeight="25" referencePoint="0" splitLayer="0" boxSpace="2" background="true" lineSpacing="1" equalColumnWidth="0" symbolHeight="4" fontColor="#000000" resizeToContents="1" title="" position="244.484,130.172,mm" wrapChar="" positionOnPage="244.484,130.172,mm" symbolWidth="7" frameJoinStyle="miter" positionLock="true" excludeFromExports="0" id="" blendMode="0" columnSpace="2" visibility="1" rasterBorder="1" opacity="1" frame="true" legendFilterByAtlas="0">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="185" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <styles>
           <style name="title" alignment="1">
-            <styleFont description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+            <styleFont style="Semibold" description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
-          <style name="group" marginTop="3" alignment="1">
-            <styleFont description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style name="group" alignment="1" marginTop="3">
+            <styleFont style="Semibold" description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
-          <style name="subgroup" marginTop="3" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style name="subgroup" alignment="1" marginTop="3">
+            <styleFont style="Semibold" description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
-          <style name="symbol" marginTop="2.5" alignment="1">
-            <styleFont description="Myriad Pro,9,-1,5,50,0,0,0,0,0" style=""/>
+          <style name="symbol" alignment="1" marginTop="2.5">
+            <styleFont style="" description="Myriad Pro,9,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style marginLeft="2" name="symbolLabel" marginTop="2" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
+          <style marginLeft="2" name="symbolLabel" alignment="1" marginTop="2">
+            <styleFont style="Regular" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties/>
-          <layer-tree-group expanded="1" checked="Qt::Checked" name="Residents Access">
+          <layer-tree-group name="Residents Access" checked="Qt::Checked" expanded="1">
             <customproperties/>
-            <layer-tree-layer providerKey="ogr" expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" checked="Qt::Checked" source="./residents_access_roads.shp|layername=residents_access_roads" name="residents_access_roads">
+            <layer-tree-layer source="./residents_access_roads.shp|layername=residents_access_roads" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" name="residents_access_roads" providerKey="ogr" checked="Qt::Checked" expanded="1">
               <customproperties>
                 <property key="expandedLegendNodes"/>
                 <property key="legend/title-style" value="hidden"/>
@@ -14669,155 +14999,155 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem size="194.851,7.272,mm" valign="64" outlineWidthM="0.3,mm" opacity="1" positionOnPage="9.37446,191.81,mm" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="ACCESS ROUTES FOR RESIDENTS" position="9.37446,191.81,mm" groupUuid="" htmlState="0" visibility="1" zValue="8" referencePoint="0" marginY="1" id="" marginX="0" halign="1">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="9.37446,191.81,mm" id="" itemRotation="0" labelText="ACCESS ROUTES FOR RESIDENTS" htmlState="0" visibility="1" groupUuid="" size="194.851,7.272,mm" halign="1" positionLock="true" opacity="1" positionOnPage="9.37446,191.81,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" marginX="0" valign="64" background="false" frameJoinStyle="miter" frame="false" type="65641" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" blendMode="0" excludeFromExports="0" marginY="1" zValue="8">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <LabelFont style="Regular" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor alpha="255" red="0" green="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem size="57.4836,6.8714,mm" valign="64" outlineWidthM="0.3,mm" opacity="1" positionOnPage="204.225,191.81,mm" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="REVISION 1.1" position="204.225,191.81,mm" groupUuid="" htmlState="0" visibility="1" zValue="6" referencePoint="0" marginY="1" id="" marginX="1" halign="2">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="204.225,191.81,mm" id="" itemRotation="0" labelText="REVISION 1.1" htmlState="0" visibility="1" groupUuid="" size="57.4836,6.8714,mm" halign="2" positionLock="true" opacity="1" positionOnPage="204.225,191.81,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" marginX="1" valign="64" background="false" frameJoinStyle="miter" frame="false" type="65641" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" blendMode="0" excludeFromExports="0" marginY="1" zValue="6">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor alpha="255" red="0" green="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem size="51.6706,6.60801,mm" valign="64" outlineWidthM="0.3,mm" opacity="1" positionOnPage="210.038,199.082,mm" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="Sunday, 20 October 2019" position="210.038,199.082,mm" groupUuid="" htmlState="0" visibility="1" zValue="5" referencePoint="0" marginY="1" id="" marginX="1" halign="2">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="210.038,199.082,mm" id="" itemRotation="0" labelText="Sunday, 20 October 2019" htmlState="0" visibility="1" groupUuid="" size="51.6706,6.60801,mm" halign="2" positionLock="true" opacity="1" positionOnPage="210.038,199.082,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" marginX="1" valign="64" background="false" frameJoinStyle="miter" frame="false" type="65641" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" blendMode="0" excludeFromExports="0" marginY="1" zValue="5">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor alpha="255" red="0" green="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem size="29.7523,17.4718,mm" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" outlineWidthM="0.3,mm" opacity="1" positionOnPage="262.196,188.218,mm" resizeMode="0" northOffset="0" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" frame="false" pictureWidth="29.7523" anchorPoint="4" pictureHeight="17.4074" pictureRotation="0" svgBorderColor="0,0,0,255" blendMode="0" svgFillColor="255,255,255,255" frameJoinStyle="miter" background="false" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" positionLock="true" svgBorderWidth="0.2" type="65640" itemRotation="0" excludeFromExports="0" position="262.196,188.218,mm" file="../Gun_Run_Logo.png" northMode="0" groupUuid="" visibility="1" zValue="4" referencePoint="0" id="">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="262.196,188.218,mm" id="" itemRotation="0" visibility="1" groupUuid="" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" size="29.7523,17.4718,mm" positionLock="true" opacity="1" positionOnPage="262.196,188.218,mm" outlineWidthM="0.3,mm" referencePoint="0" pictureRotation="0" northOffset="0" pictureWidth="29.7523" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" svgBorderWidth="0.2" pictureHeight="17.4074" background="false" resizeMode="0" anchorPoint="4" frameJoinStyle="miter" frame="false" type="65640" svgBorderColor="0,0,0,255" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" blendMode="0" excludeFromExports="0" file="../Gun_Run_Logo.png" svgFillColor="255,255,255,255" northMode="0" zValue="4">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem size="251.959,0.1,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" cornerRadiusMeasure="0,mm" positionOnPage="9.59946,198.832,mm" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" positionLock="true" type="65643" itemRotation="0" excludeFromExports="0" position="9.59946,198.832,mm" groupUuid="" visibility="1" zValue="3" referencePoint="0" id="">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="9.59946,198.832,mm" id="" itemRotation="0" visibility="1" groupUuid="" size="251.959,0.1,mm" positionLock="true" opacity="1" positionOnPage="9.59946,198.832,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" cornerRadiusMeasure="0,mm" background="false" frameJoinStyle="miter" shapeType="1" frame="false" type="65643" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" blendMode="0" excludeFromExports="0" zValue="3">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" alpha="1" type="fill" clip_to_extent="1" force_rhr="0">
+          <layer enabled="1" pass="0" locked="0" 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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="solid"/>
+            <prop k="outline_width" v="0.3"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem size="67.7828,166.874,mm" outlineWidthM="0.3,mm" opacity="1" positionOnPage="5.86559,4.09761,mm" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" frame="true" blendMode="0" frameJoinStyle="miter" labelMargin="0,mm" background="true" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" mapFlags="0" positionLock="true" followPresetName="Access Routes" type="65639" itemRotation="0" excludeFromExports="0" position="5.86559,4.09761,mm" groupUuid="" visibility="1" zValue="2" referencePoint="0" drawCanvasItems="false" mapRotation="0" id="" keepLayerSet="false" followPreset="true">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="5.86559,4.09761,mm" id="" labelMargin="0,mm" itemRotation="0" visibility="1" groupUuid="" size="67.7828,166.874,mm" followPresetName="Access Routes" positionLock="true" opacity="1" keepLayerSet="false" drawCanvasItems="false" positionOnPage="5.86559,4.09761,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" followPreset="true" mapFlags="0" background="true" frameJoinStyle="miter" frame="true" type="65639" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" mapRotation="0" blendMode="0" excludeFromExports="0" zValue="2">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMax">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapXMax" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMax">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapYMax" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="int" value="1" name="type"/>
-                  <Option type="QString" value="" name="val"/>
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="1" name="type" type="int"/>
+                  <Option value="" name="val" type="QString"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent ymin="-33.94652930000000168" xmin="18.37288570000000121" xmax="18.38563681624126289" ymax="-33.91513741583252539"/>
+        <Extent xmin="18.37288570000000121" ymin="-33.94652930000000168" ymax="-33.91513741583252539" xmax="18.38563681624126289"/>
         <crs>
           <spatialrefsys>
             <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
@@ -14831,102 +15161,102 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" topAnnotationPosition="1" rightFrameDivisions="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" gridFramePenThickness="0.5" unit="0" rightAnnotationPosition="1" leftAnnotationDirection="0" topAnnotationDisplay="0" gridFrameSideFlags="15" leftAnnotationDisplay="0" crossLength="3" topFrameDivisions="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" bottomAnnotationDisplay="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" show="0" showAnnotation="0" intervalX="0" topAnnotationDirection="0" frameAnnotationDistance="1" leftFrameDivisions="0" frameFillColor2="0,0,0,255" annotationFormat="0" intervalY="0" rightAnnotationDisplay="0" annotationFontColor="0,0,0,255" gridFrameStyle="0" gridFrameWidth="2" gridStyle="0" rightAnnotationDirection="0" annotationExpression="" offsetX="0" bottomAnnotationPosition="1" annotationPrecision="3" name="Grid 1" offsetY="0" leftAnnotationPosition="1" position="3">
+        <ComposerMapGrid topAnnotationDisplay="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" topFrameDivisions="0" crossLength="3" gridFrameSideFlags="15" unit="0" annotationFormat="0" gridFramePenThickness="0.5" annotationExpression="" gridFramePenColor="0,0,0,255" bottomAnnotationDisplay="0" frameFillColor1="255,255,255,255" bottomAnnotationDirection="0" annotationFontColor="0,0,0,255" rightAnnotationDisplay="0" position="3" gridStyle="0" topAnnotationPosition="1" bottomFrameDivisions="0" offsetY="0" rightAnnotationPosition="1" show="0" rightFrameDivisions="0" gridFrameWidth="2" rightAnnotationDirection="0" intervalY="0" leftFrameDivisions="0" frameAnnotationDistance="1" showAnnotation="0" annotationPrecision="3" topAnnotationDirection="0" blendMode="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" intervalX="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" leftAnnotationDirection="0" offsetX="0" gridFrameMargin="0" name="Grid 1">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <symbol name="" alpha="1" type="line" clip_to_extent="1" force_rhr="0">
+              <layer enabled="1" pass="0" locked="0" class="SimpleLine">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol name="" alpha="1" type="marker" clip_to_extent="1" force_rhr="0">
+              <layer enabled="1" pass="0" locked="0" class="SimpleMarker">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
         <AtlasMap atlasDriven="0" scalingMode="2" margin="0.05"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutItem size="282.012,175.592,mm" outlineWidthM="0.15,mm" opacity="1" positionOnPage="9.44946,9.08557,mm" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" frame="true" blendMode="0" frameJoinStyle="round" labelMargin="0,mm" background="true" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" mapFlags="0" positionLock="true" followPresetName="Access Routes" type="65639" itemRotation="0" excludeFromExports="0" position="9.44946,9.08557,mm" groupUuid="" visibility="1" zValue="1" referencePoint="0" drawCanvasItems="false" mapRotation="0" id="" keepLayerSet="false" followPreset="true">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="9.44946,9.08557,mm" id="" labelMargin="0,mm" itemRotation="0" visibility="1" groupUuid="" size="282.012,175.592,mm" followPresetName="Access Routes" positionLock="true" opacity="1" keepLayerSet="false" drawCanvasItems="false" positionOnPage="9.44946,9.08557,mm" outlineWidthM="0.15,mm" referencePoint="0" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" followPreset="true" mapFlags="0" background="true" frameJoinStyle="round" frame="true" type="65639" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" mapRotation="0" blendMode="0" excludeFromExports="0" zValue="1">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent ymin="-33.92999999999999972" xmin="18.37000000000000099" xmax="18.42303507276415431" ymax="-33.89697816224119009"/>
+        <Extent xmin="18.37000000000000099" ymin="-33.92999999999999972" ymax="-33.89697816224119009" xmax="18.42303507276415431"/>
         <crs>
           <spatialrefsys>
             <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
@@ -14940,68 +15270,68 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" topAnnotationPosition="1" rightFrameDivisions="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" gridFramePenThickness="0.5" unit="0" rightAnnotationPosition="1" leftAnnotationDirection="0" topAnnotationDisplay="0" gridFrameSideFlags="15" leftAnnotationDisplay="0" crossLength="3" topFrameDivisions="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" bottomAnnotationDisplay="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" show="0" showAnnotation="0" intervalX="0" topAnnotationDirection="0" frameAnnotationDistance="1" leftFrameDivisions="0" frameFillColor2="0,0,0,255" annotationFormat="0" intervalY="0" rightAnnotationDisplay="0" annotationFontColor="0,0,0,255" gridFrameStyle="0" gridFrameWidth="2" gridStyle="0" rightAnnotationDirection="0" annotationExpression="" offsetX="0" bottomAnnotationPosition="1" annotationPrecision="3" name="Grid 1" offsetY="0" leftAnnotationPosition="1" position="3">
+        <ComposerMapGrid topAnnotationDisplay="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" topFrameDivisions="0" crossLength="3" gridFrameSideFlags="15" unit="0" annotationFormat="0" gridFramePenThickness="0.5" annotationExpression="" gridFramePenColor="0,0,0,255" bottomAnnotationDisplay="0" frameFillColor1="255,255,255,255" bottomAnnotationDirection="0" annotationFontColor="0,0,0,255" rightAnnotationDisplay="0" position="3" gridStyle="0" topAnnotationPosition="1" bottomFrameDivisions="0" offsetY="0" rightAnnotationPosition="1" show="0" rightFrameDivisions="0" gridFrameWidth="2" rightAnnotationDirection="0" intervalY="0" leftFrameDivisions="0" frameAnnotationDistance="1" showAnnotation="0" annotationPrecision="3" topAnnotationDirection="0" blendMode="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" intervalX="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" leftAnnotationDirection="0" offsetX="0" gridFrameMargin="0" name="Grid 1">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <symbol name="" alpha="1" type="line" clip_to_extent="1" force_rhr="0">
+              <layer enabled="1" pass="0" locked="0" class="SimpleLine">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol name="" alpha="1" type="marker" clip_to_extent="1" force_rhr="0">
+              <layer enabled="1" pass="0" locked="0" class="SimpleMarker">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
         <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
         <labelBlockingItems/>
@@ -15020,43 +15350,43 @@ def my_form_open(dialog, layer, feature):
         <property key="pdfTextFormat" value="0"/>
         <property key="singleFile" value="false"/>
       </customproperties>
-      <Atlas coverageLayerName="residents_access" hideCoverage="1" sortFeatures="0" pageNameExpression="&quot;FID&quot;" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" filterFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" enabled="1" coverageLayerProvider="ogr"/>
+      <Atlas enabled="1" hideCoverage="1" sortFeatures="0" pageNameExpression="&quot;FID&quot;" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" filterFeatures="0" coverageLayerName="residents_access" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" coverageLayerSource="/home/tim/Documents/GunRunMaps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayerProvider="ogr"/>
     </Layout>
-    <Layout worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}" name="Golf Course Access" units="mm" printResolution="144">
-      <Snapper snapToItems="1" tolerance="5" snapToGrid="0" snapToGuides="1"/>
-      <Grid offsetY="0" resUnits="mm" offsetX="0" resolution="10" offsetUnits="mm"/>
+    <Layout printResolution="144" name="Golf Course Access" worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}" units="mm">
+      <Snapper snapToGuides="1" tolerance="5" snapToItems="1" snapToGrid="0"/>
+      <Grid offsetX="0" offsetY="0" resUnits="mm" resolution="10" offsetUnits="mm"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" alpha="1" type="fill" clip_to_extent="1" force_rhr="0">
+          <layer enabled="1" pass="0" locked="0" 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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="no"/>
+            <prop k="outline_width" v="0.26"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem size="297,210,mm" outlineWidthM="0.3,mm" opacity="1" positionOnPage="0,0,mm" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" frame="false" blendMode="0" frameJoinStyle="miter" background="true" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" positionLock="false" type="65638" itemRotation="0" excludeFromExports="0" position="0,0,mm" groupUuid="" visibility="1" zValue="0" referencePoint="0" id="">
-          <FrameColor green="0" red="0" blue="0" alpha="255"/>
-          <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+        <LayoutItem position="0,0,mm" id="" itemRotation="0" visibility="1" groupUuid="" size="297,210,mm" positionLock="false" opacity="1" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" background="true" frameJoinStyle="miter" frame="false" type="65638" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" blendMode="0" excludeFromExports="0" zValue="0">
+          <FrameColor alpha="255" red="0" green="0" blue="0"/>
+          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
@@ -15066,140 +15396,140 @@ def my_form_open(dialog, layer, feature):
           <Guide orientation="2" page="0" units="mm" position="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem size="194.851,7.272,mm" valign="64" outlineWidthM="0.3,mm" opacity="1" positionOnPage="9.37446,191.81,mm" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="Access to P9 Parking and Route to VIP Tent" position="9.37446,191.81,mm" groupUuid="" htmlState="0" visibility="1" zValue="8" referencePoint="0" marginY="1" id="" marginX="0" halign="1">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="9.37446,191.81,mm" id="" itemRotation="0" labelText="Access to P9 Parking and VIP Tent" htmlState="0" visibility="1" groupUuid="" size="194.851,7.272,mm" halign="1" positionLock="true" opacity="1" positionOnPage="9.37446,191.81,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" marginX="0" valign="64" background="false" frameJoinStyle="miter" frame="false" type="65641" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" blendMode="0" excludeFromExports="0" marginY="1" zValue="8">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <LabelFont style="Regular" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor alpha="255" red="0" green="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem size="57.4836,6.8714,mm" valign="64" outlineWidthM="0.3,mm" opacity="1" positionOnPage="204.225,191.81,mm" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="REVISION 1.0" position="204.225,191.81,mm" groupUuid="" htmlState="0" visibility="1" zValue="6" referencePoint="0" marginY="1" id="" marginX="1" halign="2">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="204.225,191.81,mm" id="" itemRotation="0" labelText="REVISION 1.0" htmlState="0" visibility="1" groupUuid="" size="57.4836,6.8714,mm" halign="2" positionLock="true" opacity="1" positionOnPage="204.225,191.81,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" marginX="1" valign="64" background="false" frameJoinStyle="miter" frame="false" type="65641" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" blendMode="0" excludeFromExports="0" marginY="1" zValue="6">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor alpha="255" red="0" green="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem size="51.6706,6.60801,mm" valign="64" outlineWidthM="0.3,mm" opacity="1" positionOnPage="210.038,199.082,mm" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" positionLock="true" type="65641" itemRotation="0" excludeFromExports="0" labelText="Sunday, 20 October 2019" position="210.038,199.082,mm" groupUuid="" htmlState="0" visibility="1" zValue="5" referencePoint="0" marginY="1" id="" marginX="1" halign="2">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="210.038,199.082,mm" id="" itemRotation="0" labelText="Sunday, 20 October 2019" htmlState="0" visibility="1" groupUuid="" size="51.6706,6.60801,mm" halign="2" positionLock="true" opacity="1" positionOnPage="210.038,199.082,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" marginX="1" valign="64" background="false" frameJoinStyle="miter" frame="false" type="65641" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" blendMode="0" excludeFromExports="0" marginY="1" zValue="5">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor green="0" red="0" blue="0" alpha="255"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor alpha="255" red="0" green="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem size="29.7523,17.4718,mm" mapUuid="" outlineWidthM="0.3,mm" opacity="1" positionOnPage="262.196,188.218,mm" resizeMode="0" northOffset="0" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" frame="false" pictureWidth="29.7523" anchorPoint="4" pictureHeight="17.4074" pictureRotation="0" svgBorderColor="0,0,0,255" blendMode="0" svgFillColor="255,255,255,255" frameJoinStyle="miter" background="false" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" positionLock="true" svgBorderWidth="0.2" type="65640" itemRotation="0" excludeFromExports="0" position="262.196,188.218,mm" file="../Gun_Run_Logo.png" northMode="0" groupUuid="" visibility="1" zValue="4" referencePoint="0" id="">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="262.196,188.218,mm" id="" itemRotation="0" visibility="1" groupUuid="" mapUuid="" size="29.7523,17.4718,mm" positionLock="true" opacity="1" positionOnPage="262.196,188.218,mm" outlineWidthM="0.3,mm" referencePoint="0" pictureRotation="0" northOffset="0" pictureWidth="29.7523" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" svgBorderWidth="0.2" pictureHeight="17.4074" background="false" resizeMode="0" anchorPoint="4" frameJoinStyle="miter" frame="false" type="65640" svgBorderColor="0,0,0,255" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" blendMode="0" excludeFromExports="0" file="../Gun_Run_Logo.png" svgFillColor="255,255,255,255" northMode="0" zValue="4">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem size="251.959,0.1,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" cornerRadiusMeasure="0,mm" positionOnPage="9.59946,198.832,mm" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" frame="false" blendMode="0" frameJoinStyle="miter" background="false" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" positionLock="true" type="65643" itemRotation="0" excludeFromExports="0" position="9.59946,198.832,mm" groupUuid="" visibility="1" zValue="3" referencePoint="0" id="">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="9.59946,198.832,mm" id="" itemRotation="0" visibility="1" groupUuid="" size="251.959,0.1,mm" positionLock="true" opacity="1" positionOnPage="9.59946,198.832,mm" outlineWidthM="0.3,mm" referencePoint="0" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" cornerRadiusMeasure="0,mm" background="false" frameJoinStyle="miter" shapeType="1" frame="false" type="65643" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" blendMode="0" excludeFromExports="0" zValue="3">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" alpha="1" type="fill" clip_to_extent="1" force_rhr="0">
+          <layer enabled="1" pass="0" locked="0" 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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="solid"/>
+            <prop k="outline_width" v="0.3"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem size="282.012,182.649,mm" outlineWidthM="0.15,mm" opacity="1" positionOnPage="9.44946,7.25098,mm" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" frame="false" blendMode="0" frameJoinStyle="round" labelMargin="0,mm" background="true" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" mapFlags="0" positionLock="false" followPresetName="" type="65639" itemRotation="0" excludeFromExports="0" position="9.44946,7.25098,mm" groupUuid="" visibility="1" zValue="1" referencePoint="0" drawCanvasItems="false" mapRotation="0" id="" keepLayerSet="false" followPreset="false">
-        <FrameColor green="0" red="0" blue="0" alpha="255"/>
-        <BackgroundColor green="255" red="255" blue="255" alpha="255"/>
+      <LayoutItem position="9.44946,7.25098,mm" id="" labelMargin="0,mm" itemRotation="0" visibility="1" groupUuid="" size="282.012,182.649,mm" followPresetName="" positionLock="false" opacity="1" keepLayerSet="false" drawCanvasItems="false" positionOnPage="9.44946,7.25098,mm" outlineWidthM="0.15,mm" referencePoint="0" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" followPreset="false" mapFlags="0" background="true" frameJoinStyle="round" frame="false" type="65639" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" mapRotation="0" blendMode="0" excludeFromExports="0" zValue="1">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent ymin="-33.90855529265061818" xmin="18.40084847922157607" xmax="18.40900667054944861" ymax="-33.90327151396082428"/>
+        <Extent xmin="18.40103928699269886" ymin="-33.90848231674397084" ymax="-33.90319854486631357" xmax="18.40919746780259914"/>
         <crs>
           <spatialrefsys>
             <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
@@ -15213,68 +15543,68 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" topAnnotationPosition="1" rightFrameDivisions="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" gridFramePenThickness="0.5" unit="0" rightAnnotationPosition="1" leftAnnotationDirection="0" topAnnotationDisplay="0" gridFrameSideFlags="15" leftAnnotationDisplay="0" crossLength="3" topFrameDivisions="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" bottomAnnotationDisplay="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" show="0" showAnnotation="0" intervalX="0" topAnnotationDirection="0" frameAnnotationDistance="1" leftFrameDivisions="0" frameFillColor2="0,0,0,255" annotationFormat="0" intervalY="0" rightAnnotationDisplay="0" annotationFontColor="0,0,0,255" gridFrameStyle="0" gridFrameWidth="2" gridStyle="0" rightAnnotationDirection="0" annotationExpression="" offsetX="0" bottomAnnotationPosition="1" annotationPrecision="3" name="Grid 1" offsetY="0" leftAnnotationPosition="1" position="3">
+        <ComposerMapGrid topAnnotationDisplay="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" topFrameDivisions="0" crossLength="3" gridFrameSideFlags="15" unit="0" annotationFormat="0" gridFramePenThickness="0.5" annotationExpression="" gridFramePenColor="0,0,0,255" bottomAnnotationDisplay="0" frameFillColor1="255,255,255,255" bottomAnnotationDirection="0" annotationFontColor="0,0,0,255" rightAnnotationDisplay="0" position="3" gridStyle="0" topAnnotationPosition="1" bottomFrameDivisions="0" offsetY="0" rightAnnotationPosition="1" show="0" rightFrameDivisions="0" gridFrameWidth="2" rightAnnotationDirection="0" intervalY="0" leftFrameDivisions="0" frameAnnotationDistance="1" showAnnotation="0" annotationPrecision="3" topAnnotationDirection="0" blendMode="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" intervalX="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" leftAnnotationDirection="0" offsetX="0" gridFrameMargin="0" name="Grid 1">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <symbol name="" alpha="1" type="line" clip_to_extent="1" force_rhr="0">
+              <layer enabled="1" pass="0" locked="0" class="SimpleLine">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol name="" alpha="1" type="marker" clip_to_extent="1" force_rhr="0">
+              <layer enabled="1" pass="0" locked="0" class="SimpleMarker">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
         <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
         <labelBlockingItems/>
@@ -15293,7 +15623,7 @@ def my_form_open(dialog, layer, feature):
         <property key="pdfTextFormat" value="0"/>
         <property key="singleFile" value="false"/>
       </customproperties>
-      <Atlas coverageLayerName="residents_access" hideCoverage="1" sortFeatures="0" pageNameExpression="&quot;FID&quot;" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" filterFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" enabled="0" coverageLayerProvider="ogr"/>
+      <Atlas enabled="0" hideCoverage="1" sortFeatures="0" pageNameExpression="&quot;FID&quot;" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" filterFeatures="0" coverageLayerName="residents_access" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" coverageLayerSource="/home/tim/Documents/GunRunMaps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayerProvider="ogr"/>
     </Layout>
   </Layouts>
 </qgis>
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_101.jpg b/GIS Base Map/Marshals/AAC_marshal_map_101.jpg
index 9ce85cb..bb1232f 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_101.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_101.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b0d243ff80e4aabaf1eabb57347213895776e4501c59353fe8b77d3826d67d6f
-size 143201
+oid sha256:bb507029f9124f8d9c61398acac3f241f5b21bc1a18cf61ec496e32c98a9cf5d
+size 142532
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_102.jpg b/GIS Base Map/Marshals/AAC_marshal_map_102.jpg
index 8e50c09..b74f10a 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_102.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_102.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f83bbe459bd0b15dca40393ddb554ff40e03984bcbbfb6312b3e5fabb925a8e7
-size 140746
+oid sha256:d9329c83449008c6b3091131a0474ef0431bdd999274c98817c3f47468a2d7a2
+size 139189
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_103.jpg b/GIS Base Map/Marshals/AAC_marshal_map_103.jpg
index 6076e31..2cfd9b4 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_103.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_103.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7772cacf178a54b0113fda8cbea85f2d2a4baf488b8b294ab320c5fa61f24d91
-size 144812
+oid sha256:81507cab090a14debd9d0f2dd49a534cf170db9dcf20a7aa2a42ae88c7622a39
+size 143973
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_104.jpg b/GIS Base Map/Marshals/AAC_marshal_map_104.jpg
index e195bd9..6ef8657 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_104.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_104.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:403871a24a6d84348853d9854ebfb38f3a88e8fb5cd32323ab449de5af07aca8
-size 142337
+oid sha256:f81d524586461736e7501fc1c93334a81c52d2f685cdc011e14f48d6862a6948
+size 141066
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_105.jpg b/GIS Base Map/Marshals/AAC_marshal_map_105.jpg
index 6ae1a65..021ca4c 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_105.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_105.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0c2f7413c38741196ba27d77b0cf4d159287bfcb0e00a5593493274754b57b1e
-size 146272
+oid sha256:2847fb7a1cd8aef83035f8c1b99915c5f325fd06c1b5a20023b9c14947fcee5f
+size 145307
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_106.jpg b/GIS Base Map/Marshals/AAC_marshal_map_106.jpg
index 38b97b6..c2b4e83 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_106.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_106.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bdd44797cffc95b15cd9ed6eb377271b4db8ee2e4e4f974d337399ef02700820
-size 145480
+oid sha256:dd23432f4bc2c974fe131539da7307535b4f53972ddde884797985a26f07a230
+size 144286
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_107.jpg b/GIS Base Map/Marshals/AAC_marshal_map_107.jpg
index 49628ae..9f3e9f6 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_107.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_107.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2924e4aa436acf9ecad2dd5f34c77b8b8b7b24bea442f5dcb4148e4f46a867c9
-size 145017
+oid sha256:5401e0bc4097d375fa5cc428429fb716bc2540b0f2306c4f775148df8735149b
+size 144459
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_108.jpg b/GIS Base Map/Marshals/AAC_marshal_map_108.jpg
index 602cdc6..301bfd8 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_108.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_108.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:338012832c97ebdbef5bfd6eed96efc4e0c8b73355d066bff27072dda35eda6e
-size 144109
+oid sha256:0754869f769580adff3c7713844280e6c9a4e3e2746b26196d530dcdbf090a0c
+size 143431
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_109.jpg b/GIS Base Map/Marshals/AAC_marshal_map_109.jpg
index efd9b07..fd74c78 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_109.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_109.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c57ed2d58fcfecdb3c7830c151355cec79f6950a95837624b4f56a50dc2698e3
-size 135116
+oid sha256:64519bc7d7a9cee473d558b8771881ff8b8a169e00da64062f32e5329194797c
+size 135037
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_110.jpg b/GIS Base Map/Marshals/AAC_marshal_map_110.jpg
index f08af11..6cdda91 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_110.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_110.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ca6e7617411fde4ece98dbbdbdcf617c7b7b3ff171dc696216d063f7a99aa1b0
-size 137100
+oid sha256:d3aa34cce9254e25bc5a29427ad4b7f480d7196dbea56ff1cd74cffec694b6ac
+size 136838
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_111.jpg b/GIS Base Map/Marshals/AAC_marshal_map_111.jpg
index c4cb3fd..7bc40ee 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_111.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_111.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3e57a0bec1d843d9e6475f8191913fdd59298918f1778dc065cd295e4421c405
-size 136818
+oid sha256:e8e42be47e3e6dc9b678086400f6dd9442ecd6379962786afd2346faed26733b
+size 136038
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_112.jpg b/GIS Base Map/Marshals/AAC_marshal_map_112.jpg
index 8f76ab9..52f2075 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_112.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_112.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:942c3d18323c6c63ffe09e41bca034d24d9dfa0d88834b5733f2f93349c68715
-size 129036
+oid sha256:3ba1146de9bef37a400c50df86a9dc10fb2db368a0a8c783368da5025995bdfc
+size 129361
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_113.jpg b/GIS Base Map/Marshals/AAC_marshal_map_113.jpg
index 018761a..acd5f22 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_113.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_113.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:12a982a3eaa657bf09d0c21f9227ea4a23e7ef16d861ebca0c11f811400051b9
-size 130830
+oid sha256:33c3567372b029a836d4a47d5cacb129a49b550c93c6cb2b094b327057af360c
+size 129977
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_114.jpg b/GIS Base Map/Marshals/AAC_marshal_map_114.jpg
index 2339a02..e81219f 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_114.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_114.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5197e3579fa25f3e7f9efbec57017283257a7a79142e6b9da9307062b554766e
-size 141166
+oid sha256:59fb6c0dd3f093cb0d1f06094db66dd55fe0463049d1f0eef2015ac42909dcb8
+size 141337
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_115.jpg b/GIS Base Map/Marshals/AAC_marshal_map_115.jpg
index cad2eea..02a017e 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_115.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_115.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2378ce5709e259b84e3ff0eed3a7dcbd6ef770cab9a45654877bc63abe5d50df
-size 140608
+oid sha256:27be40ddb67ee1d6471e5d238fe7276830caca5ecd806a2b9af03c126b6226de
+size 140655
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_116.jpg b/GIS Base Map/Marshals/AAC_marshal_map_116.jpg
index daeee99..41b505c 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_116.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_116.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1f94ce367304a895c0e8e4ad9c6596f14c03986a8e30f4de972218300a939338
-size 141671
+oid sha256:bff62c3fc750f837f1a09e00068c7b284d614088ffafa6b1265fb6a22935cbf0
+size 141786
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_117.jpg b/GIS Base Map/Marshals/AAC_marshal_map_117.jpg
index b8e6c00..078e92c 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_117.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_117.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:747f4a33990237b171a4420b62313cb75cb0119e7753fe695c0b63bccdc2f569
-size 146118
+oid sha256:ff157c06292659443ebd82717b531eeec1d25809463d468c08089e020d4bd50e
+size 145364
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_118.jpg b/GIS Base Map/Marshals/AAC_marshal_map_118.jpg
index 2345034..d81617a 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_118.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_118.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f943d4ddea12f58ca277bb9c85c1239a2fb2d20fc17c5ec804347f3988ee0bf9
-size 142257
+oid sha256:02c37c9b9da3990c6f19e26df5d870f641505a80f7aaacf0aa10326c476d7d99
+size 142765
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_119.jpg b/GIS Base Map/Marshals/AAC_marshal_map_119.jpg
index 8a13045..6f40982 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_119.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_119.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f7d7107cc1d3a5a6927fa09798fc2ebe1bc866f876d4a5192bbcabea951b2eda
-size 143963
+oid sha256:1fe1de506f860bc45640ac69ab508527627706eba776c47602cbb15909ccd0c0
+size 144988
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_120.jpg b/GIS Base Map/Marshals/AAC_marshal_map_120.jpg
index 86a0252..7fbb489 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_120.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_120.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fb358251be4d635af17d09715b1e8e60f1faf6a91c7b93997d2a750d89ce64ba
-size 144525
+oid sha256:2cfbdcc19c1582b6c2009651d56b4821b539793e2a64ec14eec32a616d8fac5c
+size 144520
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_121.jpg b/GIS Base Map/Marshals/AAC_marshal_map_121.jpg
index 3f94293..7150809 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_121.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_121.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:330096a13ea5f7fdd53c4f9e2762e11ae63555f4f58ca05605b0c096a6d6cbba
-size 145714
+oid sha256:4bcf8926180a69b2aebe50fad44ea29dbbe575098ed589a5ea81c835130392f2
+size 145757
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_122.jpg b/GIS Base Map/Marshals/AAC_marshal_map_122.jpg
index 0eef5ba..25ff096 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_122.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_122.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9cb319d3e708b2222f8f7511664035efa7fedfcab3411af5a52009d90a78c383
-size 139398
+oid sha256:7ab8c18c512e98ab3a23d6c391cc2096b95f2ab390d72cdd0184634d0b2e444d
+size 139750
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_123.jpg b/GIS Base Map/Marshals/AAC_marshal_map_123.jpg
index ee9869c..f659532 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_123.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_123.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:33d7dff85839b00a5113b038ad91dfe7e3bc28ab32829fe0e7f95d201e6e7e46
-size 142855
+oid sha256:5d89fc1a3e8db198e84c5fb1c25cf826e5a479acf929ead5fb51d25324383298
+size 142480
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_124.jpg b/GIS Base Map/Marshals/AAC_marshal_map_124.jpg
index 1b7e5b1..4459634 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_124.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_124.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f991ff08e5500357549bc0b16986d56d89de392171013febd40b423f79da80f1
-size 139485
+oid sha256:5375adad610c2ab3032529ee4784b8d7dc7b6abc64cc776e10e3d232fbab5d99
+size 139638
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_125.jpg b/GIS Base Map/Marshals/AAC_marshal_map_125.jpg
index 4b3857d..08acc23 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_125.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_125.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fa7c9846bc8a539e042dcf84305a1145c3b91f36ac282d98b0ed9bb5fd1f03e1
-size 135232
+oid sha256:7ed196bcf5bfa1dca45d1c61e1b644173fca6b1e654d94901e12dd92e677a325
+size 135730
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_126.jpg b/GIS Base Map/Marshals/AAC_marshal_map_126.jpg
index ffdb184..20c0145 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_126.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_126.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b237f29f385744ab7e5dd39c0c964076b9ba08381d278aa6ab052135590c96ae
-size 142007
+oid sha256:31cd863202d27f981da99196fa996b71051897eb85968675f406113950fc5972
+size 141852
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_127.jpg b/GIS Base Map/Marshals/AAC_marshal_map_127.jpg
index a70a302..864283e 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_127.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_127.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6f517e407648c8355e7ec261a2fdf450bafdd7993c8506ffbf243d9dec3a93f6
-size 140911
+oid sha256:b6a1888d57c000c7577f4680afb6bfa0cc61ad98fd3d291e633c118fd45ba9e8
+size 140699
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_128.jpg b/GIS Base Map/Marshals/AAC_marshal_map_128.jpg
index 5a7d35f..1819d22 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_128.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_128.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0dc9937ca01af1a8e24849cd2681c9491eb8f939145b86c8c2dd36a75bdcf89e
-size 133933
+oid sha256:309ddad7a9324ae818a4ae1e25e3e419ce228c34f6e6ff458e6df2b23fe08244
+size 134365
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_129.jpg b/GIS Base Map/Marshals/AAC_marshal_map_129.jpg
index 739d188..7b22546 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_129.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_129.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:20171a3d181c84c0857441ed4afbb8602040228f6cd460422f2f5d8526df85e7
-size 133624
+oid sha256:7e671f0fa14a38f4bcd182d06c023ef2f3d942096148d23a0d309b90f931980c
+size 133786
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_130.jpg b/GIS Base Map/Marshals/AAC_marshal_map_130.jpg
index 88302ea..a347511 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_130.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_130.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:112bafbd04edcbc2fa41be29e7e9959a568f31f4427a5d6b325aadefad64f7e8
-size 142806
+oid sha256:e346aa8d9f8d83083d720b87b33603b3a3a7e63972277bda691521e7b9a4eab5
+size 143121
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_131.jpg b/GIS Base Map/Marshals/AAC_marshal_map_131.jpg
index 0ba84aa..79008ee 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_131.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_131.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4db0c433bd135ebed4e39c728382c545f8578a3de472feab8de25b41cb76be1e
-size 143542
+oid sha256:e7c8db6e29bc0a10c46a5442834ca368a98cff6a60d18ec75f6bc1842fe7925f
+size 143456
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_132.jpg b/GIS Base Map/Marshals/AAC_marshal_map_132.jpg
index 66ff034..d5acfdb 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_132.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_132.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:49214205a6ee402e4e21561427c3dd4017af20178d9dbc4dad39e1477fdae324
-size 146397
+oid sha256:41d520345fe643220ee8b1981dbbb01350c425366b63349f6b63cdac1e62dd3e
+size 146835
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_133.jpg b/GIS Base Map/Marshals/AAC_marshal_map_133.jpg
index b058c92..efda367 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_133.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_133.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e12360b25fde6b9252dcb076a394a451f3097085d5d617c4853b558159edd95a
-size 146831
+oid sha256:de47575379b369991bac305036b4af875be2e7a34f55a48246bae21e9f5529dd
+size 146943
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_134.jpg b/GIS Base Map/Marshals/AAC_marshal_map_134.jpg
index 929c6b5..536a887 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_134.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_134.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5e29a06a983a19974185f286ae81ce354521bc19f62cbf9e28226ce4b44ab29c
-size 146073
+oid sha256:62132ac6a579dccabd53310ea30195333ab5f196be4cfa48e6ca27b118fb8c59
+size 146213
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_135.jpg b/GIS Base Map/Marshals/AAC_marshal_map_135.jpg
index 2cd0451..fc4ff42 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_135.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_135.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9a4c5476c66838e9b6181a6c72b6ec8d3b1e522c97e78b78a4baba9445ab75c1
-size 142571
+oid sha256:e2cb40f371cedba4ca70383f6178238ca4b74cedc296c1c1141c5643d9b0edab
+size 142896
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_136.jpg b/GIS Base Map/Marshals/AAC_marshal_map_136.jpg
index 265c8de..6c60c01 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_136.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_136.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fb5ea96331e164b2a381cc9f1f8bc7cad7619b4c38da49e67068ead4b6c7dc95
-size 144749
+oid sha256:891970fed5f612100b0490a3afaabf31457f2a8765b82e2fde30b68d5cfedf41
+size 144648
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_137.jpg b/GIS Base Map/Marshals/AAC_marshal_map_137.jpg
index 9104159..ac496e7 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_137.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_137.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:31532b6cfa5ae2001562fc931b51f15b690415a2c997a35e7655d2060e91a8aa
-size 144738
+oid sha256:5fbddd034a920557977737002045f62a73b800c41e5643c6bdb5921c689d30c5
+size 144859
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_138.jpg b/GIS Base Map/Marshals/AAC_marshal_map_138.jpg
index 9b2080b..b9ab3c2 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_138.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_138.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0c0a8d804b2d3269f04ba3268231fd9bfab4af975b2329a5bf7423bdd23b4b48
-size 144781
+oid sha256:f6d89bf057504cb8035773d6fad2b30e5ad8e274ffbd190e9402e3401e44947d
+size 144426
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_139.jpg b/GIS Base Map/Marshals/AAC_marshal_map_139.jpg
index 6ba7291..bcecf72 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_139.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_139.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2426decc82bb72d48cd0d030b5c7cf62be260aa20879ab617776935e049bf26d
-size 142643
+oid sha256:367ad69d04e061fe6cf34f01fe7ddce9f2aa49a6ff088448755f8ed28e457e62
+size 142191
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_140.jpg b/GIS Base Map/Marshals/AAC_marshal_map_140.jpg
index 2183688..6c4a432 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_140.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_140.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6ca69be6b5bd958d297425ecd9acebe58c6f0bc40295b884b73360065dfc2b7a
-size 138847
+oid sha256:a67c2050e182cb6e2a383f2e21ed0f667eed48ee286fde04267ea5fb9f1a41c9
+size 139156
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_141.jpg b/GIS Base Map/Marshals/AAC_marshal_map_141.jpg
index a649af8..9f8706b 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_141.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_141.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1b838ae3cb4f6594cee80b47d33000920d8e0f482b357c6a8a6baa6d6aa57341
-size 142263
+oid sha256:7957c6742a1ae1cc28adb8ef0457beb375a894887fd5c59bbdeae211475ab373
+size 142661
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_142.jpg b/GIS Base Map/Marshals/AAC_marshal_map_142.jpg
index 8094aaf..b39ce8e 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_142.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_142.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:396c2c0fee16ca19561308603536609caa1e19937e71aceff5ebb6fc012a999d
-size 138972
+oid sha256:fc0520104cfe192688772c35ac1654bd659223f2e3dd159c2bf9a761a7f8990e
+size 138772
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_143.jpg b/GIS Base Map/Marshals/AAC_marshal_map_143.jpg
index b3ac2d8..97615c3 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_143.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_143.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1a7f60df76693a37af54fc5f7990038aaa0ee336e19ecc71f4ea23a8f43e3366
-size 139268
+oid sha256:8234b70843fdf1bc2c92e3f3681f8d439a4263488e20e92bcfebffeb6e34d1b4
+size 139354
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_144.jpg b/GIS Base Map/Marshals/AAC_marshal_map_144.jpg
index 13a81f8..a85c0fd 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_144.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_144.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8f1db67f6bbc14151c19b66323f15bd80a68654ee29e8ddb67cc909f6c824c3b
-size 138718
+oid sha256:d00920de9563ebf7e0d0a4cf3cc5e9068b6482235937cd882005f242839dc92e
+size 138822
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_145.jpg b/GIS Base Map/Marshals/AAC_marshal_map_145.jpg
index e42d620..075be6b 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_145.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_145.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1f18a80bf07d8ed752fa6f24aaf7f16d872dcb8a61ec3bbcbe4edfbc388e9cce
-size 143487
+oid sha256:2b4518e88f19d7681ac1adfe4a587fde99ae64277edab1b24e48677ee201aae7
+size 143571
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_146.jpg b/GIS Base Map/Marshals/AAC_marshal_map_146.jpg
index c7d6835..c176fdb 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_146.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_146.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fb37ddd001225619455f7a55edf126d8c84cc4db2578c2332fd51a19d2394b7e
-size 140767
+oid sha256:c75cbedff0ae7993b3cdb582f56b3c8b1d329b997062bb88f905d4eb3780216a
+size 141007
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_147.jpg b/GIS Base Map/Marshals/AAC_marshal_map_147.jpg
index 268593a..63bb1e1 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_147.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_147.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:82d9cbbf7bef1522ee72c76872ec4c5c28450babc2ac21d5d06f62fc1eb1e3f9
-size 142152
+oid sha256:6a77f233d8dae5667ac13053f5c6d5e55bc81e453c119ccbc80e58bee3e4ae03
+size 142668
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_148.jpg b/GIS Base Map/Marshals/AAC_marshal_map_148.jpg
index 261145c..4682b4d 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_148.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_148.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e7e2fd86940a5a4738c0a63e569e5c9d5dca44a4d33c77dd058681791d0339e0
-size 143571
+oid sha256:444ff70f3d57308874ddfbaadfcc9fee396508a558aae9095160e28967fb451c
+size 143582
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_149.jpg b/GIS Base Map/Marshals/AAC_marshal_map_149.jpg
index 91b3213..35e142f 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_149.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_149.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ada691ba7bb2202f8eef033eed505b71e89282a0389682e4d1f06d74152dd8c2
-size 144577
+oid sha256:5568861cf1386c9b005fb5907a0448fc97292c177ef6afbe1317f28e1f8f8471
+size 144055
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_150.jpg b/GIS Base Map/Marshals/AAC_marshal_map_150.jpg
index b461eac..877cfcd 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_150.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_150.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f7e41c6b65ff82bb8e1c546f1e6a379dbb270c45e66839f9c1ff3aa3ee98f5e8
-size 145675
+oid sha256:ddbabb6cd5d8eb00d812c331a1b02cbb52ae1049b1dbc3688ee7399eac5f3504
+size 145463
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_151.jpg b/GIS Base Map/Marshals/AAC_marshal_map_151.jpg
index 5d8203e..ed66a4b 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_151.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_151.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4293857716ecda0e106b8046471056df93e313d55c3563147e14a83491b5039b
-size 142331
+oid sha256:1ba8ac378d6d69acc6915bfbc4752f2e1f1be49006e8a467278e3159e780cc3f
+size 142627
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_152.jpg b/GIS Base Map/Marshals/AAC_marshal_map_152.jpg
index 7c0fd86..5ced250 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_152.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_152.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:72451230ba081358c49776bb0ff62a39d4558bc26a6871cc5c68455f71b3028e
-size 144238
+oid sha256:3617eea79c688397fba6760da04df97cf6a1044b2a55e4d59fad9e52c62a9e2a
+size 143122
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_201.jpg b/GIS Base Map/Marshals/AAC_marshal_map_201.jpg
index 2573a5c..ed4a8f7 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_201.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_201.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5f019d237f18022d6a1da0acd84773f4699a8eefc94dc22b684ff33510afda44
-size 151726
+oid sha256:52fe80023a466cd718dc3dbcb2b4319a8d6dacdd09b6932ed42db761f3e87e3c
+size 151563
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_202.jpg b/GIS Base Map/Marshals/AAC_marshal_map_202.jpg
index e59823f..f14b1c5 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_202.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_202.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cc1f4fbf2dfcda3442f0f123a0c52dc8d9bdb296bc59dec47bb25bacb3bdf379
-size 150249
+oid sha256:bc4cf4ee6a53350fe7348510cbe5b0f1d446999cb211de89cd1d473a8b9356f7
+size 149989
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_203.jpg b/GIS Base Map/Marshals/AAC_marshal_map_203.jpg
index 1b5b04b..808f4b1 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_203.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_203.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e0848397a31784fdb2c570b54a805c6db88ec452282221b80310c81425c6377c
-size 147230
+oid sha256:1caff629a4ffa94382fa771b811b10ac9a2c1a19b518658beb7a9e31385f4ea5
+size 146922
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_204.jpg b/GIS Base Map/Marshals/AAC_marshal_map_204.jpg
index 9134fcc..5c3ce14 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_204.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_204.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:08376933d3e6af9543d010eb52fb4503cbbc9d7ae12356084d02253754278ae1
-size 147191
+oid sha256:9871455fe9a4f34f2253316d69e91cbf3d6fddc40ee3fd67642ef52f71239d19
+size 146111
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_205.jpg b/GIS Base Map/Marshals/AAC_marshal_map_205.jpg
index f332e18..f210c62 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_205.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_205.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e26e53035353417b4fe185479a664f872211570b4b65d614d38bd8dc0001217c
-size 152397
+oid sha256:1a8c85f07c90ef54598ef0c4364aed1abbf6335022f77357d37aeedf648fac3e
+size 152185
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_206.jpg b/GIS Base Map/Marshals/AAC_marshal_map_206.jpg
index 39fada8..225c0ae 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_206.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_206.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e300c54f9f7ee136560833723bcc76b42f3ca92e3a77591c2a4dcb0bcb81b503
-size 145390
+oid sha256:f6a9a13ebcf0883bbca31d9c06d29c36100db665a4e4b0902c659fee1259f35f
+size 144594
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_207.jpg b/GIS Base Map/Marshals/AAC_marshal_map_207.jpg
index e7a17c8..196dbd0 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_207.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_207.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e4e4ebd7dfa5556b7fa9b0ffbd003c1d1047c0fcd8e86b21460eea3d5241eac0
-size 151535
+oid sha256:0cbc1f8c71d295de973080b25fe8ab579ca495f8232231246027158e43f95e60
+size 150172
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_208.jpg b/GIS Base Map/Marshals/AAC_marshal_map_208.jpg
index 56db0e9..df0b9c2 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_208.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_208.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3c5b29e70c2e87b3141aea47ccdc1d2a082720e647cda81b47b94846285ed554
-size 160266
+oid sha256:516f89763051987a1e2b121bc193aaabfbcb54f08061edf9819619568268d388
+size 159412
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_209.jpg b/GIS Base Map/Marshals/AAC_marshal_map_209.jpg
index 52e640b..6eddd2c 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_209.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_209.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:763380a6761a8d22a90ccdd0c4e5c55e6c89179ab3ad1081be3686476402e3d0
-size 160529
+oid sha256:4329ecf04e5454cd3116aa0a44fc6cf38c85c41687aeb7646d5f458e4b684b62
+size 159347
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_210.jpg b/GIS Base Map/Marshals/AAC_marshal_map_210.jpg
index c9a9dbc..8fa57c1 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_210.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_210.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2ca6cc2b24a54505bb170e82d08a1f72ff1ac2d70ddfdd6b42c99e7e3532c0b9
-size 160070
+oid sha256:804242fe42efa97c19fe44b8edd2401fce5601b27c3c40384e9605c7b999555e
+size 159366
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_211.jpg b/GIS Base Map/Marshals/AAC_marshal_map_211.jpg
index d294640..361df87 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_211.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_211.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1622329b43c3e33cf67c7fedc19c78efe09bf5232ddc374e7f8e328f3dec5cb0
-size 159860
+oid sha256:6fadcaad4f93ac8f4757c5afb8d7b96fc68184090ebf28f8ee9dc819eb3d1ba9
+size 158857
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_212.jpg b/GIS Base Map/Marshals/AAC_marshal_map_212.jpg
index bf4803b..fa58dc1 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_212.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_212.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f3c2f0c529c99fd4ee1e3892e69a4ea3ba6e0b91a0535c3a4154b781459ddc44
-size 147601
+oid sha256:cfbb38e4aedd8c20a93ee4616e96b1468159d4d4cf2120d85836cf5477e0b4bd
+size 147449
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_213.jpg b/GIS Base Map/Marshals/AAC_marshal_map_213.jpg
index cb34e2e..0063264 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_213.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_213.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ced438150910f039ed6d85ca5a4fda7cd33e53c8ec20aa50f14ff46d2a735d13
-size 147287
+oid sha256:b29ba3f960dfefb83a8be840ced53d415a3e686212aaa5185d24ecc5e03f1536
+size 147179
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_214.jpg b/GIS Base Map/Marshals/AAC_marshal_map_214.jpg
index 680e9cc..1877d36 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_214.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_214.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2ae3f55138c98d31d3e3e31ce883344b7433efcdacaddb0a834aa35802ecfeb1
-size 146996
+oid sha256:67a6916cbd9ac35dce28b7057d5146ee59d29ba584041e5f069635c95aebdce3
+size 146103
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_215.jpg b/GIS Base Map/Marshals/AAC_marshal_map_215.jpg
index 420cb4c..b7ef595 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_215.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_215.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0939da9517dca50e3666bbf144712517a419bc9f02a61d9aa3b40bd497c6c286
-size 149362
+oid sha256:045439d23b76dfc4b65e9a488efe9ba68f065c792963e4eabadce835f2d866c7
+size 149152
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_216.jpg b/GIS Base Map/Marshals/AAC_marshal_map_216.jpg
index c68ac83..57ea0d0 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_216.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_216.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:58a09bd98e974a39efd89f4507c27a1d915ee1871a1083e82e3bd74ddf230290
-size 147847
+oid sha256:5ccf66b4d8fa9abf3c45730efad824b797c69ddc04813411496945a2694686cf
+size 147396
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_217.jpg b/GIS Base Map/Marshals/AAC_marshal_map_217.jpg
index 21530a6..7b4a247 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_217.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_217.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0458216ea8ea454de5447cef64ffbe43918aecf655a8e6fc2176db659ad20196
-size 145571
+oid sha256:831dd4630aae7629216618a0667a7fa9f32f7ed8d86d09b2d6e6dccfe835108d
+size 145547
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_218.jpg b/GIS Base Map/Marshals/AAC_marshal_map_218.jpg
index 38b5e1a..83979ef 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_218.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_218.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6de9d6d1ba3a345bb789aa7681ca3d0fa9924fa27981f2d372a92b9a19e066ee
-size 140514
+oid sha256:48cf9e9916dda5dde03328c65b24f321743ba4e90bb9a22ded4d4ee8cd57cd55
+size 140157
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_219.jpg b/GIS Base Map/Marshals/AAC_marshal_map_219.jpg
index 0454650..08936f1 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_219.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_219.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1fdbfac32cb6a85346e5c5291b76c0ac2a99eda826c19a1524eead4ed01659d0
-size 139981
+oid sha256:70d1cfe72d03cad3e0f9bc3ee5945567722e4edb8045dccb919f2863f84507c5
+size 140089
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_220.jpg b/GIS Base Map/Marshals/AAC_marshal_map_220.jpg
index f9cf6d1..bb51bf0 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_220.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_220.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:01dd3d5a480d9754b5638cf534e31d8045f668d8887c13d5b62d3a380f4e3562
-size 140336
+oid sha256:bb016cde7685fde7f4e263e326e439e7aec7c848552e0e4e1c7db8f721841ae6
+size 140557
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_221.jpg b/GIS Base Map/Marshals/AAC_marshal_map_221.jpg
index a23d0fe..c6ec9a1 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_221.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_221.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6c9e52f82ba0cd1d6905ec50603b6bfe86cf671966cc331dceb09d031aa15310
-size 158215
+oid sha256:9e2c6375baa960f13d45948d808e7a44c88f025976eafb246c53d9adc11acdf2
+size 157005
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_222.jpg b/GIS Base Map/Marshals/AAC_marshal_map_222.jpg
index 074b87f..2d30b3b 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_222.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_222.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a461b7ee7825e0c0d91431a22d5df7d49c2d322c07a628ffa0b1c7eca2d9c1fa
-size 154764
+oid sha256:b4882751122197e9faf8309105325814b9d48d8f0a6c8877131d80077c423462
+size 154111
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_223.jpg b/GIS Base Map/Marshals/AAC_marshal_map_223.jpg
index a80a3b7..da8ccb2 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_223.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_223.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7c227ad7e2e84dae6abefc248487a9ce2649bfe8edbdf5ab227411a9650b9c30
-size 139092
+oid sha256:8d9c81f502ab260b7c5ef096ad62492658d5c50fc7bacd1f2025a8b9dfbfe7da
+size 138720
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_224.jpg b/GIS Base Map/Marshals/AAC_marshal_map_224.jpg
index 8bccccf..adf87e8 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_224.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_224.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9fbaee6dd7de345a4acef8bea7ea395bfa7e938bb978c248a0a5c88d05c29e6f
-size 140516
+oid sha256:509be81a33a35a97cac0fb9bfbf324558e79bbad3a23e37a140708545feb84e6
+size 140519
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_225.jpg b/GIS Base Map/Marshals/AAC_marshal_map_225.jpg
index cd64f49..a1dd5e5 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_225.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_225.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0d1c38e44348b0f055a115c4ad5360aa8fabf5ab5bc09e0840b9f0bc326ce120
-size 132885
+oid sha256:1694d95ca730e44ead56f9f9a46b0e2169ebfc56808721bea575e82f4276cb05
+size 133408
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_226.jpg b/GIS Base Map/Marshals/AAC_marshal_map_226.jpg
index 65fb4be..c2f5692 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_226.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_226.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b162d35d3526d060190a365bd7095d0002caa9ea3a2fcfdd31d8dc8651507f3f
-size 135634
+oid sha256:d125db34697bf3085e09b8c5c68919ff123ec2a8759ed56179c9e82af8d3441b
+size 136161
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_227.jpg b/GIS Base Map/Marshals/AAC_marshal_map_227.jpg
index 8b74aef..1521649 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_227.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_227.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c48b763792290d242845fd405cc7d6a1ca044ba468c9a8bc52562fe6a97fcd4a
-size 137132
+oid sha256:20271ea4fe8d8ec1108abbe048e09c8d33b523c9f5be816cff388de0d2cb4813
+size 137213
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_228.jpg b/GIS Base Map/Marshals/AAC_marshal_map_228.jpg
index 586fd3f..6a42afd 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_228.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_228.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f6fc2b0cb208f13dd46259d60838c74e1c06044bd66e95f437267009afaea581
-size 137978
+oid sha256:fa6c624f35ba875c166a6878716c33215ddc6383ef589aa7994f0d4b62376d4d
+size 137544
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_229.jpg b/GIS Base Map/Marshals/AAC_marshal_map_229.jpg
index bc5cd1e..746523c 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_229.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_229.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:50d8fe544ccd00364d10df99e3d6705124a1cc07021455a41369720e43c8a478
-size 137370
+oid sha256:1159702011f7842f00ad7eef94899eaedea5729e1b38d0daf20aaee8c618c696
+size 136882
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_230.jpg b/GIS Base Map/Marshals/AAC_marshal_map_230.jpg
index e35ccec..2698d6c 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_230.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_230.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4e4b2c26457c00f31a0cf587c66c6e7f1266dd10e8245f293f01f480cf9b18de
-size 143668
+oid sha256:1ae031490f107d4edc397a9fc4499ef8190713eceef12b259c1646b3f91f155b
+size 144372
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_231.jpg b/GIS Base Map/Marshals/AAC_marshal_map_231.jpg
index 246341d..ab0e08b 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_231.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_231.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5c685d7fd3255f5a32c55cfbf62db25f5b768104b5be0a42cce1e1be96dc8c50
-size 143956
+oid sha256:88ba4b58ff7c63e34faaf0b8e21df58aed929604d41e8af2b4477b4fc8dce326
+size 144233
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_232.jpg b/GIS Base Map/Marshals/AAC_marshal_map_232.jpg
index d49afc0..87e62bc 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_232.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_232.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:710757eb21625155ddd3de8fcd678c6b17da6973944a212955561f8846cb9c5e
-size 136886
+oid sha256:75358030428479358bacf23519a655136b6223afde3b9a0f99c8a37145745690
+size 137356
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_233.jpg b/GIS Base Map/Marshals/AAC_marshal_map_233.jpg
index 8700078..00465ef 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_233.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_233.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:408138113d9fe97cddad45af795beefcb4f8514b400f2fa1bdf3eebb095528df
-size 137504
+oid sha256:137d902952b3fceca54b6284db7f385b530cdecaa543119193ee3c75ae6ed08b
+size 137956
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_234.jpg b/GIS Base Map/Marshals/AAC_marshal_map_234.jpg
index 8ee8081..863e2f2 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_234.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_234.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b6f7a8448da8810e5ae089c1bb5eb5cbcb1c0da9ffcb7473acadd14f6cb830a0
-size 122170
+oid sha256:3d58a67b24796a81907123afa605d90221e4b3dcdb6e69b701ad8ecff7af2066
+size 121872
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_235.jpg b/GIS Base Map/Marshals/AAC_marshal_map_235.jpg
index a8966e5..747c571 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_235.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_235.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:519f6f429bc18e9ab53dfbf9e53cf2ec51388b6e9857068ace1900c0806be3bf
-size 117987
+oid sha256:3a94fde6e9e9e370fbfe27762b91055a4dfcad27b0ab668a4e810cbc3929aa44
+size 117870
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_236.jpg b/GIS Base Map/Marshals/AAC_marshal_map_236.jpg
index 2544675..0577099 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_236.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_236.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5f05eea9bd170458902b5348eb070f47210aa7742b93a6648d4c3d5e4ee62b56
-size 149730
+oid sha256:146f7c4bc586c54262aedac502c7a91b1a311766790ceb2baab5b0f7f3ff3a91
+size 149298
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_237.jpg b/GIS Base Map/Marshals/AAC_marshal_map_237.jpg
index f019474..e85d7df 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_237.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_237.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:74d2432e9ee975519804ab2143e99c1329798ca6c6174058fdcc2ba0e453fd4c
-size 149714
+oid sha256:b36877200c77e6b3bdc990f3d76ea27af1c92f67b1d4f148f50e7777a3cc382c
+size 148876
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_238.jpg b/GIS Base Map/Marshals/AAC_marshal_map_238.jpg
index deb00b9..28d8401 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_238.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_238.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5ec54a9a7620a882d78188fd43166a318b6543681968bb4e542569e459702c31
-size 145924
+oid sha256:688d3eb0cf7bdc045dd1da89c5fc0f8379539e726bdd93a98cdddb1678f16c3f
+size 145487
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_239.jpg b/GIS Base Map/Marshals/AAC_marshal_map_239.jpg
index fe542ff..c93a7ad 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_239.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_239.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5d79613af8e3e27e2ab8271191604816d9f95129579924701f60bd2b71725c0e
-size 132372
+oid sha256:53d4e283b27a104af4de82557292216b3d0081ad73ba0c2a6732588e666d125f
+size 132427
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_240.jpg b/GIS Base Map/Marshals/AAC_marshal_map_240.jpg
index 08dadbf..9b3310e 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_240.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_240.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:429a4fdfde5a3dc684951ec7c6190fd018518fecf0623c6dbccd15ef92623fd7
-size 138793
+oid sha256:6bd6f0c334e896f37324e7dd87fd9b4836813089faee4bf227124ff25436575e
+size 138348
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_249.jpg b/GIS Base Map/Marshals/AAC_marshal_map_249.jpg
index dafa4c0..2dcaa72 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_249.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_249.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6729d4e29fd0e4babc3bd2322693cbc3d66957c07115b8a6660a7b27ed773ade
-size 128512
+oid sha256:c2193bd77644211a5ea340f65b17c62788910d91e930a4aeee5d6b47a733a11d
+size 127869
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_250.jpg b/GIS Base Map/Marshals/AAC_marshal_map_250.jpg
index 7ba5964..ae2bc06 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_250.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_250.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3d05593e43de8f248d1265a0e33ab59ce04b98eb67077a849eac40fe19bf5e51
-size 111276
+oid sha256:e0099964997e1cc8bd1b45339469e15dc3dc19f792b48d96061cf3acde332475
+size 110345
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_251.jpg b/GIS Base Map/Marshals/AAC_marshal_map_251.jpg
index 3ea3f38..994ee3d 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_251.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_251.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fc50149be1e2e21b6e3525e9e8e11bdd1faabe3a33fb877749b58a17b988afb3
-size 134772
+oid sha256:865af9b3cbf3414952cff48de5d27adc9c22fef5cb9cb8b0aa15a6d58a9078a7
+size 133642
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_252.jpg b/GIS Base Map/Marshals/AAC_marshal_map_252.jpg
index 1be6ee9..fb38a92 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_252.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_252.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:830290abfa52e1b3789ff20a8136332e63cd0357822cb8aa97b17ba24fd5fd92
-size 140532
+oid sha256:671b4ea1c3e58c8832340523149559e2eaaff246f88cfc9554ee448860aa18ce
+size 140172
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_253.jpg b/GIS Base Map/Marshals/AAC_marshal_map_253.jpg
index 246d3b0..eb77d24 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_253.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_253.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8cc7f903f902fa76d042aa21cf6c9737d244ef9ca7d7d6adddc8dc364c13e64b
-size 139019
+oid sha256:2340fd2cc8cce13d38d123e56a664b0d7cc1709bbd6ac18c993063455df455c1
+size 138611
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_254.jpg b/GIS Base Map/Marshals/AAC_marshal_map_254.jpg
index d1ab92e..0b2c8f3 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_254.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_254.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0c567f235010c80121afbad9c99358935adb68a9dbd21290e1d9bab272dc36e2
-size 138129
+oid sha256:7b47f2f6f26e9974e720b238a9cf266de03ba913fc0bd39c8e5a3f9170502e4f
+size 137494
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_255.jpg b/GIS Base Map/Marshals/AAC_marshal_map_255.jpg
index 6ff5927..9bb8b21 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_255.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_255.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:be15767a28a927415729ec0ccb661154449c1de8e780931670cb772fa251c600
-size 138520
+oid sha256:e45d987118a2049f32f366aac8ecf08c111b3977784124eab52e35fb9c843313
+size 136454
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_256.jpg b/GIS Base Map/Marshals/AAC_marshal_map_256.jpg
index 3164832..295f893 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_256.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_256.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b7cb20050d8af59f03471742861efe98b4c049f5a58191d8d49b2a96558117a4
-size 136326
+oid sha256:125a50c5d211672a03fe42ea6cd497bf7d4feeb5605e0762af9406fdbeacf4fd
+size 134757
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_268.jpg b/GIS Base Map/Marshals/AAC_marshal_map_268.jpg
index 87425ae..52b48a4 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_268.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_268.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2753fa685f3ca016eb3b950a92245376b5d6bf635ca86d8f057ca2147f1d57e5
-size 145359
+oid sha256:d039a9ee6afa25000d52da5e715ac6940372770ada3e718ef253a97402bb8e7f
+size 144563
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_269.jpg b/GIS Base Map/Marshals/AAC_marshal_map_269.jpg
index 508e333..d8b6326 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_269.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_269.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dfa8c33bda682a364c1c70073b4947aa0d51e920b58d5100db8cdbb4798116ab
-size 156960
+oid sha256:55bfffec2f91761c8f066764e7d22d0a103bb5506effd4f21059b62dd217ee40
+size 156703
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_270.jpg b/GIS Base Map/Marshals/AAC_marshal_map_270.jpg
index 4b63f2b..7e2972d 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_270.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_270.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c8c4eb0583462c6aa9cea312cf1a2a61455299e9822225a1732b5ee741345dd2
-size 157522
+oid sha256:e2409ce5a8d4b3110294f84f2d717dd55b1fff5847efd6ff4f89acb1bc66358f
+size 157266
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_271.jpg b/GIS Base Map/Marshals/AAC_marshal_map_271.jpg
index ca0b45f..7ea6c71 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_271.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_271.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:922e43c253e0df70c763f2dc707b4faedf3370686b0248b43dd31e493c98e46c
-size 140628
+oid sha256:f382600c3c0df29e1655013978a9b73fa16d68b2f32a82cb48a7cea320ed97f5
+size 139912
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_272.jpg b/GIS Base Map/Marshals/AAC_marshal_map_272.jpg
index 4d6bfd0..50eb857 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_272.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_272.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d0b69e3ab7f9e2bf3777f795cc8cc1bc493f55e01ba6ac302b105c5eb9bf619f
-size 146006
+oid sha256:b34d7e2847f22b886cfbcf11245f9d16d236dae762958a0aec9967d345ff2ce1
+size 144784
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_273.jpg b/GIS Base Map/Marshals/AAC_marshal_map_273.jpg
index c508ed8..4629e8b 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_273.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_273.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a1b8db5a159358eb2c89e629411e5c3304861e0345217d99479ba3170298ebec
-size 144220
+oid sha256:40af0531b9ef1245217070ea8c5042cce7e1491269da5b1146828ccaaee446a4
+size 143475
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_274.jpg b/GIS Base Map/Marshals/AAC_marshal_map_274.jpg
index 8d4244a..4a0929b 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_274.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_274.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:310ccefb9d7ee3083fc10c6070b29624deaff1c3b80b847138fd0a4778a99916
-size 149547
+oid sha256:7d8c335b241035129fc6b8caaced291ff59e469e8bc0eea69db37833dcb0dd77
+size 148351
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_275.jpg b/GIS Base Map/Marshals/AAC_marshal_map_275.jpg
index 04055ee..7458b7e 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_275.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_275.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c8211017c46404e0ceef3967f50e1102969dce4396a371ca5e6bb70456a87191
-size 151139
+oid sha256:64b2e2e229caf81d4ac5389959bbe90ede4e9bd533e5c12a63c5fbbd4ca25ee9
+size 151001
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_276.jpg b/GIS Base Map/Marshals/AAC_marshal_map_276.jpg
index fd2bfd7..caba718 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_276.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_276.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:99938fc19cb0c7db3a364cd8fbca048567ae1190f2b9be3bc8713e21aad84da3
-size 151058
+oid sha256:c77eb0f40e84b409dba0e95fff5600f9ae931a10bbbea228ce1c2b016e48684a
+size 149777
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_277.jpg b/GIS Base Map/Marshals/AAC_marshal_map_277.jpg
index 9be2ba7..da652ae 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_277.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_277.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4c28eb756d4b363532a496b0cccf902a05ab4f63f0e416f0fa82cbdc14c76d92
-size 105884
+oid sha256:733ed2f70a830a1936a709e15c9991976dc34880e7c4e9b8ddc9bf3015f22407
+size 103107
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_278.jpg b/GIS Base Map/Marshals/AAC_marshal_map_278.jpg
index 1c1ec39..cf78a13 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_278.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_278.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:90eed372946402a45901efa03d98f5881113550feb7e08433e5b8ad6acc85176
-size 100151
+oid sha256:85c659478a73b2c3c1dc91f9ae4fd6e0509a1c7b0decbdf996589ccbf012ef2b
+size 98609
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_279.jpg b/GIS Base Map/Marshals/AAC_marshal_map_279.jpg
index f218c26..a7c4215 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_279.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_279.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1eceb0ffb18224c1e7b6de7531b105b9879cccce9c14a77f90b543fba5d9cf8e
-size 99762
+oid sha256:4ed4b3c63b0bb143a098bb04695eafbe6c592e9110fe1d756b1213a78c6c5a1f
+size 97167
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_280.jpg b/GIS Base Map/Marshals/AAC_marshal_map_280.jpg
index f20df3c..d3213b0 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_280.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_280.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ac4fa3d6bf51477a6ed7a2af137732636b8afe51069a7c306eab692e908b08ba
-size 103259
+oid sha256:44d10a8b9abfe34cbda01e3c298e3c33b1e8873a573e08049ed4f6d77ec505e0
+size 100080
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_281.jpg b/GIS Base Map/Marshals/AAC_marshal_map_281.jpg
index 5175bc3..0fb6fd8 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_281.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_281.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:446d11f475ca703e7af877bf0e011f59f5fc0165376b564990c2ef4234482022
-size 103372
+oid sha256:a498d5a136c4c6ebddd8b20a78bff53aacb41485b527e20fdccd6c5112cae667
+size 102766
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_282.jpg b/GIS Base Map/Marshals/AAC_marshal_map_282.jpg
index 5bdeed2..8531a58 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_282.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_282.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:009c0e8690e60e8ece5e62cf0b09fc4946c040bd0ce8390c7e9708108a8c699b
-size 114119
+oid sha256:f6595db6063d38a370811e974584a1348e1f6e80af52e91eee38fe7d241837ed
+size 113587
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_283.jpg b/GIS Base Map/Marshals/AAC_marshal_map_283.jpg
index ea62f7e..afaeb9f 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_283.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_283.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:889a42b4cb2ca7e42537bd6ce89babe289fcdc8b13d2714b679243ab528f623d
-size 106437
+oid sha256:fa04cbd8d2b15d0dfe9fd5cdba418fbc329b659f6d26b2f34e07e157b8a9868e
+size 105379
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_284.jpg b/GIS Base Map/Marshals/AAC_marshal_map_284.jpg
index dc371e4..24e8ee1 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_284.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_284.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:04c39070f482bd95f8b1ab114e6be5eac217925b79d0c3e67421d761d17d0d5f
-size 99933
+oid sha256:4f9ca0d782b642d9076028db1bdb367d0a9d5976959f24af9210ec4cdfd48e33
+size 99148
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_285.jpg b/GIS Base Map/Marshals/AAC_marshal_map_285.jpg
index e392435..e33cba6 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_285.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_285.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8e61a9c43bc29f38f9d37974c338350e394980f397b56d138b425ef5d15f152e
-size 104871
+oid sha256:185df23c450a60b091e57a55c7732a9169350e06cf4cf17be4195b76f2b9fe92
+size 100469
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_286.jpg b/GIS Base Map/Marshals/AAC_marshal_map_286.jpg
index 3ab7047..bf6d3de 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_286.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_286.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:803dad9909b5b963013f081c3435521d64c290a310f37201e080f99cbdf04123
-size 100822
+oid sha256:e8a0b6b89ba20e5812089e9dbbb339aa671066b686e7baaaac3a82a551c0a2b7
+size 97153
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_287.jpg b/GIS Base Map/Marshals/AAC_marshal_map_287.jpg
index 48b783a..27e7adf 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_287.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_287.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b1d8c8e7f6c6a8b7eb31e2267795953b395d050b47aaef2f202a9a6f0de70b45
-size 106603
+oid sha256:0ab35c6bc346cb083cf7058fc10409cb8d58ee1dfb9471b3cc3128fe94c4772c
+size 103216
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_288.jpg b/GIS Base Map/Marshals/AAC_marshal_map_288.jpg
index 07bd8eb..b5f2079 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_288.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_288.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:111f76a03b74d95d2df133d0dfb3100ba926274f9a99b373cacd40283276960e
-size 105952
+oid sha256:ea31e0e927bb0e8922c1fc9decb60557fd78238fa318785aaea5b324059260db
+size 102501
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_290.jpg b/GIS Base Map/Marshals/AAC_marshal_map_290.jpg
index f530201..872ebad 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_290.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_290.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2143a032f37df3024e1b8e49b11316412fe507dcfd54aa002ed25f86aba2b462
-size 147594
+oid sha256:ad17289c05a3e0b53d60e024a6181f6adec4826f38bf0ca0d8e2cdb55bb25057
+size 147242
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_291.jpg b/GIS Base Map/Marshals/AAC_marshal_map_291.jpg
index e171c0e..1682644 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_291.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_291.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8d51757abc88ff1700e3a3caa31b103bc53165a3002d78f96f7989b6654c61d0
-size 147199
+oid sha256:889ae509c1b6b70a87d9069478f2e72f703b092ec0a90020f9341ff3e549d066
+size 146728
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_292.jpg b/GIS Base Map/Marshals/AAC_marshal_map_292.jpg
index 539f217..5d859e5 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_292.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_292.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:00bf2c9767a1267cf79efc2a676e505b8bc6d65936907a226328e9dbfa4e88cd
-size 156496
+oid sha256:8f733c6f0984b6c84a362f5f440d5843563bf0ab5a0d8b17d55d47434862e038
+size 156013
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_293.jpg b/GIS Base Map/Marshals/AAC_marshal_map_293.jpg
index 3f72427..6606cdf 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_293.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_293.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2e496e67e086d28e832df2910d259e9bd5f1a5549c1078ed160945fa732f5cdf
-size 153768
+oid sha256:cbbfe59ab75bb75026cfe473c2c7755fe63748bd72c5ff34d3e9ebf27315e01a
+size 153236
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_294.jpg b/GIS Base Map/Marshals/AAC_marshal_map_294.jpg
index 9d20222..d5071af 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_294.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_294.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0cebfab2eb0159265d36d447459c8b125594cb077e3920a1e1153c26d821d9b7
-size 149617
+oid sha256:ddedc1eb00c2c17c0fbd4019bef99edf9e32546bd9ad4124d1d08bc5225477cb
+size 149155
diff --git a/GIS Base Map/Marshals/AAC_marshal_map_295.jpg b/GIS Base Map/Marshals/AAC_marshal_map_295.jpg
index e7f2ce9..7feccd1 100644
--- a/GIS Base Map/Marshals/AAC_marshal_map_295.jpg	
+++ b/GIS Base Map/Marshals/AAC_marshal_map_295.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:baecd4406209a08c9962e5773c1369b416d6b18e470258a4ed49ace6a24a89c2
-size 155778
+oid sha256:a89c6a60c0fd75114fabe275605fdaa4a1c4c8760475c8f2509b840cfef897d5
+size 154798
diff --git a/GIS Base Map/Marshals/Edgemead Runners_marshal_map_241.jpg b/GIS Base Map/Marshals/Edgemead Runners_marshal_map_241.jpg
index 5828df5..f4faed2 100644
--- a/GIS Base Map/Marshals/Edgemead Runners_marshal_map_241.jpg	
+++ b/GIS Base Map/Marshals/Edgemead Runners_marshal_map_241.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:767cd85f138da4e813eac53bde625f57c3950fe7801e3cb3c2c6cec35e4087d1
-size 137642
+oid sha256:c01ecea04c782be42257d813115002104533b8802d8e3469fb41579e4d20f269
+size 137640
diff --git a/GIS Base Map/Marshals/Edgemead Runners_marshal_map_242.jpg b/GIS Base Map/Marshals/Edgemead Runners_marshal_map_242.jpg
index 0b4cd36..099696c 100644
--- a/GIS Base Map/Marshals/Edgemead Runners_marshal_map_242.jpg	
+++ b/GIS Base Map/Marshals/Edgemead Runners_marshal_map_242.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4bd664cc6405ad122bb6962531aa7d7c92d8805472512cd0779ee1038722ff0c
-size 138804
+oid sha256:ebf074dea5d67e21ba0e17ee619df13e42a60f7dec6eac5f7adbcc9434cc92cf
+size 138857
diff --git a/GIS Base Map/Marshals/Edgemead Runners_marshal_map_243.jpg b/GIS Base Map/Marshals/Edgemead Runners_marshal_map_243.jpg
index 1c1ed9b..748aaf5 100644
--- a/GIS Base Map/Marshals/Edgemead Runners_marshal_map_243.jpg	
+++ b/GIS Base Map/Marshals/Edgemead Runners_marshal_map_243.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:02a8d19142e37a7070b8c7fb2fb09b50d915398743e81db30150b87fc04bbf1b
-size 128583
+oid sha256:3c93705ecbb8572bede616ff655cf00ff4b1d5924213979b175dcb7c8a79f86f
+size 128354
diff --git a/GIS Base Map/Marshals/Edgemead Runners_marshal_map_244.jpg b/GIS Base Map/Marshals/Edgemead Runners_marshal_map_244.jpg
index e5b4023..85bd86b 100644
--- a/GIS Base Map/Marshals/Edgemead Runners_marshal_map_244.jpg	
+++ b/GIS Base Map/Marshals/Edgemead Runners_marshal_map_244.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:857c1e783f60357ac86b8aa3df2a15b19b2662695c68b535ff57291501552551
-size 152063
+oid sha256:5441f2fa251ea438de3b341a8145e8aa4f0b69fe37f5160969589c86df78cb6c
+size 151992
diff --git a/GIS Base Map/Marshals/Edgemead Runners_marshal_map_245.jpg b/GIS Base Map/Marshals/Edgemead Runners_marshal_map_245.jpg
index 61ff847..458100c 100644
--- a/GIS Base Map/Marshals/Edgemead Runners_marshal_map_245.jpg	
+++ b/GIS Base Map/Marshals/Edgemead Runners_marshal_map_245.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9b9d5e802363c2e1d1cfb42c9aa5f5ff50fedf135233d0ce16d461cabf1ebdbb
-size 150243
+oid sha256:05f34a2707977a423d3148e8da00f824536d79a16e47358bc807f080aa1efb44
+size 150096
diff --git a/GIS Base Map/Marshals/Edgemead Runners_marshal_map_246.jpg b/GIS Base Map/Marshals/Edgemead Runners_marshal_map_246.jpg
index ffbacdc..fdcc322 100644
--- a/GIS Base Map/Marshals/Edgemead Runners_marshal_map_246.jpg	
+++ b/GIS Base Map/Marshals/Edgemead Runners_marshal_map_246.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:45efc8a35fde17ba53f1c37333d29235c8f91eed8aa8ccbf1c32482b9d789673
-size 131616
+oid sha256:2f10ca068578f848ba8a49cd5b1e0b08bf97ce622572cbdeb67e9eb60cb6f9b9
+size 131710
diff --git a/GIS Base Map/Marshals/Edgemead Runners_marshal_map_247.jpg b/GIS Base Map/Marshals/Edgemead Runners_marshal_map_247.jpg
index 6d0ea4b..04b258d 100644
--- a/GIS Base Map/Marshals/Edgemead Runners_marshal_map_247.jpg	
+++ b/GIS Base Map/Marshals/Edgemead Runners_marshal_map_247.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0eda968ede92a4d961ed859dd056715ef6ecbf151d4096ad187affd96fdf34da
-size 129607
+oid sha256:27e47513ca640c36cdfb8da4105f0b217db091473118955b52dad7a1c56c37ec
+size 129751
diff --git a/GIS Base Map/Marshals/Edgemead Runners_marshal_map_248.jpg b/GIS Base Map/Marshals/Edgemead Runners_marshal_map_248.jpg
index e4c0f4d..8e17f06 100644
--- a/GIS Base Map/Marshals/Edgemead Runners_marshal_map_248.jpg	
+++ b/GIS Base Map/Marshals/Edgemead Runners_marshal_map_248.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f5b71a625125867a664e7706f9f2d377a6425e152dd8180c07a32a7a3a8e8f14
-size 132102
+oid sha256:82cc01abd8d68718d4615cb3bdc0930918e23fe02f361b0efdbdf407dff53ad2
+size 132420
diff --git a/GIS Base Map/Marshals/Edgemead Runners_marshal_map_257.jpg b/GIS Base Map/Marshals/Edgemead Runners_marshal_map_257.jpg
index f9ccf58..68be3b9 100644
--- a/GIS Base Map/Marshals/Edgemead Runners_marshal_map_257.jpg	
+++ b/GIS Base Map/Marshals/Edgemead Runners_marshal_map_257.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:41b69dc437ee479f28a0ee3630143f60538b0107f273f09f017256d2199ef223
-size 131097
+oid sha256:9c41a1e240d4323b39e4a1c7305f671010cda8bda3d75e563f0465e0407cdad2
+size 131693
diff --git a/GIS Base Map/Marshals/Edgemead Runners_marshal_map_258.jpg b/GIS Base Map/Marshals/Edgemead Runners_marshal_map_258.jpg
index f8c66ed..5e2e28e 100644
--- a/GIS Base Map/Marshals/Edgemead Runners_marshal_map_258.jpg	
+++ b/GIS Base Map/Marshals/Edgemead Runners_marshal_map_258.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:baf16eafefeb8fe79d55dc8af948b906b9983c910b6490ce22a6b4fbeac73334
-size 137007
+oid sha256:92ec7947efbc731fbe41f5db626daf7e73977752c88f4b5c29c557af0ae8df45
+size 137450
diff --git a/GIS Base Map/Marshals/Edgemead Runners_marshal_map_259.jpg b/GIS Base Map/Marshals/Edgemead Runners_marshal_map_259.jpg
index 1c92514..c3b85fb 100644
--- a/GIS Base Map/Marshals/Edgemead Runners_marshal_map_259.jpg	
+++ b/GIS Base Map/Marshals/Edgemead Runners_marshal_map_259.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:776e6d548c0276821b502178cf8c2ddb06dd345effdbdeb9f31b3515520ef175
-size 138216
+oid sha256:6c4a072d2a23892f2af61dcae4da93229984016eabc158c9fac0bf4b8381ef6a
+size 138695
diff --git a/GIS Base Map/Marshals/Edgemead Runners_marshal_map_260.jpg b/GIS Base Map/Marshals/Edgemead Runners_marshal_map_260.jpg
index 4810d31..40d0ee3 100644
--- a/GIS Base Map/Marshals/Edgemead Runners_marshal_map_260.jpg	
+++ b/GIS Base Map/Marshals/Edgemead Runners_marshal_map_260.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:13e6c77999ae7d4b1ac4d87eda17866f016eb201e0ffb8a59cc0f46ae851e63c
-size 140203
+oid sha256:d8c177c6e5d84f29dd3ecedb2748b1835fed2dda9bffd43e93aa79855a1dd580
+size 139489
diff --git a/GIS Base Map/Marshals/Edgemead Runners_marshal_map_261.jpg b/GIS Base Map/Marshals/Edgemead Runners_marshal_map_261.jpg
index 8ec1703..b1e055d 100644
--- a/GIS Base Map/Marshals/Edgemead Runners_marshal_map_261.jpg	
+++ b/GIS Base Map/Marshals/Edgemead Runners_marshal_map_261.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bdc9b6c38f127adb8be29357a4297d038bc4402a10cae0d77c48e2d50d6ef903
-size 138062
+oid sha256:fb4ae8bf18114c2c097fc53cc5ee7b0466c491b924dcaa868464bf884fc0898c
+size 137981
diff --git a/GIS Base Map/Marshals/Edgemead Runners_marshal_map_262.jpg b/GIS Base Map/Marshals/Edgemead Runners_marshal_map_262.jpg
index 17d94df..2ecb398 100644
--- a/GIS Base Map/Marshals/Edgemead Runners_marshal_map_262.jpg	
+++ b/GIS Base Map/Marshals/Edgemead Runners_marshal_map_262.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6cfb4955ffc4693a3f7407f5641b9250d3c6d070aeb5a209007ffbbb7e576c76
-size 143035
+oid sha256:c60a8052ef9ec2c0d541d8d6097242cc074d4120a97085a54d1805d8c9c595b6
+size 141934
diff --git a/GIS Base Map/Marshals/Edgemead Runners_marshal_map_263.jpg b/GIS Base Map/Marshals/Edgemead Runners_marshal_map_263.jpg
index 74e7501..e5c8a03 100644
--- a/GIS Base Map/Marshals/Edgemead Runners_marshal_map_263.jpg	
+++ b/GIS Base Map/Marshals/Edgemead Runners_marshal_map_263.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:272a355d0a1ce02285ac3a66d270af33f1c16e0f794372fa10f0743dca35077a
-size 142393
+oid sha256:b7cd796c219d9b9af7ecf5b04841171a46efa2ca2da42bb1fb669ca4b1b17b75
+size 142760
diff --git a/GIS Base Map/Marshals/Edgemead Runners_marshal_map_264.jpg b/GIS Base Map/Marshals/Edgemead Runners_marshal_map_264.jpg
index 48b8f01..2bcf937 100644
--- a/GIS Base Map/Marshals/Edgemead Runners_marshal_map_264.jpg	
+++ b/GIS Base Map/Marshals/Edgemead Runners_marshal_map_264.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:591656a420242d664b43602598b000ffc64ba1180e4d52ce28e191c81c8b0538
-size 143304
+oid sha256:3fb87e315253ed9a3c3a26df8eef1390aad6f729594581951879d8cb88d524e4
+size 142321
diff --git a/GIS Base Map/Marshals/Edgemead Runners_marshal_map_265.jpg b/GIS Base Map/Marshals/Edgemead Runners_marshal_map_265.jpg
index 5effb4e..ab725a6 100644
--- a/GIS Base Map/Marshals/Edgemead Runners_marshal_map_265.jpg	
+++ b/GIS Base Map/Marshals/Edgemead Runners_marshal_map_265.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9329c7cc8eb9cb9b58d0469b92792ba607764e51679a61b692aef2addc7c15a4
-size 135941
+oid sha256:2d0e5c05f3c7f479b3843d0848dc86f9d4fbb2c4006e4710d2e695df8b5810b3
+size 135020
diff --git a/GIS Base Map/Marshals/Edgemead Runners_marshal_map_266.jpg b/GIS Base Map/Marshals/Edgemead Runners_marshal_map_266.jpg
index 3eca132..285e41b 100644
--- a/GIS Base Map/Marshals/Edgemead Runners_marshal_map_266.jpg	
+++ b/GIS Base Map/Marshals/Edgemead Runners_marshal_map_266.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4aa83b3205e9126a8268337fb27f9729b67e9d73caa06782357e8279e362dadd
-size 150288
+oid sha256:f350a8954d87340988b8f313e3ce0e8fa00fed6e3c469abc16c969eaaff31151
+size 148803
diff --git a/GIS Base Map/Marshals/Edgemead Runners_marshal_map_267.jpg b/GIS Base Map/Marshals/Edgemead Runners_marshal_map_267.jpg
index 9ef57a2..f278247 100644
--- a/GIS Base Map/Marshals/Edgemead Runners_marshal_map_267.jpg	
+++ b/GIS Base Map/Marshals/Edgemead Runners_marshal_map_267.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:35ebe67c9936e4318d4773ebac855b6739e02fe0db5cffffd0b02c3eb01fc6d6
-size 145420
+oid sha256:355406fd8533cff1465f878c380d8fa0c80236a2d77a08dcc6420cf0406a96fb
+size 144134
diff --git a/GIS Base Map/Marshals/Edgemead Runners_marshal_map_289.jpg b/GIS Base Map/Marshals/Edgemead Runners_marshal_map_289.jpg
index 039685c..58da611 100644
--- a/GIS Base Map/Marshals/Edgemead Runners_marshal_map_289.jpg	
+++ b/GIS Base Map/Marshals/Edgemead Runners_marshal_map_289.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dade559258a84e7fd17fcf29f9ebf89793370a6992d0ec705ad8f4b120892bc4
-size 143598
+oid sha256:9eb4a30d65f78b7fcac4126764e0d23ac938b7ac36df88c4e602a0c9b627c3da
+size 143193
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_301.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_301.jpg
index 515a0aa..4754148 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_301.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_301.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ed23e31ab4e69281cd3afc08ddaf53637f338119189d39e006e7fb57cdf33a43
-size 145980
+oid sha256:9005d08e60391062fdb7dd66728e7c2bd443e0e73890b805e27a098fbade4c9b
+size 145926
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_302.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_302.jpg
index 1d270fe..5974da2 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_302.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_302.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:31630420976afcc9cca4581e750d84a958d22ac56a2b83753a8facce4c843bb2
-size 153730
+oid sha256:d36fafe44a1373fa19639308348572c29433e249abbebdb79b6e6ce734dd665f
+size 153245
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_303.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_303.jpg
index 837f1ca..f03fa0e 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_303.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_303.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9257ee2378b0b35b69a17e78d47f9bd7c90a6951dad0f6a57a59c89ceb1d205a
-size 160171
+oid sha256:e5066a21ff7bf697210aaed9a42b211e590dba1293c393261b494f169618da83
+size 158979
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_304.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_304.jpg
index 900cf7f..9597b7a 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_304.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_304.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:38deec1a91cd775b96288a9ca2cfbddc8b36c17ae17d651c9a1f14748c6d18c8
-size 159548
+oid sha256:906b9cb34c635885069293f5a1a1f32be2287a6aaae57f0cfa6674dff0c97293
+size 158678
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_305.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_305.jpg
index 1c67e85..9335457 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_305.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_305.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:871ad160a9fdfde9808b236b2d6520f258c4fecb9c796f58ce04a76db6adf7d1
-size 159014
+oid sha256:bed23a6bd7247b3edb6600c3c092eec216468ab035378e33c924a85042e0a82f
+size 157785
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_306.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_306.jpg
index 353ca65..07fd0e9 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_306.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_306.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7177f09538dbaef6ac5f22a74357c72d2110a1711a604b192c013c7636b6ed33
-size 160104
+oid sha256:be63d823a67b567a548049f143b1c6b127bfc10d8a2fc649411948aecf013254
+size 158504
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_307.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_307.jpg
index 250e000..a849589 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_307.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_307.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7b96beb7b4bbb64365f19122085aca9a8e211e03eabf8f73931be84e5e033c78
-size 149531
+oid sha256:2ea292f9a1d5ab4336973c241b4ba2757c9153ff57cce5a5495064c354fc1cf3
+size 148927
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_308.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_308.jpg
index ac79578..bcbc035 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_308.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_308.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:750cb2076fbf26e9aa42d1e8573963c5ab98f678baebc16ec28267c0b22c1ea7
-size 150140
+oid sha256:46623b6ffa31ff3f62e4b02af511bbb5278952554a17bcce9e76882a5bdd2db5
+size 149721
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_309.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_309.jpg
index feae35d..68def63 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_309.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_309.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2a2f41b4aa0195b63338cf8c93d81efbccd443a629b8936bd5d4ad672ec74d9b
-size 145432
+oid sha256:bb8ff67ef0fac6527f965e5c1cb7df7637b1e4b24cc7700fd9721020b25070d3
+size 145029
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_310.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_310.jpg
index 9923f51..60ec561 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_310.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_310.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:843a9e591cc0a3d78d50ccaafca08837644f72325ad222bd32c3c2a2390defa5
-size 151326
+oid sha256:97d17576063fa49310522001e5e5f6c004eb3ce82c3c980c7118bdcb3c20875a
+size 150642
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_311.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_311.jpg
index 3851384..d2a741c 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_311.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_311.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:16dd33968b9deee04f15306c117ad3157f41d7b50aa3ab92ba8eda2492d69430
-size 149326
+oid sha256:0c7ae1e70e062d50002ca67ce49c8bd760804db648af56f303a4b4375fd56b6d
+size 148594
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_312.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_312.jpg
index 6177a1c..2ac18c5 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_312.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_312.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6d6f6b045da8a25c24778a96af116c7e6f64c7f503e56f8a670e1bcbbd64e08c
-size 147949
+oid sha256:fe42aa6ad1e4ea15c5f011d06a2b55907d607c19790bbafe588e616f122428f7
+size 147333
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_313.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_313.jpg
index 08dca19..286f42b 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_313.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_313.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:21edc946ac14327cd5f7de7d8fd77c11811613d2f54b68cf5aeb70508227cafa
-size 152332
+oid sha256:2574a3e40b741474a9bbab25d37936fe321844ca28d5b6645ccf573b203f6f08
+size 151930
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_314.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_314.jpg
index 1076fe0..9090242 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_314.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_314.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6bcd094e553df5ce81def819a27a1b2e18bd034a0f91491a1b2715b26d3e888a
-size 148833
+oid sha256:ab53c0030dccfe6aedd9fa7f7ca2cbdcf80cb21cfc48ed23708e43d2837a856f
+size 147823
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_315.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_315.jpg
index d522e06..af54323 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_315.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_315.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:48aea2f22228d37cd76a5ff599c6f2ba4db6da181c2cef7f8c41009f21f42de2
-size 147426
+oid sha256:72e7be03ec7376f8eeab06dc9de2d9be1184a93ab07d869102890109642c7255
+size 146428
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_316.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_316.jpg
index cfcb0e8..18fc18b 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_316.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_316.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3c7f8112e852dd9294ff6da656c588b2fa89a3837e4eae1fc87b46739cec8794
-size 158184
+oid sha256:67e77752e8cb8deef2ab972e893e0c0448c270907c792658d83846297ff07431
+size 157179
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_317.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_317.jpg
index c1e0290..dcfab6f 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_317.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_317.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9d7ac4eb1bc3f14a8ab6403dc7a0955b0f08d818828744d2e50138a0c38b39f3
-size 157104
+oid sha256:c4dcb393d5dfb0b3dc406ab2382b3723abc505ecf60a6ff05cd55df3761ab72b
+size 156245
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_318.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_318.jpg
index 6e91971..870a980 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_318.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_318.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2e9fe96feec2cc0f63af3848ba3cf141f9458804c46f414a4dbe22d9be240db4
-size 151915
+oid sha256:a3fcb42a69b6002cae32f4f9460042c1b1b32e6651de8b33dbccfc67b566d381
+size 149922
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_319.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_319.jpg
index fceda2f..1c427ab 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_319.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_319.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ec535b02d5672e13808241036104b9548c0c3af676be5ea713567be700dbc35b
-size 152030
+oid sha256:37ea3037631f95d1acf44226546ebface4c280aa0b3c73a5894d63c05ee0d116
+size 151025
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_320.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_320.jpg
index ad79ac6..3b997c1 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_320.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_320.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bbe22c1b3690446193583a55fbc84c23ba8e3497153f220d5652525073025b27
-size 153653
+oid sha256:930e98232ba7556f9f4c5ae657edbd71dc434b02ea39aa1ff7b32261bb3c0df6
+size 152768
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_321.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_321.jpg
index d867366..2c56858 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_321.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_321.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:020dcab751e656a1a6a6b40f46f04e451728b7588497b18759d6bfcf20b69b44
-size 154334
+oid sha256:5ad4e806dd6518533826062148389c2551b8135fccef85de958e543c8f0ea51e
+size 153210
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_322.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_322.jpg
index 8fb311d..136089a 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_322.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_322.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:87c03cca4e8eef580a759628705be5e245013b5348e364c0ebc86306a1a5b984
-size 159591
+oid sha256:1938f0cdce62ee2298635a95c93150562671fbc4a6a8e0b2be7be53f0e8385f5
+size 158634
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_323.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_323.jpg
index 2123223..420ebcc 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_323.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_323.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3fc20ea818812bc95eef73d1973a527efaeb121965865447d8feeee1b314721f
-size 146801
+oid sha256:fdb44da5712aeee01ffdfd0c6cb0fb17f589ad53e16485fa202909ff062adb11
+size 146268
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_324.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_324.jpg
index f242058..b86faa0 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_324.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_324.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3a050b8bef376ea66d1fd9bcd4111d13c3e9930894866b6ec74bb6218163a811
-size 147845
+oid sha256:20e6f6a9246ccf6cb27ccf2d9a79c9054eb498606ddc98299f1ec25799f67e59
+size 147455
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_325.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_325.jpg
index 576cca9..f713477 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_325.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_325.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8e06197eed582231036637deb94b6ba1635d0be6e1e762efad55c3c4dbe05be8
-size 147565
+oid sha256:7ac5a4b78de078ae5ad24d64fd8ae2c048becc77b2606365659e937daebe3841
+size 147121
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_326.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_326.jpg
index a0075ca..c5ba360 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_326.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_326.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6486d7d57c1a7a280332bf21a41063a6113c5d2b5ceb8636ffde73e850d04252
-size 155520
+oid sha256:e16a43126467e3da1a971c26119199b7a4ea7ce744130b7f7f72e7c7191574da
+size 155332
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_327.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_327.jpg
index 59d591c..f2271ec 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_327.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_327.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:08a3006a5ca09506b2d9f317304864cbf237c98f928d27cbcee437a626bca211
-size 149636
+oid sha256:914299fff2e6b9797fa39ad190440d6fcf9aee587260153e88a62a666d7ee0cd
+size 148943
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_328.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_328.jpg
index edca48f..87e3210 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_328.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_328.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:baec6c98ebdd332eaf803d96604b25880a39e21ed226645aa14718d1bcff6a55
-size 147917
+oid sha256:74a7d3f5f26548dd5d4a6571b78c9bcce9594be1337b8f32a7ae90b62049a29e
+size 146933
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_329.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_329.jpg
index b315066..d25bbc8 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_329.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_329.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fc64ad5eec69a5aa23b6f5deb141f72aae023177a12fe43c6e7919bbf7c8e14d
-size 148808
+oid sha256:d3399dc75640f25e849876e5f02a6f36bce2aea444ea241b2aab24ef96a0c963
+size 148249
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_330.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_330.jpg
index 229d4c5..896198f 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_330.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_330.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c40a976582565820137c1573a99f77b732c1c6e7a6edc63a3cf32178d4cf1f98
-size 159604
+oid sha256:e3a517cd73e09a79763e8c0afe30bded50f324a644d833014d122e59d5b50375
+size 158206
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_331.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_331.jpg
index 677ed68..c0b2816 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_331.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_331.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c91831f6481afd581dd0b89ac0b57c64c408abb0a03f4c780375c631ed53a8b0
-size 150668
+oid sha256:2518806181806569df867ac70392a8b81bf18e06092815bb92234df6f8f9dea5
+size 148498
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_332.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_332.jpg
index 94b241e..c5da874 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_332.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_332.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ccd2860d3c250c1c21f1c16b335fb096c7ef1ecbe4314e33d7251a93818629aa
-size 154940
+oid sha256:3c985e231b7f3c6d91a0c6322cf78d27bb891c2079adb7f2737107494f7100f9
+size 152569
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_333.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_333.jpg
index 3b5224c..3e232d3 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_333.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_333.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d5c1de5e8e9571531e4a317c83c8e9f6ea578adaf202862b96a66f6a52d56191
-size 164666
+oid sha256:e0a07876018b4fd5a9cb7c24b3d8933fa2620120c1a1078615baac9ef090e4c5
+size 162720
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_334.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_334.jpg
index 83fe002..27d625d 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_334.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_334.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f6ead6ffab6c68db7e2472ce1401f317c91f682b5e79cd4e0954b48bb4f1c789
-size 160773
+oid sha256:f131ca3a62b958f49a5b5d464fed6d55858e1740895f28a59fce4549e2467a33
+size 159413
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_335.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_335.jpg
index 52cb303..9fc9843 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_335.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_335.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:39da75c9c9b03537c34c203387f09b5115e805a9bf2509f1e2fbdc2bfaa55c73
-size 168330
+oid sha256:1c4e61922b62894d11a2796bc5a3b029bf603f5f96db306596b864d129adec64
+size 167920
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_336.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_336.jpg
index 1490223..290148d 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_336.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_336.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3481e8c4adf278347a8f226d566ac6037bd799d06d592c4c5ae979f7873f13b8
-size 156000
+oid sha256:957797e369adb16d30326c40fa6e821396a2d9f65d02e3fd3c821fcbe15f7c2c
+size 155031
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_337.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_337.jpg
index 0c84168..76f63ff 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_337.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_337.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e77c8862c21c7b4dfbd97e5c341630c0f9c4684cd1e88b33ac783381f037f0dc
-size 165807
+oid sha256:479c0b035fa757726701b3ccb3c75f31d696ae37b2333fed3de38acd894c26d0
+size 164320
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_338.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_338.jpg
index 40f162b..e12f3cc 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_338.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_338.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8899441abce142bae939f3a9aeead26a723632787fe3b79ca045713054d09971
-size 159180
+oid sha256:041513cc29c6469ae6ab273a688a3cfe7bd08ff24cf8c5676ddfc80a3d726022
+size 157686
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_339.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_339.jpg
index db96432..c529663 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_339.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_339.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dd1a187bcd7a1ca94f5bb54dc23a00b7eda052b9b22ca9e6fa81c1b0a181dde5
-size 138760
+oid sha256:7fca9f80bc997151e7a3620f8be6cfe83d9b68d3d47d20914271ab58edd6091e
+size 137951
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_340.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_340.jpg
index e3a078d..8cd1554 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_340.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_340.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:47ae6fd807deb09dcb1f12f3e4c41ce4e51e283b3f8ccbc6700684f6ccbdd6cd
-size 157159
+oid sha256:27500a0f6dfce4aa21cb40214d07b19288f321bdf29518befdad6e1ec6a799bc
+size 155957
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_341.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_341.jpg
index e68e008..5668b8f 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_341.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_341.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:077f981c7617803c05e8c5142b95d79c07015e3c0c9ac81a199a097245623393
-size 153397
+oid sha256:95c1b69d57eaf3ffb1903957cf0a0fbbc660355c80e2360aa0d77d08fd92fd31
+size 151182
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_342.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_342.jpg
index d575794..042f7a3 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_342.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_342.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6f13eaa25b518c6c8f0cbd589d89d3d08694e21141ea6c127b6b9a429f8d1595
-size 144923
+oid sha256:5b2aecb17975c17c3cbff681ca90bfe4c0c175ca8cf10d4a5d1cc49210d5b894
+size 142965
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_343.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_343.jpg
index edd5c8e..7519b7b 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_343.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_343.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cf51e7c9aa89e12071abb1b880d07980f8cffa85bbd75fafd86b44480fc221f0
-size 148577
+oid sha256:f33e25a8d793d752cc172a05baea3979ab61929ef9bb58c804d5ef2b2f9d0cf8
+size 146969
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_344.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_344.jpg
index 0584673..580e355 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_344.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_344.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:43c830ef396fbddb0454bf5bc6397127b2ca2638b51f5eabd236900be5a8f648
-size 151470
+oid sha256:8e67147ac6ddc9999634ba2adc05e6e1ade5c533a031faa39b60596dcfc9d052
+size 149254
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_345.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_345.jpg
index 403efb6..8575833 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_345.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_345.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d3e32aa83428038801c8e3cdcc28960a1c17ffba163e67a09fc0b0470bedb568
-size 157776
+oid sha256:8d1284aa8c58c4315ab312cc99bf7a7071d2b7c5f19b08d36b66511e83ac2826
+size 155389
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_346.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_346.jpg
index 5a5e17a..b0d277b 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_346.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_346.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f166abc01fea6184e72ecd00b6ddd29b3179b64f461af7564b3fd83f96aa5ebd
-size 155755
+oid sha256:d65db3c1cbe72fd48df19971c59647f341c7a7c87c72afcfa8142039e715575b
+size 153765
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_347.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_347.jpg
index 13463ed..99aa2eb 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_347.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_347.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3710fe14557b4bcd6fdbf0ef3203546d88eafd29b77470a22c580208bc36765d
-size 155001
+oid sha256:9ea8b67d00f9eb523c7088963aa80649b97345d76e72fb5f21fa2cf317ce40bc
+size 153307
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_348.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_348.jpg
index 5c54cd6..cbda6af 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_348.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_348.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:27c9eb55a411d5601e22921f81dc223f6b76356c31902c894a7a9db86595e977
-size 146231
+oid sha256:2967e8e0b32232cb3cb105cb79bb04bb4a1e2c438eb75fc3190ef1c6429e427f
+size 145207
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_349.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_349.jpg
index 554dc40..92b2ae2 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_349.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_349.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:546877fee24f3af6766e5f194d544472e039230ea37a0105c39ad0f090175484
-size 150816
+oid sha256:c4a003d8cb1a39eff42b4527708095b5131cd7069e07dda0013fdbda51b47942
+size 149151
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_350.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_350.jpg
index 54f9b69..e936411 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_350.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_350.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:630b22448b39eceac66812830364258cf45ab60749686dfded47bff39fe45a90
-size 152749
+oid sha256:c52cace872cb3395b0cff9db654553e9f94d082b97c9f166649a8f06f0e25c2d
+size 151846
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_351.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_351.jpg
index 6be75dc..aa603a0 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_351.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_351.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:617fb0a3464aec276b37dd089594802f911403d10060604109ae9686d06d8a23
-size 156391
+oid sha256:511efb82d5d557a56ea284c6522c7ed2310e6e6b860a714e87b2ee932ffe228e
+size 155391
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_352.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_352.jpg
index 3580005..ba8f90f 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_352.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_352.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6db00374a96c0be341716951ab1e69be276f6f04cb7432ae4c539f41936d1d49
-size 156634
+oid sha256:8a60a95ba05ca48bd19359e935f775672000c7896fff5af09381e2911005446e
+size 155440
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_353.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_353.jpg
index 7f2dd69..8a9596a 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_353.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_353.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3d32e9ccc1991cc470beb3849ab86707d7b22ef567bd6b18b19a7f3be615265c
-size 160857
+oid sha256:e4a7e8d052c15f250aa5757f15fd2beffe20b35445749e8944d98c14e09af153
+size 159948
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_354.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_354.jpg
index 6f5c274..fd77a86 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_354.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_354.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9b6dbddcfdbfe69026929d9deb59fb99eb9193accc18fa6a1e7b3ed2e3ee14d9
-size 161860
+oid sha256:2ff7ff58b51df87e7d67f964e19fe7756bc353dd3bb9edc39656253c038e65e6
+size 160452
diff --git a/GIS Base Map/Marshals/Eerste River_marshal_map_355.jpg b/GIS Base Map/Marshals/Eerste River_marshal_map_355.jpg
index 85c9daa..b85f0b6 100644
--- a/GIS Base Map/Marshals/Eerste River_marshal_map_355.jpg	
+++ b/GIS Base Map/Marshals/Eerste River_marshal_map_355.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e043cd2255779c97810aa96a0db95b9f9da2328bccbc4cc378cd37b91c401691
-size 160179
+oid sha256:5c19981ceb821411a87ad85e9a5b4a151bf90199b46ede34f8a593a3fdb4a66b
+size 158641
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_520.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_520.jpg
index 4f4dfb0..d6c010b 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_520.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_520.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:96ae323195b3a02952d54dbde25bd646b0abcad077b722fa2e484e79531d9db5
-size 156910
+oid sha256:324f66b93e48c1aa6e273abd8f6d75635ec9f84507155888eb7b901b3771f81f
+size 156647
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_521.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_521.jpg
index 11b8b8f..ae585ba 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_521.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_521.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d6279a205a8700b8c1dfe09d6169ac2b30d8d8105ee93f63505121fee965a7bc
-size 159318
+oid sha256:665657cb3a4c7c96d59ecd175309dd4a57593e183359f9b6cffafba99320f59b
+size 158714
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_522.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_522.jpg
index caabb76..0818c42 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_522.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_522.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:96f999122c3c7d6ff81bf887b9c09695f629c651f1e314ab325e7d94d5bc951e
-size 160195
+oid sha256:3a05764e6cf30a20ceb33307cdef5e43b2f918261d5ab66458e19564d468804f
+size 159137
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_523.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_523.jpg
index 560dd18..025e951 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_523.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_523.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:000e74e318269dcb34a8e19ca6b340c9debb1cc26b378dc41714eb38a39e1097
-size 156366
+oid sha256:5c82753f3f36280795bc687f10cd52d7a1a9f6d4f05a3c715f1688adf85b1f5e
+size 155653
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_524.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_524.jpg
index f7680d6..580312d 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_524.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_524.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bb3797b75658aaad3e24e69c7a197b0bbf2ee026c91fa032bdfaabf5661f16b7
-size 155951
+oid sha256:6083b3d809f8a57c32af2be5a9dcbd194b35d8741b46f5529d316d032b528eb0
+size 154897
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_525.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_525.jpg
index ffce81a..a85568d 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_525.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_525.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7f8229945caaaf80faa8172b3f9a2979c14e853359213a80869d1941bd86409a
-size 158378
+oid sha256:968581b23057f8ea50834011bd849f67f917f498072516e734d8aaaf76eb881e
+size 157920
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_526.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_526.jpg
index 74bfccc..1332f4c 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_526.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_526.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3cf24c73887ce26f4a9a95f2db7ead365e9e92650456bc8eeaa58ab8cd008f26
-size 160290
+oid sha256:13728f4d2dd37dad2e272613611ef06bd9266b409f41b12fdb85245cef78dea7
+size 159551
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_527.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_527.jpg
index 6d34ebd..9b248c3 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_527.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_527.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b6ff264b55062cb749ece5f933f318a762f47229c8c24d05319b3c2dd667b900
-size 156968
+oid sha256:09f668eea8e5c29956b1c98c6e5084f29c3ba68e9b49806eb5f146434621e6ee
+size 156698
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_528.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_528.jpg
index 4c65894..e1027ec 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_528.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_528.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ccb9b06b3fc99510cab36434f94c55e0fc55bfe02a02668105dcd90278a3d036
-size 147843
+oid sha256:2892823bf23f62ef97ea956097f2f4604c86fa9020d8f32f43450b0887741fe2
+size 146929
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_529.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_529.jpg
index 5efd31e..c7bb66c 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_529.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_529.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9516c035cfdede37c50f0c8283c6c3de7a0e1ffc89f0e7f837845e0afe6f912d
-size 149149
+oid sha256:545b30ab94f72e822f07f014d09d2ff5e04e4e69ea84db095856070d76198432
+size 148892
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_530.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_530.jpg
index 74bc285..6233846 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_530.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_530.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:767049e9f03c6fbec506a7837b41706d4b44a4915568c3b5fb1388d113fcfd48
-size 148958
+oid sha256:349d47c4315a364cbdcb9e5014cb6f5ed6bad9757179cee8ffe4aec41c53388a
+size 148811
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_531.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_531.jpg
index da0d63e..55a4f90 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_531.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_531.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:93eb99f82c3bdc741453f09bec330fb0da6fa7982478d8beaf5bc4c305bd8692
-size 139374
+oid sha256:47cbfb92a31712703b747d2095970145198730599124a43111d1dd97a6f39a3e
+size 137512
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_532.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_532.jpg
index fa104e0..97168e8 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_532.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_532.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d60f434d16468d49db9f97c19079334cca8f6147c9c9ee862ce3efa7fc731707
-size 138079
+oid sha256:03d8a962813f51587f53ab9b8876d6b760dee08d8c2b91310d02ea64f36b83f9
+size 136834
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_533.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_533.jpg
index cc3c548..03afcf8 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_533.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_533.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7e81b0f7e58090d0825929a70673c5ebd8afc895e50c77912b14076b233255a1
-size 134060
+oid sha256:930aba0f4b858ded0f4b4b36c12036be3eff66b90b9a45f0112d59e3037575ba
+size 133326
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_534.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_534.jpg
index af121b3..a9802fc 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_534.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_534.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:21c9818dcd65dffca8603926ccfd34910ba14a2745f73085bf2039bea7d0bd6c
-size 133587
+oid sha256:9d4f243ccd11f0eb67f1aa4833e60668b0407979f61ee3e67b40eed22a0300b7
+size 132453
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_535.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_535.jpg
index cad114c..f75253b 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_535.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_535.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:58b4e8cb5ae7574cf6067809ebf18b484454965fc1079b7a86dee57580a42ee6
-size 133882
+oid sha256:2dc4baa5a15f1676ebc5d5136bd0612c3c37f2f76e13a9eab95a1a74402b7bd7
+size 132384
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_536.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_536.jpg
index fa7f914..ebd9151 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_536.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_536.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cf03605074dfc7543ccee4bc55c18732a9e2e71d6037f0cfd147129210bf7c1d
-size 135626
+oid sha256:dccfc8d8b228f4aec30a5fa8615405a13b787d6b1107e2dc77aee19b72e11a11
+size 134206
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_537.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_537.jpg
index d0c235e..4d1f0c7 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_537.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_537.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2d703648bf48a1021b07e5e9f548183376c7a061defde9897fc29d18b04ab783
-size 134258
+oid sha256:db97d54a188d012e81285d275eae5d2c04929c662738b08488459d5d44805c89
+size 133600
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_538.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_538.jpg
index d2a0820..4a80414 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_538.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_538.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:55573c0f0a665d01e452995e62783bb1cd307a56819aa4d4ff52cb85c9ecfa25
-size 143772
+oid sha256:31376bdf283fa0232d13445f76209db09bac94b41527f02c7af79e0a066822af
+size 142240
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_539.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_539.jpg
index b1bbe90..06cbc71 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_539.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_539.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:38703399854c643d341d81febec63fb94cfe97815c20bed82232e38944bfe695
-size 145523
+oid sha256:c98490004d1599ccb6c7b6927f70605631c37037b987fdff3303a4b30a04053a
+size 144010
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_540.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_540.jpg
index 66fcff0..0296721 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_540.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_540.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0c4c0e4e634606f6080881ad4c384e208f98e8ebcb51b519bf6d63674ca60da6
-size 153573
+oid sha256:3fbaef3853a3139e38aaf8a4c20b3276ebfd53cb47d363a97be709107de78f74
+size 152915
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_541.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_541.jpg
index f19256e..3bc2a70 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_541.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_541.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8c3d9789ce721b35a344d32d4bc87eeb32fa9e63f6ad143fa65aaebe394c81e7
-size 153307
+oid sha256:832a0415f231ab9497895da2b0f8746cacf9c680d1df3bde156f0808cad7c89c
+size 152811
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_542.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_542.jpg
index c3a5d75..77acb09 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_542.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_542.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:02610f30ce2fa852ebd400b7b298b0cd18b5ecd2bb306a3d62328beda47b7fdf
-size 153429
+oid sha256:7116d3a6c9272a26b7eef927199318b22ba6eab1138c215f72148a5f60267965
+size 152607
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_543.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_543.jpg
index 52db839..ffb1acc 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_543.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_543.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a390150dd0c8554a0e508fcc4edb96c1a7ab8f0d3501587d136b05cf4bd6907a
-size 150987
+oid sha256:65cbca8a0b9d7943bced13c39a2ad4e14632a02905d20da478adec93eaaef85f
+size 150507
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_544.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_544.jpg
index 16039b3..d7ed892 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_544.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_544.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:27cbf57ba354c644b9050392e303523bb165efdfc762ae5441ebe60646da4b44
-size 153734
+oid sha256:4bcef25c05f06542c1796d52288a17fe14ed7bab422b6fdc47b92e9511d89ed7
+size 152867
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_545.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_545.jpg
index 7690090..6721e7b 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_545.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_545.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fa0802eef4dca66f525a62dd6460072101805d95a8f9defeb6b63030cffb0cae
-size 152598
+oid sha256:6e37aa9fedb9eb3b43a0a27ef47101f6b8f0af3bcf818108fe7601bc36b3e890
+size 151672
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_546.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_546.jpg
index fa96ae2..6dfe00b 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_546.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_546.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ebb4ae0b7e3e23c64e3a67f9e7499d55950d9844ef17a98041554a0056fe8a6d
-size 152486
+oid sha256:7c73c3ad34748cc18d70a6b97f80259cc26f7a367c127498fafa7f3ab5a18d86
+size 151458
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_547.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_547.jpg
index 73ef02c..bcc315e 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_547.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_547.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eb745787009c27c6435486d8f38806f0310f59317488ef769264e5bc389ea4e4
-size 151627
+oid sha256:5d150a33775cb97aba7bd044aa8b48090718a05e570f992844776a49fbc4d53f
+size 151443
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_548.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_548.jpg
index 9497a98..34af184 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_548.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_548.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5433712637dd70bce90cface05ca90204d536232571cbda9daa6a72d30ca2bd9
-size 151694
+oid sha256:694a9fd82fd4334a64efa0e65adf63cd2377880ff8fc04a396c3032d09749387
+size 151023
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_549.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_549.jpg
index be268d1..79dd957 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_549.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_549.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:65e132b52e04f9fac733089c854dda23ac9b1501d8ecad01806114688100ca71
-size 150983
+oid sha256:666fddb13797e43088152d5cace72e803b7d554f456226a313a6ca8396d0b9ec
+size 150719
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_550.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_550.jpg
index 00d2132..bea4129 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_550.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_550.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0c753df248906023f2d49f6263aca6ea39b4a8f71ae18da19956493fa40c00a8
-size 151439
+oid sha256:88500cfbbc5f02622e253f6e642251a9b574acf1ad3aa76473d69e47485e00e3
+size 150807
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_551.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_551.jpg
index 8c2fdd0..56684fc 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_551.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_551.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3ab8c553d144ec35a6b1dfeb8e790e6461f89dd76302ddea6a7c0840930f4b2b
-size 152336
+oid sha256:0fa5f5c3a9bfe20bd106b05dccbb45d1e0b861837d0a59bc6280a360a528017c
+size 152025
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_552.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_552.jpg
index d5b8d44..db83584 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_552.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_552.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6b4bafc215af334abfef2ac2f6ea0905852d9db5ac65f40e726509c6dda1e310
-size 152065
+oid sha256:19f2e676bc234bbe6a2718c8e898443cd6a3c7744166e7928a447710f15bf9cc
+size 152150
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_553.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_553.jpg
index 7c045d4..66e951f 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_553.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_553.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4489e33fc11a69a2dcb2d5fe384ac9723a147425232c4604d241dd6a7096bbd9
-size 153000
+oid sha256:df34e27b1b5ac837d98a28b37e38699dfc4cbe46f9b9eb3d9786817e5ff960d5
+size 152354
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_554.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_554.jpg
index 1e958b2..fd3c071 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_554.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_554.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1daccdd5bcf98fd86280c2e6f2b09f8aa585bf30d843adce6fee0a7e48849eae
-size 152179
+oid sha256:6b560859acf693a056e4012bcc4816bba55bb7cee4128e021c49cdb658a365ad
+size 152013
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_555.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_555.jpg
index 6be35da..f8e26da 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_555.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_555.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8781983e818fed38814d77ebdfc85df8b8291baea0b736cf2a76d8bc746d18f1
-size 154028
+oid sha256:56ae3254e254fef4f050e6a83f91bee003976cfe284a0b389df7cd4d7109a96a
+size 153879
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_556.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_556.jpg
index bb9457f..3a1eff3 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_556.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_556.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:be964722f40f5c96b7f8674be637a0e9c924550e2cf60bf893957f8af5c0b1b4
-size 155373
+oid sha256:4ed431b19ad564d8eb38e69e5ea0fb72667672d14b6643855712a2555941f731
+size 155017
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_557.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_557.jpg
index f3d6329..64dc0b3 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_557.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_557.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eb3fc8f04c3e8aef54a384aae772727f804279b1546b72b5157b88ff33c28590
-size 152548
+oid sha256:56e93fbcb7f352ca26f4159ec19888b954587b14f51f2bd52b19f71f8d569624
+size 152278
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_558.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_558.jpg
index e5d94b8..2787eea 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_558.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_558.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:87af4ad883573857f69168e53c480a8e769ae0721abc429a2a5a3ea7257dd75d
-size 148408
+oid sha256:5dd23c3b0240ff8a18a82aa5c19b99aeb7d45ce79ec93b4cb1da91274479628b
+size 148289
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_559.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_559.jpg
index 29a777e..e85075e 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_559.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_559.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c2202efa2e61632f8ac02da83ad56464ad40f711fe80317d47f30a015dd6d215
-size 148792
+oid sha256:635e5d96f30264d83dbfccb3fb40ec86c620bad1ac430e226ba15262da259608
+size 148196
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_560.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_560.jpg
index a10b58f..4b74637 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_560.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_560.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:65da543be2253f6b798e696ed3df20b6e2d16a7a061a0cb8a253d81b51ad7faf
-size 145520
+oid sha256:0eafe1f63145a991bd8c7765c1eb50b271e78682b557ffd8223827cd37f6df8b
+size 145358
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_561.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_561.jpg
index d4fcda4..a1d495a 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_561.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_561.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bc023d61f42dacc88c3d32b97dfd4c8f3baa73000d62b44540946835201672fe
-size 147465
+oid sha256:b6fb97c407bcce98aca8f1f3c2cbbdec86b80683cd3564998f7d8a0c0fe8db43
+size 147195
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_562.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_562.jpg
index 5e717c4..48d18fc 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_562.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_562.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f1df88555a41133eae07c9e5e44326ef3969dc55e9226eb7fae144da3b4ee44c
-size 144793
+oid sha256:b859105b68fcd704e6340d244bf16d36d479888a1fb91d58d5d2eaffde38a791
+size 144821
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_563.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_563.jpg
index de62165..06ad999 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_563.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_563.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2105e0fa6b7179a55e2e231e5ac86cb9a4930db1bdb7cc87fd025d8004d08c2f
-size 146254
+oid sha256:a77761eab4bf2dc52093cd36e6ecb1c7da449b9a50c0a5b6d8bcb1dce7f7bb50
+size 146204
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_564.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_564.jpg
index b1364fd..c42d7dd 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_564.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_564.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:433fe7575eee7586d063e5b1fb045c015b60101f3c1fca0caecbddcf95e0a42a
-size 146177
+oid sha256:6afcd51c3df6b22b7694cdca9ba87a66183dd9e3cccd1441393f3acdb959d3f2
+size 146340
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_565.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_565.jpg
index ef1ed10..fbfc48b 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_565.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_565.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f74138522b4c23d261e3c5748eef6903131f552c4574ae464a5e25df5aff8dcc
-size 159402
+oid sha256:d44e193932cbb802df6c1328bafe4f0a1723e64ebb0340400e412df5b12c70b2
+size 158530
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_566.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_566.jpg
index c83b4fc..cc5377b 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_566.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_566.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c9022648304b11a9adc81a02cacaa121e5bcb311fa196974184684b56fc360d1
-size 159801
+oid sha256:50fafb65cf5918511a2b6b57646f5ba8ac5e17d8d344c98d26943f447ba96810
+size 158754
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_567.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_567.jpg
index 161f054..fd77b18 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_567.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_567.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:27479413d69af1b8bd56709391a9c56a9a6d07673b688f98ed05ea19cf8a6eec
-size 148358
+oid sha256:ce0298a774aceb8b5aa003ddcacac850ace6ad2249629472b820932934c115a5
+size 148659
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_568.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_568.jpg
index ab54739..5304927 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_568.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_568.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fe3646c6ab032b54807450a45475ceb0b3ccd27696b1f89ced423f7dc366a731
-size 147584
+oid sha256:903b9a091fce05265f9491c29310a934c2bf6f1d4e330c597b481c2f1e6e18df
+size 147097
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_569.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_569.jpg
index b85a908..d260321 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_569.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_569.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a0cf0ce69068d9ea0fc371fe74962474343b4a554f0e9b6dd2c1823a570a227b
-size 144400
+oid sha256:280843202e8470a388d0802041536bbc7a6daf130a74ea4d09277c441906d1af
+size 143463
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_570.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_570.jpg
index eceb38e..e728e7d 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_570.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_570.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d21bf65beee904f92c612892ee155fae8c0567b87278f59783d78e3867b4b742
-size 147168
+oid sha256:1a1e6c31934b4be9c76976a518cf6525f14cb7a5b60c29e310ddbf5ba0c0d1ca
+size 146681
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_571.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_571.jpg
index 514b064..4640d94 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_571.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_571.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eb977d917a11cc1b80b68e1eaa13e4dc24aec005b3bc928a479c79c2176474ba
-size 135502
+oid sha256:eb09bb12e0373050783ae3a9cb6a00c27a94b49d358c6089c2f59e157fe3b45b
+size 133428
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_572.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_572.jpg
index c5b35d9..229a8e6 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_572.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_572.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:76706208cfe6d75a912be9971461e4e45cbdc9e6d8646a10d54edc60442be481
-size 153341
+oid sha256:911daf01307cded43102719b112b273ba6baeba1963e62febfa307d3ab490a6d
+size 153035
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_573.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_573.jpg
index 0ebe640..b7c6a5b 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_573.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_573.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:de02a5b99b340deb6b791157e031e2f54d67ca61b7c20e4a33689c674fbe231d
-size 152381
+oid sha256:5d080f447f28888028f28fa972a9dcb9f298ac0e634bd1172d27024c5bd0f515
+size 151908
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_574.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_574.jpg
index ecb4865..fc26eb1 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_574.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_574.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f133c850fa2944bf9dfd84685d576217a2fdbf16e8ceab09cc55777f01b961ee
-size 152584
+oid sha256:436bc77a75a16fac6e46a19144c3cd07363f4c00c1cebb91c3f6f2b1481b712d
+size 152649
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_575.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_575.jpg
index de7e5a7..13fc3d1 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_575.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_575.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2df649fbbe3bd4f9479fc23a1f1c036c273057a7be0f38c4d52cc82f8aca464b
-size 153405
+oid sha256:154af8ed204bfeec140bf806a148de43286eb79e936f92c2564e7aefd1397626
+size 152661
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_576.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_576.jpg
index e8b7a02..4f19206 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_576.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_576.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:94acb1eaad54a4be941e2baefb2687c8d05cfa8d5bd9d646072b197634fa6d09
-size 148538
+oid sha256:c8d296f999c385beb6b8c9611e0b12df10c6f528056ca17ef20821aef636ad32
+size 148312
diff --git a/GIS Base Map/Marshals/Midas Spartans_marshal_map_577.jpg b/GIS Base Map/Marshals/Midas Spartans_marshal_map_577.jpg
index 4e80770..9bba852 100644
--- a/GIS Base Map/Marshals/Midas Spartans_marshal_map_577.jpg	
+++ b/GIS Base Map/Marshals/Midas Spartans_marshal_map_577.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:90e5e2e963c531ed223854d6a12035b67c29540a0da1e527c9cb49e08a1fc8cf
-size 144879
+oid sha256:2cbbe541119341c94523ed28119c0a81e554cb84c377da79b437be1f3e517242
+size 144453
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_401.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_401.jpg
index aaae335..9889f09 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_401.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_401.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:049ed094ca617d4ff50feab52bb845fd008dfe83d12ed65a742522825136438a
-size 148847
+oid sha256:45b4d8a21d11e8fb403cb8231f46e10fb3e75b8a6fc22195b553fa8db1247fa0
+size 148457
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_402.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_402.jpg
index 5f3bbe2..c7160cd 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_402.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_402.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ef18735e27df2a4d2594bf6a5c36cfae55e1fe4a4616ee6baff00db6b6f6ce87
-size 150016
+oid sha256:bfe402fb4f57b30da68978127a0834fbfc9c3778e231dcc25d401648c51f9d39
+size 149990
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_403.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_403.jpg
index 0fb7b51..9aeb3c0 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_403.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_403.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6a3130d58c84b05a8f9cdcda86477f987cb344e1d784373d7749b2cfdaac8d89
-size 149922
+oid sha256:0b8d7e614c8442647f26a5d42cf585b9318d44810afb91c2d54e4fcfd4f458bd
+size 150503
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_404.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_404.jpg
index 14eac5e..2abe6c9 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_404.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_404.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5768aac585def7234354202a344e5fa3dd7e001ccbbd1282e4e8acca30e324ce
-size 149655
+oid sha256:c0ba464f09343ac6ba38dfa69637eb79f5e436df6c008bee430af47079a3f424
+size 149755
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_405.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_405.jpg
index 0cecef4..d11d86c 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_405.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_405.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:24f05f04a9887057fa14231ed1c761bc261dac9d2f9ba3497b26aebc06fc5299
-size 154661
+oid sha256:1071842dfea90ec5771af0f505b4985bc2922765713796afa1e49d0204ecb066
+size 154979
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_406.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_406.jpg
index 4413430..6743659 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_406.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_406.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:728ccdf569bcea1b007e8ddff3e5e1b28e5b4cad235e09733ef567331d86d3ab
-size 148762
+oid sha256:61681a27da0df80ccad8333e9c104120222e540a8b3cd3aa060bfab1ee26f484
+size 148577
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_407.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_407.jpg
index 9341713..4f01bb8 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_407.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_407.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bc8cbf53c03b030313db1ea570dd6c8bd513ca35f2b3bb5a2268bd636812a0b8
-size 148385
+oid sha256:22d0ad137194b489d5a9a5a69398a2b8ec679becd13e8ba51c0364bfefaa9230
+size 148235
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_408.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_408.jpg
index 3c4dc53..1654634 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_408.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_408.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:33d4f5acb7d152cb6a55ee7a65a5268b03e6f99b0198e6ec3e5612953fe7aa8b
-size 144712
+oid sha256:511fe71cf6cc0ee40513a1af4542950122a47f605c6b90e3b4db35839fdca84a
+size 145135
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_409.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_409.jpg
index d83e029..9732ac2 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_409.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_409.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e64f48e3e3c76cb9c43b4735abdad55793f9ce44a5c6c5fa64b63c0a001de93a
-size 146894
+oid sha256:83d2d34e4fc633f769d76733eada29588e402d6007822be5a4c4415b87b19a4a
+size 146229
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_410.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_410.jpg
index 3e0aec0..98803fe 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_410.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_410.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1f610d652efe315a4948e60f06be9319b82c797c9eccbbba9cbaf92c0c1108c9
-size 147664
+oid sha256:de8e1f7843ca8e65475769a85322cca49678e913cad82b11bf052b1d9dc5580a
+size 147897
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_411.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_411.jpg
index 8ce1385..7a3826d 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_411.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_411.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9c6a2186e50dad25b7a5c39d3dec19bf57c0d0aacdd3dd746315f437be587605
-size 150773
+oid sha256:34931211dc58fa8c2584a6dcb22a9cf2398eaad192ef79db80b6c7f81204e65f
+size 150419
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_412.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_412.jpg
index f5db8a8..b386c6c 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_412.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_412.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4dff24e92e4e32861d709e1396e5625f8a0106e0a6baf5624c94de3a2923ceff
-size 148041
+oid sha256:c5c562571eb3fe018a56893ee86c05133629e6ae681dabdbd555c9fdde1c62fc
+size 147309
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_413.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_413.jpg
index 13705bc..10af9d0 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_413.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_413.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ed02f8e7048aa4ae86179c57d2a7aa3ee145ecb84ff8902f68c317a545d457c8
-size 143160
+oid sha256:8f489cad6c5c0dd0e06b944ea720144dd6aa40ae359e480aa8b16eac18bce23b
+size 143232
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_414.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_414.jpg
index e2c4358..6b482aa 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_414.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_414.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:434cf91542b2989854556e1519306955047dc4012edc21fc87cc9ad8283b28ec
-size 141514
+oid sha256:89e033009a7f402a344b79a864173abe03d11d71817ed3090f651707acd51733
+size 141806
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_415.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_415.jpg
index bf25ce3..bf7364a 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_415.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_415.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5409e24e7d7a54e88ebf77e99c085c4a00b4b377e63a6eeb8824e2c20e5a9e15
-size 141961
+oid sha256:8c2ff91d9c33b6cbedfda17fd75bd354b5befa542c6819b515ad96de93a03129
+size 142054
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_416.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_416.jpg
index 1ec3b59..f840290 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_416.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_416.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e5017c0ea59f52e0f9de2f18bfec0f4e5333c5fd018fc20a80f3632eb6dd982d
-size 144753
+oid sha256:6899ae7199dacf589b7c3d7b03be188280badaa1aed625a3f77526d8f47695ee
+size 144668
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_417.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_417.jpg
index 23eee61..5d0e6af 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_417.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_417.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a20152b96f777b737bc5ad33d53be6ed8e068233aac25425d7d662c4d2797f91
-size 141936
+oid sha256:32fd16f812210eb7a8e94ec0cceb89e6529937c4022b14fa1ae34a6d1d257cc6
+size 141484
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_418.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_418.jpg
index d31fc8b..86be894 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_418.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_418.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c380f21d62612688545de0fc934ffe2bc0274b651fbc074b228460d501d97af5
-size 145719
+oid sha256:e640f5f295e99b333f5469331d65327f6f21d1d1a718546e41972e7ceb4ae91d
+size 145053
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_419.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_419.jpg
index 4cd8cdf..b64334a 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_419.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_419.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e3859d087cfdc909eac7dabed9068c6c5f3dbb0de59e733ce4d213f4f17c6e1e
-size 145018
+oid sha256:ee7dcd5d3f2a05fc079e81692d52f6b0636bb1e957f21010ec3f1bf09b8c90f4
+size 143761
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_420.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_420.jpg
index 71bc0a6..d129775 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_420.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_420.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:964f45c21794172a195e1a62062e2cfb9d9809b1d34f2fff492bab1aef456e07
-size 147535
+oid sha256:8bdba1f4279a4a995277694d318cc573212d26efe8230f393a5d634440a119a4
+size 147111
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_421.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_421.jpg
index 3fe046d..389128e 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_421.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_421.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bb94070cba0519f3147ea422036bea229c58b52599ca5c653775d910c47c6454
-size 136646
+oid sha256:53686bb57fc0bc6361e7efd6b552fa5a20dfe84a3f15acbf1f0091dcfbc5428c
+size 136813
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_422.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_422.jpg
index 5f9d330..e0a8eb9 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_422.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_422.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f034e2f0cec33fd14190c22f2fad7831b1f83a7d5ad9454ac8d9ef89d46b3c01
-size 141371
+oid sha256:f77e3373915c27889abe75cc888a77eff1bdf1f460a52158e6d41b1df94817ed
+size 141857
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_423.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_423.jpg
index e3196d0..b762279 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_423.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_423.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b3be9f97db1480e0861e9c5a60adcfa9d584d8e2384ffdad356e54dbd7497bff
-size 142219
+oid sha256:a675d95dc3f9d265272a917f28a5b51dc0978fa7736fcb053e26f13ea4b5e7f1
+size 142233
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_424.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_424.jpg
index e5926ef..70fb502 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_424.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_424.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bffd75120b40cf92e0cc4cb699bfac695fb3a20ba6bacbf18e525cdc6d3fcf70
-size 142246
+oid sha256:baeef031b51383dc45855c7005ba63373759c3158f561ad1e920d99fd1863946
+size 142489
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_425.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_425.jpg
index 2642ac1..94531ed 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_425.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_425.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1191465fa6391d82c8f27f46943569fb70ae7ee913abda53f99ca8af750de2c4
-size 144821
+oid sha256:e39459bd9130d29b4efea6c10d5593c5caf77cd8df2d78280d714f8e17953911
+size 145123
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_426.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_426.jpg
index 4301982..a463bc0 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_426.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_426.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a7a2d68ffdedab74d5a889c4707f06cf10b8445d887867fc69c51f2b04d46040
-size 140636
+oid sha256:2ccae8ba64270c3f506497018a49b64c9d41d8641172174a6562dacb50dbac76
+size 140862
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_427.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_427.jpg
index ccb2b14..4d88aee 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_427.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_427.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4031790dea6d6d6acbc665e34d297026fca183a77cb1695fb6a2006aaacb88e7
-size 138786
+oid sha256:421aaf1e7d0383395e47e3eb2ccd33b0859c33a07384e4e219f7c4590b057ffc
+size 139412
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_428.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_428.jpg
index eda8225..406fe62 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_428.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_428.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f2f2a9a59502ca7d7db81ba829402137f36945fc5295ae96339ec0804d3318c3
-size 143696
+oid sha256:878da32a91477934c9de41321410a8ca6bfbb7274a74d5e9a0941e13853a9a28
+size 144244
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_429.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_429.jpg
index 6221389..dc9c644 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_429.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_429.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7e0ad11a266c714573c2db626e16700c598ac465a0b0994ce9da58a86e8a2a52
-size 145461
+oid sha256:34d203721ff0e8c4e2797e7f8ebfd3f2b9c28d9b1d1c507622e62680e360d476
+size 145694
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_430.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_430.jpg
index 7891875..d00d4d0 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_430.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_430.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7df61ec11bc86ebfe351a751db84c804b1ae0fba4dbcb89ca8609c9a1609844b
-size 139567
+oid sha256:a401a4fe1746dddd3c9cadc65ea4ba6973f0d3f57501f7a36eaf4e5be27266d8
+size 139641
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_431.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_431.jpg
index c300c3e..3697886 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_431.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_431.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:da214b32b56bf6bf8133891cf555368a4fac310deebbee560faf85cf29cd9b3a
-size 142953
+oid sha256:f951d7b98a5367503f32d683fe13596591a9052e421f63c5cd96fb73b15e0163
+size 143619
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_432.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_432.jpg
index f1d6c3e..faf86dc 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_432.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_432.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:06825ea330588b1e7e6407c7094aa33088b34bd4c377cc66fdaddeeeabf5a124
-size 142802
+oid sha256:b06f4a39b3aec48d6f4dd3015745eff3dcc468730a8b46c009bd038f5c1cb98a
+size 143283
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_433.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_433.jpg
index 31508b0..eee95fe 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_433.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_433.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c31ec2b28c51d17140d69633bc616a15e4cf198c62dd899070aba34c3df54e09
-size 142466
+oid sha256:1e11a978a975192c7bb9a99086bcb3dda1586a89d980f295ef288205ddcd4a83
+size 142616
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_434.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_434.jpg
index c718604..2f3b9aa 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_434.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_434.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2f32dd00e9c5548849fc222a9f94cf09545a411703d066e40d3f60f06c283480
-size 145549
+oid sha256:594214c19ef1603febe26fef46e5d67f3a693034bcadbffe887ee432733c6525
+size 145481
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_435.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_435.jpg
index 2ed76a4..4511906 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_435.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_435.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c545010557827403cf85a1fd142211bf66e88406d889765fd39df2b4469b1aa9
-size 144683
+oid sha256:37bebed721ce1eb5b5804a904c6c1345dae3ad774196cab9ea635ab1d8c7f2c0
+size 144929
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_436.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_436.jpg
index 968bb20..676a9ea 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_436.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_436.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:93338ebc8cc29fe833841e28bec6649ca4f75f364389c554ad3be6a0bc5275dd
-size 146274
+oid sha256:e5938612c98412268725a8d6fa4e4933a1bf0a58ea82091120f88c5abcb4bf15
+size 147039
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_437.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_437.jpg
index e41251f..2dfe438 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_437.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_437.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5e14efab8748ef9b7253564022889d8453c61906acb94b77dffdbe53ef8457bc
-size 146735
+oid sha256:c6a597b4143d7981fcdc0e721f447481c24b63b7c9d96464fec588e19a4e1856
+size 146787
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_438.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_438.jpg
index 8df63d5..1a17101 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_438.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_438.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0e3e1eecc5a722de3e3ec803f59dcbfc1fe42b004386fb4853357991ad8483c1
-size 148512
+oid sha256:c45f6ffd1611fec61ac15d6ae2819d1eb1f26d9077e5cbfffc7b512bd21235e3
+size 149020
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_439.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_439.jpg
index ca31caa..2b362c3 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_439.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_439.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a6ef6d563b008be832609fffcdfd712f2ff38c1e5c9c28bf4ae05868091a758b
-size 148390
+oid sha256:7588ed9093cff722ddd63ba9cc66d82c683a82d1337098afde67f906af9b8697
+size 147991
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_440.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_440.jpg
index 6fc8be5..b91864c 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_440.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_440.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1f57f4f20b3fd85533dca694aa140fa006f5754f4de001321428528f6405ecee
-size 155600
+oid sha256:75dafeb422ac325c9db23c361ac9de4c4b618063e607ebedbaa47056aae6e08c
+size 155454
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_441.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_441.jpg
index c2dc6bf..4ac655f 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_441.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_441.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b1a77416ea421b3a46c007e33e6d3e0bea72af0ac9a69473db3544018bae5e2a
-size 155632
+oid sha256:56577f338551d38e5554e421c8c1646972ce1274880ebab66913f741a79b0981
+size 155079
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_442.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_442.jpg
index 44fbde3..79e73db 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_442.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_442.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f5d65b10c560eef9be3ccc309d143a438883f32f9307898638c63a24627bbb33
-size 154862
+oid sha256:8d8e13c84108fba54e504b8bff39d3844093b80d501de339ccfad15969e0ee91
+size 154769
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_443.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_443.jpg
index 1b097b2..99d0d36 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_443.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_443.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6f13aa1abeeb5781bde7432ed29a75792dc14760ea1b3acbd90f1ab0137466d3
-size 155132
+oid sha256:fadb23d9de7457ff71680015a984f0d8ec9afe5493b0c6439a8b7536fcc48a80
+size 155360
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_444.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_444.jpg
index eb65148..be1c71f 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_444.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_444.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:41039b72718a61f8d2181199906b0a6fe051d0cdccf698ca2e083375346058cf
-size 154214
+oid sha256:4da7c1bf01cc083a4d068cfd4588df1aa87ef71057bf6d4f2a225d9327309021
+size 154598
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_445.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_445.jpg
index 433d430..fff4e6d 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_445.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_445.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c9251c9a77bb7e6b72b1bcb76fae593facdd7a7859c578c389d2ea8a27276864
-size 153524
+oid sha256:b30259539d2d64e348f7675dd8326cd81c106af057af31ae8b7e78267b0c04a1
+size 153307
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_446.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_446.jpg
index c8ee84a..92c0a71 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_446.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_446.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1c7cae313792e5692ca1b76442bbca2f9138735cd527dc8259cf9c71f38a9fcf
-size 151839
+oid sha256:7a3c342c15a25aca98e528429b68a53bdbe89047633dc6dda60b0520b0e24d1b
+size 152158
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_447.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_447.jpg
index fcd8db6..66dcf37 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_447.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_447.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:80284a17e891b4b87b667f6f85c1cd9466f02f327fbc0b37233605a42dd025be
-size 151773
+oid sha256:a7f164a03f70dbe3b4f103c4919c9d9483a5f356f4d62f2ad2be9a8a49ff5f56
+size 151685
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_448.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_448.jpg
index 01fc25f..a96ff1d 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_448.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_448.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:68858c3b88c0515a6b96c8ab3959723221e11968114a2f70ff0ee29863e9871c
-size 149573
+oid sha256:18908c1c140fb550177ded304d3f90500338bfd14362f4a5a7b3dd16f5cc2f18
+size 149716
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_449.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_449.jpg
index cadf39c..fe5ce97 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_449.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_449.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:699db43c9a8749e4e1b9f64095164d21a09004156a0f3fdb0b33c2fcb4019be2
-size 150929
+oid sha256:9c6b69990984f6690733cff83378940109d7b848cafd06611a14ea565cf3902e
+size 151420
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_450.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_450.jpg
index 3e5175d..f43c1f8 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_450.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_450.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:84f8964c5d423973500ded54f36fbe32326b4ccc6c4e4e136b047b1572fddfa5
-size 132916
+oid sha256:961636d95c642e6db549a43f48d927d49457b2fc77697ec3f8403c523942e718
+size 132325
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_451.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_451.jpg
index 43d62a1..397ba6a 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_451.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_451.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dc57735d857bc8a494caa79c95999ebd283616ab8f5136b4dce74c053e3d0eed
-size 127226
+oid sha256:0927e4c49bdbe99256adc7f3e36d06a357f3819b7dfc472e17f7ab9dbe700c5b
+size 127119
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_452.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_452.jpg
index 8f5f918..ae57da8 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_452.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_452.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f8cd0c7b3cace2821051537178ecd83f9c6866324da53b998685d5b6c197105f
-size 123388
+oid sha256:c9fbe36324960ca28008468d5a4abce92e740519aeec6a72fb012d19f2bd5421
+size 123212
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_453.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_453.jpg
index c8cb446..a7edc47 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_453.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_453.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0c9f97f9eee95fbf5876e46b8e5e4e65d6fd63a4d2b2b05bc6fead4b08fd1af4
-size 125860
+oid sha256:62f31aa08541450c26a53ced519deb91787eefb1f1e4c575555cf9ba7f668a95
+size 126045
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_454.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_454.jpg
index a0b6077..b1e0c26 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_454.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_454.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8bbe6a72b6ddfca49adf3c657df21bdbda2092820a849656f3776665478813f8
-size 127924
+oid sha256:58e1e8886a8f41a8443006421bbf975d2ae4ae2dac3e392a9852644b00d52ce4
+size 127869
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_455.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_455.jpg
index 2b86887..7bc4be8 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_455.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_455.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f3f99ca1e794ca66d114e0e9f7893f093475ed53ac7d33d20cd52ef9bc756c1c
-size 140244
+oid sha256:b043450fe5f7465f530292d1fd0d7d9b3d3d1ad3166502cc835e08254da35cfe
+size 140679
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_456.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_456.jpg
index 178505d..bf7a590 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_456.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_456.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a71d4a59f1310e910f37aa786825d189a29dfd12bccf33308bffd81718141c83
-size 142563
+oid sha256:ffb56cda16147cd3d5e3a48436f6b989b63b49e34db095bcf679e0664688baf7
+size 143039
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_457.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_457.jpg
index caa8866..36d83c2 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_457.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_457.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:75ea468c7740069ad106d92849d460d069e2a029ee30d82d7f1500b3a8780c65
-size 137097
+oid sha256:631aa0194ac3c71ac25ce33290db8a4895b27ccfc96fb6ceef023a399bff3a9a
+size 137202
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_458.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_458.jpg
index a0f2df0..7e1263b 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_458.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_458.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2fb43d16e3888367dcb6a1cedd38b6a70263ed37115f103528db46550730f5b6
-size 138260
+oid sha256:e1cdd50da7f228ae30907cfd8c5584d8abd6e11653086140a525ea4aea0d76de
+size 138238
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_459.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_459.jpg
index 50c6248..fec0d03 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_459.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_459.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:310a2a744b54a3f92e5244f35c092d049f006eee0c4d9d4aef58319900c2c936
-size 138992
+oid sha256:5ef17608b29b8572029a19a02b27d5fe13cfad71d145da20c184e49724a5f0bd
+size 139089
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_460.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_460.jpg
index 267931d..9f21a40 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_460.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_460.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3bc9478be05cf7dc64610c377b7c6e903e720c25c4bd7660d792338c254c95a5
-size 135395
+oid sha256:37a4c06438112df27d57c4b61e83f00ed8b7e30d95af7ac1c805203ddc3b2324
+size 135374
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_461.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_461.jpg
index 9974cf2..ad6f00c 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_461.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_461.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:078992e618458ea81afc22d91a9c57b946a6a1f5280f493364a515465af3fc90
-size 133432
+oid sha256:f6dc7b81cf1901c0b3e58ecbfb1f9ff4213730ec01b841f63a86d3c165ae2fa3
+size 133536
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_462.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_462.jpg
index 4a8d967..d7c0b64 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_462.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_462.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4c81e40db842337ecc9ecd0905baa75ea38962b4a12aa84a85f05d66ae099117
-size 133767
+oid sha256:488b212635dd252e67596282d7e20f887910302a063bf6ea57bd3ce56da8e1a6
+size 134173
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_463.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_463.jpg
index 984bb27..a790f24 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_463.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_463.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:da7129e1b702bd036eb0dee1e6e0d6977507f9bce715d4ccd62c4a73d322c7f0
-size 134781
+oid sha256:2798e8e6959c5906b21f384275c12676098bbc8abe3dd4cb0ec21ffe23b013c0
+size 134763
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_464.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_464.jpg
index cd8fab8..d152773 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_464.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_464.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0e9dd7c4e8800a0dab1081dea805372215aee6636d004017697903bdffdf7187
-size 141609
+oid sha256:f59029de9b98ba89cf80fafa715a49e545c01c0226647d41a3f14c84f28e8924
+size 141748
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_465.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_465.jpg
index 316a4ad..d38c4b4 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_465.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_465.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a5f9d1e776c3528142b6021e475febfd8bfb7a0111aa3cfe92a60894b9e00b3d
-size 144312
+oid sha256:446cd31ca40af78eb2aff66591157d6f372c84ada3199ad478f31a954de75be4
+size 144645
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_466.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_466.jpg
index 66b824b..6d65999 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_466.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_466.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5c529d93b87afc6010dc3905f32ba902f5a6ee4fa417d0dbd60cb29b9a6ab99e
-size 142840
+oid sha256:007a1894acca40ead6d071d6ac2b3dc117ea915e4bddf59a963897137a0e3f56
+size 143413
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_467.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_467.jpg
index 844bc2e..f40b170 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_467.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_467.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5fc369830472385e1b279136ecf4922ad70281e5d268a2ba1426634a94285dab
-size 144944
+oid sha256:02e3c0b863dd4b447dcffbbc78a52c951da9d840aae00e5d84f0b7c8f12a3c0e
+size 144860
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_468.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_468.jpg
index da5fc66..6ff6941 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_468.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_468.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:496f239b1ee2f81177e8c96f6bba6f2d7995d7009ec54c465d2203e05cd5ead6
-size 146344
+oid sha256:eedb1dda3b972d948a9f80214407d930b4ce309cbf981e8cabc91cd0df731e6c
+size 145649
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_469.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_469.jpg
index 285c02a..294b97a 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_469.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_469.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f43bd946b3beed5dfbe84d658a073e69f3db949d2bcc2bc60d047e511ef2ab2b
-size 145276
+oid sha256:a7717e5e8d7f5ce9d6059e329ab1802c098a4b2d725d48836e6366db8922d172
+size 145315
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_470.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_470.jpg
index 8e0123c..c5fca6d 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_470.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_470.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8199f6d40f021d70ad41bfb3807abea94062c751f055d3f0cca26e10be5c3c8e
-size 141562
+oid sha256:ad0ce493b9404b3165043f13775dcf83167f7bca233154f606bdecdd9a222121
+size 142544
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_471.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_471.jpg
index a5083af..78bad06 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_471.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_471.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fac0be05158b4b6ec837604008aeeb79546f3de587a9305c6aa6d44851dd9c1a
-size 140686
+oid sha256:6137cbce7ba4bd68acb1e9c35302c541b728486f78b62a21d43ad9038ae955ba
+size 140834
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_472.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_472.jpg
index d4e7655..0e57f28 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_472.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_472.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:202190d52297507379c4469de812c2a96fbc938542b571d5ca479ab68a5d94d1
-size 142085
+oid sha256:a405ffb49aace6134bd54c5ea8d38608df14830d0820bc13ba214825f3faab96
+size 142170
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_473.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_473.jpg
index be18d58..c812ad9 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_473.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_473.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6f9d2aa468118d6bda6b4b2dfe6f22c9eb9a6d3dee5ee79f510faacd58ff3b15
-size 150620
+oid sha256:411d98d9d0c8401232ab8f95e3287e467dd001824a7694cba12ece5af34d6417
+size 150328
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_474.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_474.jpg
index 5bed6c7..6dca7ae 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_474.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_474.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ae7ec995ef6ea24c0c052a5f620de9505fac9ea580f5eb3cd56fca08cc7af040
-size 146052
+oid sha256:a2a0b4daf78efff82f75b99ff27a7ee0436c2c89f86bfad715849d39ae17c3a6
+size 145872
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_475.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_475.jpg
index ead337d..96a4af3 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_475.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_475.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4456a751d5b6851df54aee6b437ab39194c68bdc2dc967d9cafbbb737f281d83
-size 144847
+oid sha256:34d9e641ed390fc451667103a9909239c59a057f5a90e17b06b7e04a76c62f60
+size 144624
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_476.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_476.jpg
index e7abf9a..522c0e5 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_476.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_476.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9564be2df0075500c950c9620ba616222f0a62cb78fa606ed870b583e6e6351e
-size 132520
+oid sha256:a8d816b200197da3c869740bb1fbd617c5e40b30b327bbb57f7a1a59930a39ea
+size 133139
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_477.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_477.jpg
index 599ce1a..07cc730 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_477.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_477.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4c0ca87bad3ce4fe9705b922ae66558f58ee0a6da08c5317f574a8c521559175
-size 137777
+oid sha256:cf389c6778f4fca1ca36365bb69e3fbaecf869b594b4872533259c55eb447047
+size 138043
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_478.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_478.jpg
index 3611297..b98d2dd 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_478.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_478.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4b7204663d0b080155f5a79bb89614f677fde452b42d495034c5c1666e07b5f0
-size 144363
+oid sha256:69385a53deb2e0cee784ad9121ace9c67c933587fdb6bedef3098def38c39d73
+size 144302
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_479.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_479.jpg
index 8c0c6f7..ad44d7e 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_479.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_479.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e8b251813308f7bc050d0ba07fdaecca200e88b2dd4637c34dd3336f56e14dd0
-size 144344
+oid sha256:498d837236a1a28f2ee76058220a654125cac69e309280dc49750dba3ad67c10
+size 144125
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_480.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_480.jpg
index 598fd0d..2423265 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_480.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_480.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d50fae7ecea023ac2aa0896b7a6afdae25ca95a6fdf2775464684e29f149b52e
-size 142375
+oid sha256:04809211985c81e6c8e56433b450aac06c20631a1db905cd67f86a85fbc0f5b2
+size 142014
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_481.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_481.jpg
index c7e5e3f..aeb56f8 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_481.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_481.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b65bc510d1287395a06c76fd65025657f487ae29422f6954ac816469997c9831
-size 141602
+oid sha256:a731a79e899b23a574a47756e6968127c8f490fcdd9e611f185d1ef57e96269f
+size 141787
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_482.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_482.jpg
index 3b18834..72fd1bf 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_482.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_482.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:094811c9ad3746dee083e5b2d5bc771dc9703778bdc72adaab71c8b54e832bd8
-size 138080
+oid sha256:7164561e942121d4e610c6509606e49ec955d741e610f686446d856190c1d0d9
+size 138286
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_483.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_483.jpg
index 6544d19..ac7d74c 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_483.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_483.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4a66700e269b22f286c2016a0ebb832b17d535842bdf369bb6ae01ecc70fc5a2
-size 142326
+oid sha256:1d2acaa89100f0f8c2e64fd8e150b26453adb3c277cb77c06d550f8ba4814240
+size 142707
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_484.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_484.jpg
index 894bfa6..4070999 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_484.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_484.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bd427d8b0cb52722a68bac99579d78bdceecf68cfaeadbcd52d962b266eeaa11
-size 148140
+oid sha256:48900ed54d74d62e741a34a40fa44f1857644b17ebb06b60ba23c52ccc52c36f
+size 148341
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_485.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_485.jpg
index 6c4107f..acea158 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_485.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_485.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5bef11da52218f6e951efb21421761ae9eec02a229d7689a3fb1e32a231fa795
-size 148826
+oid sha256:d5de485da6b9f3ef80664e9f238b51403e10f5f30ec70b19d3c9d6dbfa4d69e2
+size 147802
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_486.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_486.jpg
index 2d36dcd..8f105c5 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_486.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_486.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9f3483944d3c53aad8612957671ca7fbb9976872f998c99ba27cf109656c817d
-size 148336
+oid sha256:f6448a6b2ce4d4b7a5484c8878e369fd1bce0cd2ddd94062ba594359e27567eb
+size 148413
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_487.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_487.jpg
index e5bae62..eacd6b3 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_487.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_487.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:72648beeb5813ff43fc20e4778d21dbe1a1a8211a46154b27e2bd7c9b6779687
-size 147182
+oid sha256:3038f5b9145e1f951049504ef41297b5f884395fe5e60271a4894d88d84af0c8
+size 146706
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_488.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_488.jpg
index 18134a7..8bf4890 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_488.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_488.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6d1c57b8e4c84b402f1ddcdd72da8273961461528409b4c6f1e4ade2d659f6ad
-size 147071
+oid sha256:097abb958b6249f63a2158eab64c5258ae8e7e77f6bcc090ac13971527835e07
+size 146983
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_490.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_490.jpg
index d4d7089..0a969ec 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_490.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_490.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:da6803381da9b24cd3e328b8e48dd5c5a2a83076b1060ede0004893c6ef5765c
-size 148016
+oid sha256:cc012d0f7061db590e122d10f32f764e4f2959c138e16579a879fddd99824737
+size 147981
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_491.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_491.jpg
index ab68bf2..8d204c3 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_491.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_491.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ea83a352886cef6ac4a4f8e938e6c444c4a78d2c05f766a2f65fc31372ffaee5
-size 148431
+oid sha256:7511b1ffdf36e726019f908c5cf3489f67bb23494da8592ed1fbbbdc1fad5896
+size 148189
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_501.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_501.jpg
index e70f1ad..38f4007 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_501.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_501.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a92310af82ae91923a443ad15cdd85c112801662aba5d40c899a5d53574cc54d
-size 147009
+oid sha256:c1d4b47f77a6f3a71ef1fa062197f814e9c5b019e4b2052a26b9832305effa73
+size 147020
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_502.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_502.jpg
index 805e3d1..34ca109 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_502.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_502.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4c533c9cb8b423ee823f68bd4c88fbe18c8a81fe71e5f2190c987fe78cc02646
-size 148350
+oid sha256:04909b7bbcde039d49df450c80f224954422bff4cd8e18265aae50469df5e3d4
+size 148413
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_503.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_503.jpg
index 861dc83..95b242e 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_503.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_503.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:401c43fe1e24309dbef139d5bd364b85ac95fb2f403ad57987dd12279554c29d
-size 148286
+oid sha256:9a0eafa4d1e526cf051eb8c7dfc249f4d4f8fd568cf7e3d16c8351bfeb982581
+size 148174
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_504.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_504.jpg
index ea336ef..2ef2103 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_504.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_504.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d2da453bd92ee0c2690abb468dfb46b7ef51d0a567fd6850ee2f610070ede18d
-size 154052
+oid sha256:a8f59eeebb3a094b5df11bf8fd682b8216a668e47b610bcd7a5cb72405fd1715
+size 152978
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_505.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_505.jpg
index 0e8d31f..9cc1017 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_505.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_505.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cda64dce78a1188434a263578b1afdb8d44c3d90811c1bb6c590f68e5e6208db
-size 157292
+oid sha256:83634b2b1ca5d93d52337e927a74de17e8a7ed2ade2b558c382c24bb036ed3d3
+size 156844
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_506.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_506.jpg
index 7328354..aa6eb03 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_506.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_506.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b82c18353551832cc44393f2a6e784344c3634d06ec402f5a1c4f00a515af608
-size 158862
+oid sha256:892c35fdca61961cf4a322a479437f8fc7e47ad345ead85e4dc1b6294473430c
+size 158158
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_507.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_507.jpg
index c756607..5e7db49 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_507.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_507.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f3d840d30200e75e025f30d1c00008e8ff65dae46109ecc9a52fa9453b70aa45
-size 160987
+oid sha256:bc5d29763fd70eba7c4b95d3ce38cfda0ef2f7b527baec49ec0e784bf79b784d
+size 161341
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_508.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_508.jpg
index fbeff06..7fcbcc5 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_508.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_508.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c327fd7a0dc402df8f2321428c9eb2bf8c44885c5b0c8b394b79b74a88c83ade
-size 158581
+oid sha256:0edffbab63702a41c35be2c31ecbdc6da267a1e2f56ba80231aa90d2777dbcd6
+size 158920
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_509.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_509.jpg
index a73f23b..9e1aa17 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_509.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_509.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ed046cb9bed9262ebdf70c4012ec63aaebd18a467c0300926a85b4cec2e59767
-size 161666
+oid sha256:9cefe46ba2dd48b074fe1499f950c22646b605dc939fc4718851f2e7ad2bbcd3
+size 161702
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_510.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_510.jpg
index 6b384ba..c97b34e 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_510.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_510.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:54cf5620d710ffbf8a3d21f6c4080b590467baf5f2357b8b577df5fbaa580486
-size 160549
+oid sha256:a6ff1e990111a00f39e1eea35996aff6e29d7fa17f470a43d632b103e89d274c
+size 160914
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_511.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_511.jpg
index ca0f67e..a5b9f59 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_511.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_511.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d80dda07962d7e2b8b4edbaa41a936876f2f0dcbe9e4e674f4b80a99f51444ec
-size 160194
+oid sha256:7c6c97fa4282ef04b17d5a3a357b6142a97c44af4d687c5a9f825f2b5c351d97
+size 159740
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_512.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_512.jpg
index 570f8fc..e77607d 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_512.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_512.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:215c79d33d89dc352bbad9bf1a126fe6df46944aa7273e5d95b7f7a0fd1c8007
-size 158561
+oid sha256:291ec90d3a4176f0b2ab0a2e9d72de35f21bd0b4670a9be99bfd33c16396cacd
+size 158730
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_513.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_513.jpg
index 39404d0..a93bc97 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_513.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_513.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f7d4131a30021489492dd880b77062b355ad2c00cabdbcc712d7f4774d763869
-size 157506
+oid sha256:c8ae76e3d1ec22b42f6c7610f273476cd68b7e959c3a5d2e97728c8d16684587
+size 157517
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_514.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_514.jpg
index 536a9eb..79cfce6 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_514.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_514.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7c36e68ab7360383a5d97dc3eac2beb4fc68d4fa868d1bf6f9af89ec405709a4
-size 162247
+oid sha256:800b66014c80d01c8b8e8306efbafdb9f58933f8f430216fd8fef4b45d977149
+size 162042
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_515.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_515.jpg
index 857f644..4081a6d 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_515.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_515.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a3c9a7bae8a6b5005d065e06a07f635dd7956fb37bd31eec8517f4b3e3f43ecf
-size 161374
+oid sha256:b9fdf08219aa05e6a04c37ecba5acf1c49f05928e446383da10d535b39645bc4
+size 161298
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_516.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_516.jpg
index 8725a86..027eb14 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_516.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_516.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:249f7764d4047128a265e49d52e79b9e7ddd6e972400ed53d93793f521b0bd0c
-size 161320
+oid sha256:9f671bddb0570a74457acf6a2430a0b48636a00bed730bf26c72898106391696
+size 161129
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_517.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_517.jpg
index 3bb36e6..2cdcdbd 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_517.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_517.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:81665ec79bacf2d257bc27bfdc2654bb94f0308b49cb49e9c8a07279d86b470c
-size 163774
+oid sha256:64f3505b46ce9bd4a0bb4ac4f63ed4752cabf1dd03789320089ba5c39873e5cc
+size 163499
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_518.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_518.jpg
index 624eef7..c361b59 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_518.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_518.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4a635fcab327384df439be023877d464f6e79d5944b59f66f93846c7e4de662e
-size 159034
+oid sha256:f8320584b93943934affc935cb3df7b449156a367e8810169c5c435ea484a210
+size 158879
diff --git a/GIS Base Map/Marshals/Nantes_marshal_map_519.jpg b/GIS Base Map/Marshals/Nantes_marshal_map_519.jpg
index 9908f73..6975077 100644
--- a/GIS Base Map/Marshals/Nantes_marshal_map_519.jpg	
+++ b/GIS Base Map/Marshals/Nantes_marshal_map_519.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b46c24db51229106dc68051e359d280333680f1eb66612819b72cc88905ab7d1
-size 156172
+oid sha256:38e2909296694b67b7f1ee08421af14f3ddbe55ec5f70a6a45da160273cd3207
+size 156194
diff --git a/GIS Base Map/Marshals/Walmer AC_marshal_map_356.jpg b/GIS Base Map/Marshals/Walmer AC_marshal_map_356.jpg
index bd95cb7..2b717cd 100644
--- a/GIS Base Map/Marshals/Walmer AC_marshal_map_356.jpg	
+++ b/GIS Base Map/Marshals/Walmer AC_marshal_map_356.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3b460136f52ff8cfde4d93bd7a08e235745f4af05303f97c0932baba0987981c
-size 143272
+oid sha256:e9970baf1e5c1cadaa448418f55f0d055ee720d2584bf061ab821b933812e89d
+size 143292
diff --git a/GIS Base Map/Marshals/Walmer AC_marshal_map_357.jpg b/GIS Base Map/Marshals/Walmer AC_marshal_map_357.jpg
index 9523025..833cfac 100644
--- a/GIS Base Map/Marshals/Walmer AC_marshal_map_357.jpg	
+++ b/GIS Base Map/Marshals/Walmer AC_marshal_map_357.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6242c8f9a5033def34fab6b203382c677c19164f51f6caaf47e1b55026904df7
-size 156115
+oid sha256:25642b03452f3097341b12579dadf34c8bca2e8a68d3842030b7ae28254dab37
+size 155457
diff --git a/GIS Base Map/Marshals/Walmer AC_marshal_map_358.jpg b/GIS Base Map/Marshals/Walmer AC_marshal_map_358.jpg
index 7c24fdb..ad144f4 100644
--- a/GIS Base Map/Marshals/Walmer AC_marshal_map_358.jpg	
+++ b/GIS Base Map/Marshals/Walmer AC_marshal_map_358.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f17a51415aacc61a2cae3b06e43e5b1250f2f4c2fb2c4f178ea12c763c81e55c
-size 134117
+oid sha256:45148348a242501111a6f9add07bd03927481588715aaadf5f2b9a9c297ca1ac
+size 134389
diff --git a/GIS Base Map/Marshals/Walmer AC_marshal_map_359.jpg b/GIS Base Map/Marshals/Walmer AC_marshal_map_359.jpg
index a633b12..2e826d9 100644
--- a/GIS Base Map/Marshals/Walmer AC_marshal_map_359.jpg	
+++ b/GIS Base Map/Marshals/Walmer AC_marshal_map_359.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:88c57bcabc3da5e6060599a4f1f4c90c7dac25d2e72af1984d00dd80609b6cef
-size 147748
+oid sha256:c1b4e2d5642c222d4770c24548ea29586f83974a20c177581b431c8f41fb418a
+size 146654
diff --git a/GIS Base Map/Marshals/Walmer AC_marshal_map_360.jpg b/GIS Base Map/Marshals/Walmer AC_marshal_map_360.jpg
index 5d99626..82aa28d 100644
--- a/GIS Base Map/Marshals/Walmer AC_marshal_map_360.jpg	
+++ b/GIS Base Map/Marshals/Walmer AC_marshal_map_360.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b3aeaf18372eea23a671e71dddba7743032e76ba1aa8de617187fbc2b431004c
-size 143920
+oid sha256:9fadba6de924d3878f855d094cbc7d31206f228c86833b8e34e73bf0f728e66f
+size 143146
diff --git a/GIS Base Map/Marshals/Walmer AC_marshal_map_361.jpg b/GIS Base Map/Marshals/Walmer AC_marshal_map_361.jpg
index 7c25d8a..d4ac556 100644
--- a/GIS Base Map/Marshals/Walmer AC_marshal_map_361.jpg	
+++ b/GIS Base Map/Marshals/Walmer AC_marshal_map_361.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ed4fbe09db1d800890efdce2761cc90728511765f7b5bb82dbfb22d2a451d895
-size 126631
+oid sha256:25c13d93b3af66d0d36287a8a00a0e1d486bbcf77d5b38975ee77854224c972a
+size 126577
diff --git a/GIS Base Map/Marshals/Walmer AC_marshal_map_362.jpg b/GIS Base Map/Marshals/Walmer AC_marshal_map_362.jpg
index a133038..4d81da6 100644
--- a/GIS Base Map/Marshals/Walmer AC_marshal_map_362.jpg	
+++ b/GIS Base Map/Marshals/Walmer AC_marshal_map_362.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:48580a1375b3ad50c3243f90b809cdce9ed03de77f6c51fd550fb7ac841416e5
-size 142730
+oid sha256:1ed980f37db37f56c28d9fd7948e432dbc58a7cce8463d149b731f7123c815fd
+size 142323
diff --git a/GIS Base Map/Marshals/Walmer AC_marshal_map_363.jpg b/GIS Base Map/Marshals/Walmer AC_marshal_map_363.jpg
index 70720e4..ce8a721 100644
--- a/GIS Base Map/Marshals/Walmer AC_marshal_map_363.jpg	
+++ b/GIS Base Map/Marshals/Walmer AC_marshal_map_363.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b760e77cbc91e4d2be6efd13b87ec896de6514471325e5be879245d98b7330b7
-size 138772
+oid sha256:4bde2ccea4adabab2ee1f92b9b2d9eef72cbc7cb215ebafdfd7dbf4a4e8368ff
+size 138027
diff --git a/GIS Base Map/Marshals/Walmer AC_marshal_map_364.jpg b/GIS Base Map/Marshals/Walmer AC_marshal_map_364.jpg
index 8abc176..ba1b761 100644
--- a/GIS Base Map/Marshals/Walmer AC_marshal_map_364.jpg	
+++ b/GIS Base Map/Marshals/Walmer AC_marshal_map_364.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2008ede0914815bcba0afc6c6f9ae5009647278da5172db80122767fae9fa573
-size 148283
+oid sha256:56bf86d019660ac699e7309afb15bf88a9bef1fa06350b70a344f41b73f311b5
+size 147162
diff --git a/GIS Base Map/Marshals/Walmer AC_marshal_map_365.jpg b/GIS Base Map/Marshals/Walmer AC_marshal_map_365.jpg
index 6ba9167..5ce2925 100644
--- a/GIS Base Map/Marshals/Walmer AC_marshal_map_365.jpg	
+++ b/GIS Base Map/Marshals/Walmer AC_marshal_map_365.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:107dbdcbeb8205826cc38152c9963657771d20586d64734f6dd244263b695014
-size 147383
+oid sha256:fea73e4faa408d492121b8a6ad3c97810374a2892c62ca2531a6c79c0174c2bf
+size 146349
diff --git a/GIS Base Map/Marshals/Walmer AC_marshal_map_366.jpg b/GIS Base Map/Marshals/Walmer AC_marshal_map_366.jpg
index 6f65316..d52f4af 100644
--- a/GIS Base Map/Marshals/Walmer AC_marshal_map_366.jpg	
+++ b/GIS Base Map/Marshals/Walmer AC_marshal_map_366.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dd255b24d651dfaa64395ff14ea9f7e601bfe63df916273001b6a7ae017ca333
-size 136785
+oid sha256:0e8450b8c014f1807880542e4c3925d5a2ef48342ba37f934e372e4ff89c5419
+size 135498
diff --git a/GIS Base Map/Marshals/Walmer AC_marshal_map_367.jpg b/GIS Base Map/Marshals/Walmer AC_marshal_map_367.jpg
index 0623cd3..d913b2d 100644
--- a/GIS Base Map/Marshals/Walmer AC_marshal_map_367.jpg	
+++ b/GIS Base Map/Marshals/Walmer AC_marshal_map_367.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:68b259ebaaba5723c7ee139a064cacd7978540a19ba2ae9aa21081ee400e98ed
-size 133710
+oid sha256:693397364227a360b15043510eebcb0a51d6119b849238d1ae257c08a00818f1
+size 132597
diff --git a/GIS Base Map/Marshals/Walmer AC_marshal_map_368.jpg b/GIS Base Map/Marshals/Walmer AC_marshal_map_368.jpg
index f955aee..d53b048 100644
--- a/GIS Base Map/Marshals/Walmer AC_marshal_map_368.jpg	
+++ b/GIS Base Map/Marshals/Walmer AC_marshal_map_368.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:555658616e089d82227bc561711f5ad0b025a27cfb38d7445600b169d6575b1c
-size 140456
+oid sha256:e2b083b79942d04abce714b60c26b1d4b291d972b7ad9eb69ede49adc4df6801
+size 139675
diff --git a/GIS Base Map/Marshals/Walmer AC_marshal_map_369.jpg b/GIS Base Map/Marshals/Walmer AC_marshal_map_369.jpg
index 1ea77ab..c81ecd9 100644
--- a/GIS Base Map/Marshals/Walmer AC_marshal_map_369.jpg	
+++ b/GIS Base Map/Marshals/Walmer AC_marshal_map_369.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:21720c917ba93d20c92042f7b5650ad8b8c9938aa1aa7c0e94115cb7303fab22
-size 148836
+oid sha256:b497d3310d3ca29ae28d9f7d7fd801a33b43273cf6e6d16108e36aac33908dd7
+size 147565
diff --git a/GIS Base Map/Marshals/Walmer AC_marshal_map_370.jpg b/GIS Base Map/Marshals/Walmer AC_marshal_map_370.jpg
index f15e519..fd80424 100644
--- a/GIS Base Map/Marshals/Walmer AC_marshal_map_370.jpg	
+++ b/GIS Base Map/Marshals/Walmer AC_marshal_map_370.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a9dadec178ebc5e3722d3ac670e91d51306e5c4e4aa52ba44d8f5c19ad00ebbf
-size 149340
+oid sha256:bbc36c20da56da0a2adb0f85d9397db5747c1b092eb40efdde4627de9df2db31
+size 148111
diff --git a/GIS Base Map/Marshals/Walmer AC_marshal_map_371.jpg b/GIS Base Map/Marshals/Walmer AC_marshal_map_371.jpg
index aa164a3..0be1305 100644
--- a/GIS Base Map/Marshals/Walmer AC_marshal_map_371.jpg	
+++ b/GIS Base Map/Marshals/Walmer AC_marshal_map_371.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:042b616b05caa1fb5ec20eccf470007d456f8f6ff3a3d7c2dd6d08e2cc268954
-size 145269
+oid sha256:a9a7023730366d4b4df93787c1b247f7a2edea068cc4696f04b13b25290194e9
+size 144152
diff --git a/GIS Base Map/Marshals/Walmer AC_marshal_map_372.jpg b/GIS Base Map/Marshals/Walmer AC_marshal_map_372.jpg
index 37208ca..f9ddf2a 100644
--- a/GIS Base Map/Marshals/Walmer AC_marshal_map_372.jpg	
+++ b/GIS Base Map/Marshals/Walmer AC_marshal_map_372.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:032925b8e5492d439f7e040384a38433b24e8509d747cf748b6bc433f40e34c4
-size 146720
+oid sha256:aac1aa38a7ab2f5fab595b122b46a5b35c6bb155d1356cd36ef6679ef24c16ae
+size 145880
diff --git a/GIS Base Map/Marshals/Walmer AC_marshal_map_373.jpg b/GIS Base Map/Marshals/Walmer AC_marshal_map_373.jpg
index cfa6488..ae9ea27 100644
--- a/GIS Base Map/Marshals/Walmer AC_marshal_map_373.jpg	
+++ b/GIS Base Map/Marshals/Walmer AC_marshal_map_373.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8c65ae05c1821e960fc0527681f1c96ff00bf663c3dedb5e15215da0d80bc696
-size 151334
+oid sha256:706742489ffd083842a526187885a1c4ae9ba653d41d75a389bdc1b62d1ce5d8
+size 150657
diff --git a/GIS Base Map/Marshals/Walmer AC_marshal_map_374.jpg b/GIS Base Map/Marshals/Walmer AC_marshal_map_374.jpg
index fc02754..20eb8b3 100644
--- a/GIS Base Map/Marshals/Walmer AC_marshal_map_374.jpg	
+++ b/GIS Base Map/Marshals/Walmer AC_marshal_map_374.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aed897b2812d3b55321333ef1440ac3930cb10cdc7c2328f26bfb37a17dfc5c0
-size 150741
+oid sha256:bc0ffbb453ca8bd7866d0329df55028831399079e7455ba1d520d835be3603db
+size 149759
diff --git a/GIS Base Map/Marshals/Walmer AC_marshal_map_375.jpg b/GIS Base Map/Marshals/Walmer AC_marshal_map_375.jpg
index c69b3fd..a8d8280 100644
--- a/GIS Base Map/Marshals/Walmer AC_marshal_map_375.jpg	
+++ b/GIS Base Map/Marshals/Walmer AC_marshal_map_375.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9c745d00efe22ac83475369c68ecd4a79c6c4609c61c406a5cbddb9beb3de9c9
-size 143467
+oid sha256:3f0b421995f6fd4e71ccc202b2f26f91606b3de83b9d76e5119dc6b9a68cb7e6
+size 142170
diff --git a/GIS Base Map/Marshals/Walmer AC_marshal_map_376.jpg b/GIS Base Map/Marshals/Walmer AC_marshal_map_376.jpg
index 9b42852..67ac0ed 100644
--- a/GIS Base Map/Marshals/Walmer AC_marshal_map_376.jpg	
+++ b/GIS Base Map/Marshals/Walmer AC_marshal_map_376.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:66a56037e308b4bc1aec85d8f15202a531665c985a0bef495b6e22f58261d4cb
-size 154582
+oid sha256:ed6b8f42ab0477d59d4b621d573aa6a255e2df2736609cc86bd98f2763d67336
+size 153005
diff --git a/GIS Base Map/Marshals/Walmer AC_marshal_map_377.jpg b/GIS Base Map/Marshals/Walmer AC_marshal_map_377.jpg
index 696fa4c..f7f7c46 100644
--- a/GIS Base Map/Marshals/Walmer AC_marshal_map_377.jpg	
+++ b/GIS Base Map/Marshals/Walmer AC_marshal_map_377.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:80440e79cf7367dfe2a76997346ae380208538ea9e5b5e36026e982d85c781c2
-size 156399
+oid sha256:ada34a50b2041c2e4785fdbb198d11c17189733952592ca446513f4b92cf300d
+size 154941
diff --git a/GIS Base Map/Marshals/Walmer AC_marshal_map_378.jpg b/GIS Base Map/Marshals/Walmer AC_marshal_map_378.jpg
index 02256a2..5dbfc80 100644
--- a/GIS Base Map/Marshals/Walmer AC_marshal_map_378.jpg	
+++ b/GIS Base Map/Marshals/Walmer AC_marshal_map_378.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:84f08bc2df27faef60737edf6b63f44b3a5698bc8a3a9d59816268e61d0b8a63
-size 156453
+oid sha256:1d6c6b0ec1210ddea1d90ded28303fe441a7163b486bd3797d1ed6a00ac16e25
+size 155003
diff --git a/GIS Base Map/Marshals/Walmer AC_marshal_map_379.jpg b/GIS Base Map/Marshals/Walmer AC_marshal_map_379.jpg
index e2611f7..6dd1d07 100644
--- a/GIS Base Map/Marshals/Walmer AC_marshal_map_379.jpg	
+++ b/GIS Base Map/Marshals/Walmer AC_marshal_map_379.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c9da837db8448e1e0143791b027549fcb3cf5d4130d5a99c9a718f9d6855f1e2
-size 155068
+oid sha256:9a74ec0cb8b846782bba45a4a5a9c23145982e8fc9e96e5ad3e48817a4f2fe49
+size 153887
diff --git a/GIS Base Map/Marshals/Walmer AC_marshal_map_380.jpg b/GIS Base Map/Marshals/Walmer AC_marshal_map_380.jpg
index 10e7c36..5bad896 100644
--- a/GIS Base Map/Marshals/Walmer AC_marshal_map_380.jpg	
+++ b/GIS Base Map/Marshals/Walmer AC_marshal_map_380.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0303938631df94578291a30e0a5d873af6984be25815478220f5fccefd4525bc
-size 139151
+oid sha256:6ddf2be1a01189978cb3265bdc52802aae9a8655d4c61c70b2dedc2c76ed91fc
+size 137722
diff --git a/GIS Base Map/Marshals/Walmer AC_marshal_map_381.jpg b/GIS Base Map/Marshals/Walmer AC_marshal_map_381.jpg
index 284c054..2a8957a 100644
--- a/GIS Base Map/Marshals/Walmer AC_marshal_map_381.jpg	
+++ b/GIS Base Map/Marshals/Walmer AC_marshal_map_381.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:32fab9bfc553e4eb6faea7654e3d2f062e861583fdd9c6771e2f697f9d39d4c3
-size 138593
+oid sha256:0ab6f5ec5d4891c83782fdd546814f71b92e8d0b77048f21f93f03648ce98035
+size 137525
diff --git a/GIS Base Map/Marshals/Walmer AC_marshal_map_382.jpg b/GIS Base Map/Marshals/Walmer AC_marshal_map_382.jpg
index 418923c..7b1eb32 100644
--- a/GIS Base Map/Marshals/Walmer AC_marshal_map_382.jpg	
+++ b/GIS Base Map/Marshals/Walmer AC_marshal_map_382.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:98e4a82ac9cbf471f26a69da07bd3b77b63eeeae1005a63c07e3f976d1f14205
-size 137323
+oid sha256:ef8f26da4e36792ce2be1a9332f4e4b58769d6d86f8b3d5abce406ddf21538c1
+size 137245
diff --git a/GIS Base Map/Marshals/Walmer AC_marshal_map_383.jpg b/GIS Base Map/Marshals/Walmer AC_marshal_map_383.jpg
index 31d4cf8..5c61886 100644
--- a/GIS Base Map/Marshals/Walmer AC_marshal_map_383.jpg	
+++ b/GIS Base Map/Marshals/Walmer AC_marshal_map_383.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:09edd62e4e007e6a788c2ac40a6d2a24c86b0157f50b6eda7cacdd608b66496e
-size 137667
+oid sha256:3376d0e1a98ef85775a8fc3034a25fe8115ba0568e87c0f3dd87a4d8c2f0c550
+size 137597
diff --git a/GIS Base Map/Marshals/Walmer AC_marshal_map_384.jpg b/GIS Base Map/Marshals/Walmer AC_marshal_map_384.jpg
index 0116317..6311dcb 100644
--- a/GIS Base Map/Marshals/Walmer AC_marshal_map_384.jpg	
+++ b/GIS Base Map/Marshals/Walmer AC_marshal_map_384.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9ec9480c74c4abe4bc9ebd959ac3b9168424d80c5380bc9fbdf2aab789a69ddd
-size 137214
+oid sha256:8140888281661cdc41106cf90a415c7a00149231286a365b9844bbcb40d9abed
+size 137121
diff --git a/GIS Base Map/Marshals/Walmer AC_marshal_map_385.jpg b/GIS Base Map/Marshals/Walmer AC_marshal_map_385.jpg
index 2e91ec9..38c3dac 100644
--- a/GIS Base Map/Marshals/Walmer AC_marshal_map_385.jpg	
+++ b/GIS Base Map/Marshals/Walmer AC_marshal_map_385.jpg	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:de766952eb3d05ed631df44d7c6b45217f3c235d9ee8ab0e901722f409f08a79
-size 139408
+oid sha256:160a4331f583b4fd8404f0b49fd5683310245baef6f775cf3d56aacd83e0d7a8
+size 139477
diff --git a/GIS Base Map/all_routes.dbf b/GIS Base Map/all_routes.dbf
index e90a13d85567fb77bc68abfca1e06203c3905fb4..232f49548bc4f369526ce6988221267f4b44d8ee 100644
GIT binary patch
delta 13
UcmaDU@KS(<xtvR2BTFg=03PrItpET3

delta 13
UcmaDU@KS(<xtxn{BTFg=03PN8s{jB1

diff --git a/GIS Base Map/all_routes.shp b/GIS Base Map/all_routes.shp
index 698dd0a5bf36489c4986e1a015f0c5135ae48a3d..137d5669bd05218b0b1dfe61acb8bc372c180da4 100644
GIT binary patch
delta 113
zcmaEp*poCtnz3!8%mYT5w8dG;%9%zElgu9;dG*=hfZsv2)ju+f9OfH)mu!|`66R<8
zFi}Bea)2NU<L}L(g4Y>!B{upRiUD=h7W+qj0P6V2_$@^q$UlBt{l*(0U)#6GN)^aI
PwdM1pSDP(`H_HM5l+`gL

delta 81
zcmV-X0IvUxV(ej%8v%B)9N+;QVQFfVBxy20oAn`k>+?Xs#>}*A`Dijg_Q6~6vls#s
n4*}qjAS9De5d;DGvsDq-0S%WknoTHaGC&i3k%8>9SrfAzxf&uz

diff --git a/GIS Base Map/all_routes.shx b/GIS Base Map/all_routes.shx
index 94d6f889398e02b0992876fd57c951475dffe2bf..a3af82951dc494682660216994ce597f7f760fd1 100644
GIT binary patch
delta 6
Ncmb=anNZF60RRd80`&j@

delta 6
Ncmb=anNZF6000T?0_6Yz

diff --git a/GIS Base Map/fencing.dbf b/GIS Base Map/fencing.dbf
index 8b685467f04ab95c7c84afbc10ebce72a28f815c..be137f0a9bf4b3c0ad92cfa70adcdec9c4186c54 100644
GIT binary patch
delta 23
fcmZpg&ira7Gb?jBm%zl0tTm@M{|wGxWRwB`XBP-f

delta 18
ZcmaDgleuX+Gb?jB7ypEftTm?@r2suw1>*n!

diff --git a/GIS Base Map/fencing.shp b/GIS Base Map/fencing.shp
index f508629802dc6a9638262b7027ba56d5993c9ccf..a5b21986722dde1726c6d24f4d6b051fc2ebf81e 100644
GIT binary patch
delta 103
zcmdnf!#Jgvae_3X*G3ryw+IFXhKWF|!3-p3uTxkrpK0W<Tk5aqhtCcNUR`FZRRZ!`
UEmZct0rDAvYM6i+1PG}G0KCd1*Z=?k

delta 14
VcmbQz%ebe9ae_3X+(sD%HvlGQ1Ze;O

diff --git a/GIS Base Map/fencing.shx b/GIS Base Map/fencing.shx
index 9632649b74975c0d540f69770d3a53388bbc9f1d..abcabdcb6ba47b15d09f4692a23b5f919e3d8a7f 100644
GIT binary patch
delta 21
ccmaFD`G#|XG-KIDnG-A=3=GP03=9k!08C2-4*&oF

delta 12
TcmaFE`Gj+VG-J_5nG-AkAmId>

diff --git a/GIS Base Map/marshals_by_position.csv b/GIS Base Map/marshals_by_position.csv
index ba44e08..9b5c6f4 100644
--- a/GIS Base Map/marshals_by_position.csv	
+++ b/GIS Base Map/marshals_by_position.csv	
@@ -6,7 +6,7 @@
 105,"AAC","John","Damata","John Damata","073 966 6005","wtffor@gmail.com","William van Dugteren","082 774 1980",,"21,10 & 5","04:45am","8:30am","Assist with setup at start and moving of pens between races. Prevent runners from entering pens for which they are not seeded. Note that you should be in position by 4:45."
 106,"AAC","Sonja","Damata","Sonja Damata","082 809 7788","srdamata@gmail.com","William van Dugteren","082 774 1980",,"21,10 & 5","04:45am","8:30am","Assist with setup at start and moving of pens between races. Prevent runners from entering pens for which they are not seeded. Note that you should be in position by 4:45."
 107,"AAC","Khalied","Hanslo","Khalied Hanslo","083 285 5941","hansolo786@gmail.com","William van Dugteren","082 774 1980",,"21,10 & 5","04:45am","8:30am","Assist with setup at start and moving of pens between races. Prevent runners from entering pens for which they are not seeded. Note that you should be in position by 4:45."
-108,"AAC","Wasielah","Adams","Wasielah Adams","082 931 4762","gabiba@mweb.co.za","William van Dugteren","082 774 1980",,"21,10 & 5","04:45am","8:30am","Assist with setup at start and moving of pens between races. Prevent runners from entering pens for which they are not seeded. Note that you should be in position by 4:45."
+108,"AAC","Wasielah","Adams","Wasielah Adams","082 931 4762","wasiadams@hotmail.com","William van Dugteren","082 774 1980",,"21,10 & 5","04:45am","8:30am","Assist with setup at start and moving of pens between races. Prevent runners from entering pens for which they are not seeded. Note that you should be in position by 4:45."
 109,"AAC","Fareed","Adams","Fareed Adams","076 094 5128","gabiba@mweb.co.za","William van Dugteren","082 774 1980",,"21,10 & 5","04:45am","8:30am","Assist with setup at start and moving of pens between races. Prevent runners from entering pens for which they are not seeded. Note that you should be in position by 4:45."
 110,"AAC","Michelle","Cupido","Michelle Cupido","083 430 2844","michellekippie289@gmail.com","William van Dugteren","082 774 1980",,"21,10 & 5","04:45am","8:30am","Assist with setup at start and moving of pens between races. Prevent runners from entering pens for which they are not seeded. Note that you should be in position by 4:45. Once the races have started, control cars at club entrance."
 111,"AAC","Mick","Murphy","Mick Murphy","084 529 0967","mick@murphyprojects.co.za","Keith Bake","083 245 8757",,"21 & 5","08:30am","8:45am","Direct 5KM race up Beach Road towards the Dock Road circle. Prevent cars from accessing Beach Road from Haul Road."
@@ -15,7 +15,7 @@
 114,"AAC","Dave","Bywater","Dave Bywater","083 500 0845","davidbywater845@gmail.com","Stephanie Donachie","061 365 1127",,21,"06:36am","06:50am","Direct 21KM runners from Granger Bay Boulevard on to Dock Road on the mountain side of the island."
 115,"AAC","Tissa","Fuchsloch","Tissa Fuchsloch","082 907 7234","tissa.fuchsloch@gmail.com","Stephanie Donachie","061 365 1127",,21,"06:36am","06:50am","Direct 21KM runners from Granger Bay Boulevard on to Dock Road on the mountain side of the island."
 116,"AAC","Elizabeth","McGeever","Elizabeth McGeever","084 621 7066","emcgeever@waterfront.co.za","Stephanie Donachie","061 365 1127",,21,"06:36am","06:50am","Direct 21KM runners from Granger Bay Boulevard on to Dock Road on the mountain side of the island."
-117,"AAC","Andre","Cloete","Andre Cloete","083 432 6867","andregcloete@gmail.com","Jarrod Assenheim","082 443 3209",,"21 & 5","06:36am","08:45am","Direct 21KM from Granger Bay Blvd around the circle and down Dock Road on the Sea Point side of the road; direct 5KM race up Granger Bay Blvd on the Sea Point side of the road."
+117,"AAC","Kim","Botti","Kim Botti","082 520 6125","kimb@leebotti.co.za","Jarrod Assenheim","082 443 3209",,"21 & 5","06:36am","08:45am","Direct 21KM from Granger Bay Blvd around the circle and down Dock Road on the Sea Point side of the road; direct 5KM race up Granger Bay Blvd on the Sea Point side of the road."
 118,"AAC","Mick","Murphy","Mick Murphy","084 529 0967","mick@murphyprojects.co.za","Stephanie Donachie","061 365 1127",,"21 & 5","06:36am","08:45am","Keep 21KM on the mountain side of the road; sea side will be open to cars."
 119,"AAC","Odette","Geldenhuys","Odette Geldenhuys","083 776 6611","odette.g@mweb.co.za","Stephanie Donachie","061 365 1127",,21,"06:36am","06:50am","Keep 21KM on the mountain side of the road; sea side will be open to cars."
 120,"AAC","Lawrence","Swanson","Lawrence Swanson","083 389 2604","lawrences@afreshbrands.co.za","Stephanie Donachie","061 365 1127",,21,"06:36am","06:50am","Keep 21KM on the mountain side of the road; sea side will be open to cars."
@@ -28,7 +28,7 @@
 127,"AAC","Howard","Silke","Howard Silke","083 557 5840","howard.silke@bassgordon.co.za","Stephanie Donachie","061 365 1127",,21,"06:39am","07:00am","Keep 21KM on the mountain side of the road; sea side will be open to cars."
 128,"AAC","Michael","Eastman","Michael Eastman","082 907 7246","asics@iafrica.com","Stephanie Donachie","061 365 1127",,21,"06:39am","07:00am","Keep 21KM on the mountain side of the road; sea side will be open to cars."
 129,"AAC","Shen","Eastman","Shen Eastman","082 907 7246","asics@iafrica.com","Stephanie Donachie","061 365 1127",,21,"06:39am","07:00am","Keep 21KM on the mountain side of the road; sea side will be open to cars."
-130,"AAC","Comfort","Bunting","Comfort Bunting","082 441 9955","hlupheka@hotmail.com","Stephanie Donachie","061 365 1127",,21,"06:39am","07:00am","Keep 21KM on the mountain side of the road; sea side will be open to cars."
+130,"AAC","Jana","van Houwelingen","Jana van Houwelingen","082 874 3839","janavh04@gmail.com","Stephanie Donachie","061 365 1127",,21,"06:39am","07:00am","Keep 21KM on the mountain side of the road; sea side will be open to cars."
 131,"AAC","Nazeem","Hendricks","Nazeem Hendricks","071 866 0481","nazeemhendricks@icloud.com","Stephanie Donachie","061 365 1127",,21,"06:39am","07:00am","Keep 21KM on the mountain side of the road; sea side will be open to cars."
 132,"AAC","Marisa","Smalberger","Marisa Smalberger","083 408 3371","marisa.smalberger@gmail.com","Stephanie Donachie","061 365 1127",,21,"06:39am","07:00am","Keep 21KM on the mountain side of the road; sea side will be open to cars."
 133,"AAC","Brenda","Pringle","Brenda Pringle","083 658 2179","brenda.pringle@commsure.co.za","Stephanie Donachie","061 365 1127",,21,"06:39am","07:00am","Keep 21KM on the mountain side of the road; sea side will be open to cars."
@@ -49,20 +49,20 @@
 148,"AAC","Tamryn","West","Tamryn West","072 589 1331","tamrynwest06@gmail.com","Jarrod Assenheim","082 443 3209",,"21 & 5","06:36am","08:45am","Keep 21KM on the Sea Point side of the road towards the Waterfront; keep the 5KM on the Sea Point side of the road towards Fritz Sonnenberg Road."
 149,"AAC","Luke","Serafin","Luke Serafin","079 890 0094","lukebrian.serafin@gmail.com","Jarrod Assenheim","082 443 3209",,"21 & 5","06:36am","08:45am","Keep 21KM on the Sea Point side of the road towards the Waterfront; keep the 5KM on the Sea Point side of the road towards Fritz Sonnenberg Road."
 150,"AAC","Gerald","Aronson","Gerald Aronson","082 569 5627","klik@mweb.co.za","Jarrod Assenheim","082 443 3209",,"21 & 5","06:36am","08:45am","Direct 21KM from Granger Bay Blvd around the circle and down Dock Road on the Sea Point side of the road; direct 5KM race up Granger Bay Blvd on the Sea Point side of the road."
-151,"AAC","Nick","Groll","Nick Groll","071 121 7022","nickgroll@gmail.com","Jarrod Assenheim","082 443 3209",,"21 & 5","06:36am","08:45am","Direct 21KM from Granger Bay Blvd around the circle and down Dock Road on the Sea Point side of the road; direct 5KM race up Granger Bay Blvd on the Sea Point side of the road."
-152,"AAC","Patrick","Willenberg","Patrick Willenberg","083 432 6867","andregcloete@gmail.com","Jarrod Assenheim","082 443 3209",,"21 & 5","06:36am","08:45am","Direct 21KM from Granger Bay Blvd around the circle and down Dock Road on the Sea Point side of the road; direct 5KM race up Granger Bay Blvd on the Sea Point side of the road."
+151,"AAC","Ben","Gillies","Ben Gillies","082 648 8285","gillies.ben@gmail.com","Jarrod Assenheim","082 443 3209",,"21 & 5","06:36am","08:45am","Direct 21KM from Granger Bay Blvd around the circle and down Dock Road on the Sea Point side of the road; direct 5KM race up Granger Bay Blvd on the Sea Point side of the road."
+152,"AAC","Maria","Lewis","Maria Lewis","060 683 6012","gabiba@mweb.co.za","Jarrod Assenheim","082 443 3209",,"21 & 5","06:36am","08:45am","Direct 21KM from Granger Bay Blvd around the circle and down Dock Road on the Sea Point side of the road; direct 5KM race up Granger Bay Blvd on the Sea Point side of the road."
 201,"AAC","Eduan","Coetzee","Eduan Coetzee","071 257 9565","ecoetzee920827@gmail.com","Collin Sedeman","083 540 3252",,"21 & 5","06:48am","09:06am","Keep runners on Fan Walk towards the underpass; keep Fan Walk clear of cars; direct returning 5KM runners through the parking lot."
 202,"AAC","Robert","Zive","Robert Zive","083 700 7838","Rzive@snoekws.co.za","Collin Sedeman","083 540 3252",,"21 & 5","06:48am","09:06am","Keep runners on Fan Walk towards the underpass; keep Fan Walk clear of cars; direct returning 5KM runners through the parking lot."
-203,"AAC","Melissa","Weber","Melissa Weber","072 249 7297","melissaweber@gmail.com","Collin Sedeman","083 540 3252",,"21 & 5","06:48am","09:06am","Direct 21KM runners into underpass; keep outgoing 5KM runners on sea side of Fan Walk and direct returning 5KM runners through the parking lot."
+203,"AAC","Melissa","Weber","Melissa Weber","072 249 7297","melissadweber@gmail.com","Collin Sedeman","083 540 3252",,"21 & 5","06:48am","09:06am","Direct 21KM runners into underpass; keep outgoing 5KM runners on sea side of Fan Walk and direct returning 5KM runners through the parking lot."
 204,"AAC","Prieur","du Plessis","Prieur du Plessis","072 189 7900","prieur@gmail.com","Jarrod Assenheim","082 443 3209",,"21,10 & 5","06:48am","09:30am","Direct 21KM and returning 5KM runners through underpass and out towards Fan Walk along Main Road."
 205,"AAC","Simon","Midgley","Simon Midgley","083 957 0150","simon.midgley101@gmail.com","Jarrod Assenheim","082 443 3209",,"21,10 & 5","06:48am","09:30am","Direct incoming 5KM runners out underpass on sea side of Fan Walk towards town; direct returning 21KM and 5KM runners through underpass and out towards Fan Walk along Main Road."
 206,"AAC","Gretchen","Weber","Gretchen Weber","072 340 9074","Gretchen.weber91@gmail.com","Jarrod Assenheim","082 443 3209",,"21,10 & 5","06:48am","09:30am","Direct incoming 5KM runners into underpass and out towards sea side of Fan Walk along Main Road."
 207,"AAC","James","Willis","James Willis","083 306 7807","james@moresport.co.za","Jarrod Assenheim","082 443 3209",,"21,10 & 5","06:48am","09:30am","Direct 21KM and 10KM runners out of underpass towards Sea Point along Fan Walk on Main Road; direct returning 5KM runners on to Forecourt towards Sea Point."
-208,"AAC","Keagan","Hoffman","Keagan Hoffman","082 450 6603","keagan.hoffman@gmail.com","Jarrod Assenheim","082 443 3209",,"21,10 & 5","06:48am","09:30am","Direct 21KM runners towards Sea Point on sea side lane of Main Road; direct 10KM and 5KM runners toward Sea Point on mountain side of Fan Walk; direct returning 5KM runners to underpass on sea side of Fan Walk."
+208,"AAC","Comfort","Bunting","Comfort Bunting","082 441 9955","hlupheka@hotmail.com","Jarrod Assenheim","082 443 3209",,"21,10 & 5","06:48am","09:30am","Direct 21KM runners towards Sea Point on sea side lane of Main Road; direct 10KM and 5KM runners toward Sea Point on mountain side of Fan Walk; direct returning 5KM runners to underpass on sea side of Fan Walk."
 209,"AAC","Basil","Mashappie","Basil Mashappie","079 490 4329","bmashappie@parliament.gov.za","Jarrod Assenheim","082 443 3209",,"21,10 & 5","06:48am","09:30am","Direct 21KM runners towards Sea Point on sea side lane of Main Road; direct 10KM and 5KM runners toward Sea Point on mountain side of Fan Walk; direct returning 5KM runners to underpass on sea side of Fan Walk."
 210,"AAC","Claire","van den Heever","Claire van den Heever","079 324 6787","clairevdh@gmail.com","Jarrod Assenheim","082 443 3209",,"21,10 & 5","06:48am","09:30am","Direct 21KM runners towards Sea Point on sea side lane of Main Road; direct 10KM and 5KM runners toward Sea Point on mountain side of Fan Walk; direct returning 5KM runners to underpass on sea side of Fan Walk."
 211,"AAC","Iain","Manley","Iain Manley","081 868 0197","iain@voicemap.me","Jarrod Assenheim","082 443 3209",,"21,10 & 5","06:48am","09:30am","Direct 21KM runners towards Sea Point on sea side lane of Main Road; direct 10KM and 5KM runners toward Sea Point on mountain side of Fan Walk; direct returning 5KM runners to underpass on sea side of Fan Walk."
-212,"AAC","Bobby","Arnold","Bobby Arnold","076 355 4392","Robert.Arnold@capetown.gov.za","Collin Sedeman","083 540 3252",,"21 & 5","06:48am","09:06am","Turn 5KM runners around back towards Sea Point from sea side to mountainside of Fan Walk; direct 21KM runners towards Sea Point on Fan Walk."
+212,"AAC","Rachel","Marks","Rachel Marks","081 476 8247","rachmarks@hotmail.com","Collin Sedeman","083 540 3252",,"21 & 5","06:48am","09:06am","Turn 5KM runners around back towards Sea Point from sea side to mountainside of Fan Walk; direct 21KM runners towards Sea Point on Fan Walk."
 213,"AAC","John","Kolbe","John Kolbe","071 231 6940","kolbejon@gmail.com","Collin Sedeman","083 540 3252",,"21 & 5","06:48am","09:06am","Turn 5KM runners around back towards Sea Point from sea side to mountainside of Fan Walk; direct 21KM runners towards Sea Point on Fan Walk."
 214,"AAC","Barney ","Israells","Barney Israells","082 874 3839","barney@vegtech.co.za","Jarrod Assenheim","082 443 3209",,"21 & 5","06:36am","09:00am","Direct 21KM from Fritz Sonnenberg down Granger Bay Blvd on stadium side of road; direct 5KM to turn into Fritz Sonnenberg towards stadium."
 215,"AAC","Kobus","Ehlers","Kobus Ehlers","073 188 6583","kobus@kobusehlers.com","Jarrod Assenheim","082 443 3209",,"21 & 5","06:36am","09:00am","Direct 21KM from Fritz Sonnenberg down Granger Bay Blvd on stadium side of road; direct 5KM to turn into Fritz Sonnenberg towards stadium."
@@ -85,9 +85,9 @@
 232,"AAC","David","Frylinck","David Frylinck","084 387 5348","david.frylinck@gmail.com","Keith Bake","083 245 8757",,"10 & 21","06:30am","10:00am","Direct 21KM and 10KM from start down Fritz Sonnenberg past stadium; direct 21KM finishers into Stephan Way towards Hamilton."
 233,"AAC","Nienke","Pannekoek","Nienke Pannekoek","066 156 5153","nienkepannekoek@hotmail.com","Keith Bake","083 245 8757",,"10 & 21","06:30am","10:00am","Direct 21KM and 10KM from start down Fritz Sonnenberg past stadium; direct 21KM finishers into Stephan Way towards Hamilton."
 234,"AAC","Nthabeleng","Tsusane","Nthabeleng Tsusane","082 381 9923","otsusane@gmail.com","Keith Bake","083 245 8757",,21,"07:36am","10:00am","Direct 21KM down Stephan Way on to fields; control car access to Hamilton."
-235,"AAC","Miltoinette","Cupido","Miltoinette Cupido","073 257 1110","miltoinette@gmail.com","Keith Bake","083 245 8757",,21,"07:36am","10:00am","Direct 21KM towards finish on fields."
+235,"AAC","Desmond","Judge","Desmond Judge","082 492 1015","desmond@mjudge.co.za","Keith Bake","083 245 8757",,21,"07:36am","10:00am","Direct 21KM towards finish on fields."
 236,"AAC","Tim","Siebritz","Tim Siebritz","076 679 161","tsiebritz@gmail.com","Allan Young","082 259 5713",,"21,10 & 5","06:36am","09:40am","Direct 21KM runners towards Sea Point on sea side lane of Main Road; direct 10KM and 5KM runners toward Sea Point on mountain side of Fan Walk; direct returning 5KM runners to underpass on sea side of Fan Walk. Control cars at parking entrance."
-237,"AAC","Marvin","Bester","Marvin Bester","073 502 1300","bstmar007@gmail.com","Allan Young","082 259 5713",,"21,10 & 5","06:48am","09:40am","Direct 21KM runners towards Sea Point on sea side lane of Main Road; direct 10KM and 5KM runners toward Sea Point on mountain side of Fan Walk; direct returning 5KM runners to underpass on sea side of Fan Walk. Control cars at parking entrance."
+237,"AAC","Sherri","Liss","Sherri Liss","083 859 0234","shrrliss@gmail.com","Allan Young","082 259 5713",,"21,10 & 5","06:48am","09:40am","Direct 21KM runners towards Sea Point on sea side lane of Main Road; direct 10KM and 5KM runners toward Sea Point on mountain side of Fan Walk; direct returning 5KM runners to underpass on sea side of Fan Walk. Control cars at parking entrance."
 238,"AAC","Melvyn","Office","Melvyn Office","073 898 9386","melvyn.office@gmail.com","Keith Bake","083 245 8757",,"21,10 & 5","06:33am","10:00am","Direct 21KM and 10KM runners up Vlei Road; keep Vlei Road clear of pedestrians for 5KM runners."
 239,"AAC","Kylie","Hoffman","Kylie Hoffman","083 643 3831","kylzie@gmail.com","Keith Bake","083 245 8757",,"21,10 & 5","06:33am","10:00am","Direct 21KM and 10KM runners up Vlei Road to Main Road; direct 5KM runners down Vlei Road to finish; keep Vlei Road clear of pedestrians."
 240,"AAC","Caspar","Greef","Caspar Greef","082 456 4054","greeff@adept.co.za","Keith Bake","083 245 8757",,"21,10 & 5","06:33am","10:00am","Direct 21KM and 10KM runners up Vlei Road to Main Road; direct 5KM runners down Vlei Road to finish; keep Vlei Road clear of pedestrians."
@@ -105,7 +105,7 @@
 252,"AAC","Caryn","Querido","Caryn Querido","074 457 9582","carrie.querido@gmail.com","Collin Sedeman","083 540 3252",,21,"06:42am","07:20am","Direct 21KM runners along the mountain side of the road; control cars on Napier Road."
 253,"AAC","Devyn","Lee","Devyn Lee","076 819 1127","leedevyn355@gmail.com","Collin Sedeman","083 540 3252",,21,"06:42am","07:20am","Direct 21KM runners along the mountain side of the road; control cars on Napier Road."
 254,"AAC","Melville","Silke","Melville Silke","072 132 5572","melville.silke@gmail.com","Collin Sedeman","083 540 3252",,21,"06:42am","07:20am","Direct 21KM runners along the mountain side of the road; control cars on Alfred Road."
-255,"AAC","Corli","van der Merwe","Corli van der Merwe","084 524 1188","cornelia.vdmerwe@24.com","Collin Sedeman","083 540 3252",,21,"06:42am","07:20am","Direct 21KM runners along the mountain side of the road; control cars on Alfred Road."
+255,"AAC","Patrick","Willenberg","Patrick Willenberg","071 231 6940","kolbejon@gmail.com","Collin Sedeman","083 540 3252",,21,"06:42am","07:20am","Direct 21KM runners along the mountain side of the road; control cars on Alfred Road."
 256,"AAC","JP","Moodie","JP Moodie","083 999 3735","za.jeanpaul@gmail.com","Collin Sedeman","083 540 3252",,21,"06:45am","07:20am","Direct 21KM runners onto the Sea Point side of Chiappini Road; control cars on Chiappini Road."
 257,"Edgemead Runners",,,,,,"Liam Hendrickse","072 392 7558","raceconvener@edgemeadrunners.org.za",21,"06:25am","10:00am","Keep 21KM runners to sea side of Beach Road and on pavement when possible."
 258,"Edgemead Runners",,,,,,"Liam Hendrickse","072 392 7558","raceconvener@edgemeadrunners.org.za",21,"06:25am","10:00am","Control traffic at junction of Beach and Rothsay Place. Keep 21KM runners to sea side of Beach Road and on pavement when possible."
diff --git a/GIS Base Map/mayor.cpg b/GIS Base Map/mayor.cpg
new file mode 100644
index 0000000..3ad133c
--- /dev/null
+++ b/GIS Base Map/mayor.cpg	
@@ -0,0 +1 @@
+UTF-8
\ No newline at end of file
diff --git a/GIS Base Map/mayor.dbf b/GIS Base Map/mayor.dbf
new file mode 100644
index 0000000000000000000000000000000000000000..530a73a0434f09e3dd60c428cbe0b63afdb6625a
GIT binary patch
literal 4284
zcmZQB=MvCkU|>jOhz63FATtFn<_BVN!MPAdNo7GQRLB`b2S7P6idR7k4w4g#6sQW|
zCToov4G!4R06|M%qX9A+AZQ_g#vM%|qXB{z0%+XP6fznhXd!^c9Zeyl0fH6+Xxz~h
iG8!OgA%MmmO(CNJf))a3+@YRA$`f<4(Y!<vR|){sNJ&Eg

literal 0
HcmV?d00001

diff --git a/GIS Base Map/mayor.prj b/GIS Base Map/mayor.prj
new file mode 100644
index 0000000..a30c00a
--- /dev/null
+++ b/GIS Base Map/mayor.prj	
@@ -0,0 +1 @@
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]
\ No newline at end of file
diff --git a/GIS Base Map/mayor.qpj b/GIS Base Map/mayor.qpj
new file mode 100644
index 0000000..5fbc831
--- /dev/null
+++ b/GIS Base Map/mayor.qpj	
@@ -0,0 +1 @@
+GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]
diff --git a/GIS Base Map/mayor.shp b/GIS Base Map/mayor.shp
new file mode 100644
index 0000000000000000000000000000000000000000..461876fcd78e32495512365d0c83f460767d5cf9
GIT binary patch
literal 4600
zcmai&3sjET8po4#QM#zmO-d@I<Pt^a_zc~o=^P5Rh{9CE<T6xfq7FWsjO#EmQYlR-
z(-$h$Nw;H^CXpeRLewOe($q94o&WPK&sp!hXVyCJvaR=L|DXT!?ESvq-utDXU^P_X
zPcPNJw!sPt_@i(xt$Ma$*ksApXP;lu?va%Gyb95%T{Bs7FE8WPfnO!1e;WSBe;fpK
zBCh~<Ki#?Tx|Xgp*Q#4mYGv^>coDch?_Ba|FbS1D#<G_CS_dnh@`TnmKg`@5T3hQy
zi+#Y+wQ)Tb0x$N4jpD~fj+Fi&{k3*;)0*th|93o1(|!**_pt^oionHV<*{Fk-%_5B
zvFnsIei($gm~7U1I1{{0<9%~4VuPMfez6Vg;?aG#4jl7uL;H>3``UIDRp6Gg8oQO?
zAiq(0WnkI$v%`JC)pzFR6oK!*9V_z$XIH6J6@U{XPUX%5AK#)Jng`zeuJz0$aB==u
z?H9l|)?d!C0DGPNAwC!EYt!YZ4-RyF;VlC<4c@f87GwRiHEig4@L7f6rA1(aD>E9h
zz&sZ`b_|)Oe+kW#Y-;BjLuk2=wWnt%7DOVJo|P&ZUEKFyZQEztlMt)=_4R@bXs7SX
zay$x-56nH54(@k*d~p{z%df~X6&$?0FJ>FqBTj#QGFYXeI(GwjYhM48Q{aVFX~!0T
z*Qw8(bP&w7aV;oe2pT<ax|GrWMq~Kmk%y});yN_cYH#3O?W-#a(FK1S`Ok>!U>bu8
z8eL*-VZ+4*6x$GxA*+S9^o_Qe8dx*sQp!)@?hgqn>flG&(tS1H-1MmYVc>qv_8-Yx
zZH|4MHkfm9?yU~BJE<QjDYXODd7*!EK?vSuM-5Y*g&3b*X8XPpaA=+F+bLkGlXP@(
zA8Thl&@xGf_Hp$!EiY)<i(?T&k7*CZ+iuxi=nrk@i-;^$Xm4LmIZ8EFHfq_|qbACu
ziAI;W@9p8}2a3?vZufujGqf)H>u>xDukXW(4eo<CsY#of!2>D!<D0<y$IQsM4bJQi
zmp%bkJ0-6v1e@;dTG0yr%zpirEbzp5pQX>iuC*Ey4uQ)IlIM1UQ`5R4c7n5?l{j>R
zB_WZoBEkEYxtIM8F5h`GYc1H+c~5*l`1t(g2CKm)Ei0xC!q{{gm-GaJLtCpHhk(Un
z#}L)f<m*y{Z%ywf(C$!{#2P~zGWphQZ*b}%n-*;_%?qzf;=ZhJRz<l(Yip)?O%K{e
z=O%ks@aw*phem?M-ms!IS3=L@+3d=Z)1l>O#m}z1Zt6x_A1N=r*mQ9pYx{d2U-Cli
z?yCjT@z5%0m&H-uSqF>1v<A;gIUn#>aE?iQ19@>S_J*Z8n*9B1ubVq16I$oM*fvjS
zgC2cqUJh<CUl||)3*SH1a^L<>4*UNLTDRd}4!8?q*$X)|IFESl#Lq;SN8G2>_28->
z@*FVT<))52VlU(vhQ@0Ey~gr&tSkHCBqPL`UAd-D^TPAs;=Wgr_7Td->lpX(967D%
zyEhfFR-s2KXbvNl7w@wdcr8wi^0EeJ7Dpve|D87(+2&yF0IlVg;Q9%h9Y=#-?Ohc^
zd(>|AiIK+O<|obGW5HY-*Md@L>yg(jQBoiA7yRDlyU(jkgSNsc{1+McX;G8=cCfH+
z)^gtuR{Cw>&<@i7ddxS_S{gX3)B0+B`<_JtST-)<w|{_lXNC8C2OfJzny??Nx+Z(e
zY4B<5EALN$(-VtyQ>cH5dP*wzX#Tb4GhnWTYeUW2Xgv2ixVNVF`{cu;$CD9fJm8~c
zgt%fG<qv1UtJc-p8GvaF9Q6ORkPc^Gem^Zjt(um?XNQB=vDcVae&>X~tmQt|ax6S`
z+4o`3ExkdgkJor!^P?9%&HE8+jL?_+Sj(}jg{Pj_m-hzVD_AS^75lK3W8tZf#?v-J
za6gjsxma9{-iP_%-zfiPgYInzohF)h)^Z<fIToIy*q6_1?m0Di_VDp(@qfJmdHBpF
z90zN;kF^{NPXqRClSLkEgAecLyuY{pede%WQN7&9T8?EcJPp~GbMn}DtXzYzUe<CS
zYdIF4M(n#^@wp0}jrjM*zrP8;eD{2vs9x4`A8R=lp2qCUdpnPX$HsfTuwL$CEyuDJ
zo+j+e?>yJQHSupi=*wE}V=c$Rb2Qo?_Ag#9#b<W%<^4<C7p3&@+c|jVDh(+s%rIxY
zuBY^7gDV$=zofPC!P=}!7qFW&LW$N=@!AY)Q#AQH!+R`$D{wB}&xPY-E%&jOW8pal
zO+LOoC(Ktnpa#}*Y~#743nM;0XC5DGxv$3HWXLqcUVd)lMCX9Yw!oU1-~n&v^`pR#
z%6yC^;8;r&i6NN1ITva$LzACRJk)YxXkR%yuOotD#kpvFd_ECtUxrDqSR%I4$8Igv
zVXF02q%FAHD7K!)AohZlIhqHp-~8>z`;*w4^3q|OF7aN*v4z89+f9)tt#9B6eMk12
zy{t9?YfXP+N_(Mn-0gDO8-5FnzDaxK5bw?|+8e~VkYX&Fd_MTB&gWJ>tMWNtI3L`{
z+JzI(r)%K18@I|U=@!=X(hPqYo$D=1!q?sevp0Jorv;k)eGq#+){{M@b)X~X*)ICN
zpuGG(i2KquR#}lYeUHiAI%vJ8IHipQzgu8Ghw5n3b!?_@lafqLJvxhvbHREXntc5H
zEx~y?7k^s_$In{stM)Yxro4ulou2gFB8yJfrMlYv)Qaf4hP~JuIW5t6zp)bBTMO>T
z3+`<M_qKxj3AmTfV}0xE@f~>9y#IM!mK{(+4d2I|ypxX_g!3rg4_RCC^P~K$&`wfF
z{Ll|C#RGvA<>1`lf*A_%I+IjwO3b;~8#UMoYO=?D6us*uMnU1P;InO6%Zg&e<#i~|
zpy$E=&p|cOL6)whgHyb^1zL`^DoxNWKy1>c8PYfC?>O<rvJ2pONA4`^1&?paU40%L
zyZ2qi0Qj~fbW|qTO+7V@z9n5J-q=X}oIB={X4N@xeXe<n4*K1~9`8v9uZ$~mA^i@i
qg~}P?-0FB0aA8{Lu0-&vtqn@_t#-HM@X!-r&y_z7dyjlPmj3|!eA)B>

literal 0
HcmV?d00001

diff --git a/GIS Base Map/mayor.shx b/GIS Base Map/mayor.shx
new file mode 100644
index 0000000000000000000000000000000000000000..56838c63a2847e954db9e85eb7ac3c6ae83033ff
GIT binary patch
literal 468
zcmZQzQ0HR64qm-rW?%p!hSf_?IZ9<3IaEE#+Ar|c;eh|!be?nBMh-W(t-RF#+2H_o
z?I@x~K%NB<=K(Pj5SIY)1O^614j>%?q*EZ`j9EZB0Lb45qz!=dCm`Jc)KUkef%=(t
z0ci&y{SQb3<(Wa|g6K3L4K$ZI2S@|WV?F_)SyUk6ELuQXgMoo13`#da>2*;07LW$&
zXL$gnpFzY~g`l(@lm@vEXb$T%D18V@zk|?hQb5{)fq^X!%I|{m&jD$m``NjGv<Hv|
xxdX(X1d(UI2H|sn>;t-kLjp?6L20NzI6(dY$pifirp<t~1CU<@<u?H73IK@uFiije

literal 0
HcmV?d00001

diff --git a/Start vector maps/20191017 - Gun Run 2019 - Start Layout rev 1.3.pdf b/Start vector maps/20191017 - Gun Run 2019 - Start Layout rev 1.3.pdf
new file mode 100644
index 0000000..bade687
--- /dev/null
+++ b/Start vector maps/20191017 - Gun Run 2019 - Start Layout rev 1.3.pdf	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:774733b0f6d620f247abf10f21a29a9e89ab414ad50e003a3167fb3eedad4361
+size 625488
diff --git a/Start vector maps/GR_start_pens_fencing_final_191015.pdf b/Start vector maps/GR_start_pens_fencing_final_191015.pdf
new file mode 100644
index 0000000..cf8ad0d
--- /dev/null
+++ b/Start vector maps/GR_start_pens_fencing_final_191015.pdf	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f48f1be2d231c37ea7bab99aee7fd0980bb69f9b207eda478205d8122480449a
+size 109505
diff --git a/Start vector maps/output_3.svg b/Start vector maps/output_3.svg
index 7a23a9d..41c0625 100644
--- a/Start vector maps/output_3.svg	
+++ b/Start vector maps/output_3.svg	
@@ -23,7 +23,7 @@
    inkscape:export-ydpi="120"><metadata
      id="metadata8"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
      id="defs6"><clipPath
    clipPathUnits="userSpaceOnUse"
    id="clipPath28"><path
@@ -574,6 +574,54 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 </defs><sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -587,13 +635,13 @@
      inkscape:window-height="2032"
      id="namedview4"
      showgrid="false"
-     inkscape:zoom="5.0217892"
-     inkscape:cx="963.78731"
-     inkscape:cy="696.15333"
+     inkscape:zoom="10.043578"
+     inkscape:cx="990.97176"
+     inkscape:cy="599.39913"
      inkscape:window-x="0"
      inkscape:window-y="54"
      inkscape:window-maximized="1"
-     inkscape:current-layer="g1729"
+     inkscape:current-layer="g10"
      inkscape:lockguides="true" /><g
      id="g10"
      inkscape:groupmode="layer"
@@ -603,9 +651,10 @@
    id="rect2316"
    width="844.00159"
    height="595.61676"
-   x="21.132906"
-   y="-596.41473"
-   transform="scale(1,-1)" /><g
+   x="38.369717"
+   y="-616.68896"
+   transform="scale(1,-1)"
+   sodipodi:insensitive="true" /><g
    id="g14702"
    transform="translate(30)"
    clip-path="url(#clipPath15828)"
@@ -2658,7 +2707,7 @@
      id="path5186"
      style="fill:none;stroke:#000000;stroke-width:0.07343905;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
      d="m 824.87868,571.84018 -6.40614,11.09575" /></g><g
-   transform="matrix(0.2399962,0,0,-0.2399962,-1.6811362,589.7063)"
+   transform="matrix(0.2399962,0,0,-0.2399962,-1.6811362,585.2063)"
    id="g1729"><text
    id="text152-6"
    transform="rotate(-90)"
@@ -2674,6 +2723,7 @@
 
 
 
+
 <text
    id="text4978-7-7"
    transform="rotate(-90)"
@@ -2696,11 +2746,12 @@
 
 
 
+
 <g
    id="g5853-3"
    transform="translate(15.285,3.6966)"><path
    id="path9065-7-3-5"
-   d="m 3246.4,2408.9 v 4.1602 h 218.07 v -222.23 h -222.23 v 222.23 h 4.1602 v -4.1602 h 4.1701 v -209.73 h 205.56 v 205.56 h -209.73 v 4.1701 h 4.1701 -4.1701"
+   d="m 3246.4,2408.9 v 4.1602 h 218.07 v -222.23 h -222.23 v 222.23 h 4.1602 V 2408.9 h 4.1701 v -209.73 h 205.56 v 205.56 h -209.73 v 4.1701 h 4.1701 -4.1701"
    inkscape:connector-curvature="0"
    style="fill:#666666" /><text
    id="text9153-3-6"
@@ -2720,9 +2771,10 @@
 
 
 
+
 </g><path
    id="path9025-9"
-   d="m 3374.589,452.11754 v 1718.84246 h 1.9987 v -1718.84246 z"
+   d="M 3374.589,452.11754 V 2170.96 h 1.9987 V 452.11754 Z"
    inkscape:connector-curvature="0"
    style="fill:#666666;stroke-width:0.96120244" /><text
    id="text6133-6-6-1"
@@ -2738,7 +2790,8 @@
      x="-628.97626"
      y="3366.0159"
      font-size="33.334px"
-     style="font-size:33.33399963px;line-height:1.25;stroke-width:1px">REVISION 1.2</tspan></text>
+     style="font-size:33.33399963px;line-height:1.25;stroke-width:1px">REVISION 1.3</tspan></text>
+
 
 
 
@@ -2766,6 +2819,7 @@
 
 
 
+
 <image
    transform="rotate(-90)"
    width="329.74924"
@@ -2817,6 +2871,7 @@
 
 
 
+
 <g
    style="font-family:'Myriad Pro';letter-spacing:0px;word-spacing:0px;fill:#000000;stroke-width:0.75656998px"
    id="g6733-7-3"
@@ -2840,6 +2895,7 @@
 
 
 
+
 <text
    id="text9724-7-5-3"
    transform="rotate(-90)"
@@ -2858,6 +2914,7 @@
 
 
 
+
 </g><g
    style="fill:none;stroke:#000000;stroke-width:2.27130008;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
    id="g6732-7-0"
@@ -2925,6 +2982,7 @@
 
 
 
+
 <rect
    style="fill:none;stroke:#000000;stroke-width:0.4799923;stroke-linejoin:round"
    height="4.1468935"
@@ -2953,6 +3011,7 @@
 
 
 
+
 <rect
    style="fill:none;stroke:#000000;stroke-width:0.4799923;stroke-linejoin:round"
    height="4.3756104"
@@ -2981,6 +3040,7 @@
 
 
 
+
 <rect
    style="fill:none;stroke:#000000;stroke-width:0.80000335;stroke-linejoin:round;stroke-opacity:0.98039"
    height="3.9498761"
@@ -3009,6 +3069,7 @@
 
 
 
+
 <g
    id="g16634"
    transform="translate(27.021328,182.97299)"><g
@@ -3055,6 +3116,7 @@
 
 
 
+
 </g><path
    d="m -52.389661,217.09484 c 0,0 2.593879,-5.9195 -0.144091,-6.65365 -1.782813,-0.478 -3.455466,-0.99752 -3.455466,-0.99752"
    id="path4816-2-8"
@@ -3103,6 +3165,7 @@
 
 
 
+
 <text
    xml:space="preserve"
    style="font-size:2.41652179px;line-height:0%;font-family:'Myriad Pro';letter-spacing:0px;word-spacing:0px;fill:#000000;stroke-width:0.23999619px"
@@ -3125,318 +3188,82 @@
 
 
 
+
 </g>
 
 
-<g
-   transform="matrix(0.64122038,0,0,0.63496589,708.18632,119.19321)"
-   id="g16172"
-   style="stroke-width:1.56718814"><g
-     word-spacing="0px"
-     letter-spacing="0px"
-     transform="matrix(0.00335265,-0.31720702,-0.31720702,-0.00335265,191.17943,570.29773)"
-     id="g6733-7"
-     style="font-family:'Myriad Pro';letter-spacing:0px;word-spacing:0px;fill:#000000;stroke-width:1.18568754px"><text
+<text
    xml:space="preserve"
-   style="line-height:0%;stroke-width:1.18568754px"
-   y="615.89191"
-   x="-958.08167"
-   transform="matrix(0.0085916,-0.99988,1.0001,0.0081441,0,0)"
+   style="font-size:2.42905855px;line-height:0%;font-family:'Myriad Pro';letter-spacing:0px;word-spacing:0px;fill:#000000;stroke-width:0.24000871px"
+   y="-357.32068"
+   x="634.03687"
+   transform="matrix(1.0048024,0.0019666,0.00243797,-0.99521575,0,0)"
    id="text10848-1-6-9-1"><tspan
-     style="font-size:33.33300018px;line-height:1.25;stroke-width:1.18568754px"
+     style="font-size:6.74731779px;line-height:1.25;stroke-width:0.24000871px"
      font-size="33.333px"
-     y="615.89191"
-     x="-958.08167"
+     y="-357.32068"
+     x="634.03687"
      id="tspan10850-74-1-3-1">toilets</tspan></text>
-
-
-
-
-
-
-<text
-   xml:space="preserve"
-   style="line-height:0%;stroke-width:1.18568754px"
-   y="607.51147"
-   x="-866.85199"
-   transform="rotate(-90)"
-   id="text9724-7-5"><tspan
-     style="font-size:16.66699982px;line-height:1.25;stroke-width:1.18568754px"
-     font-size="16.667px"
-     y="607.51147"
-     x="-866.85199"
-     id="tspan9726-4-9">15</tspan></text>
-
-
-
-
-
-
-</g><g
-     stroke-miterlimit="10"
-     transform="matrix(0.2119878,-0.00852629,-0.00886228,-0.21032371,-182.9615,573.05771)"
-     id="g6732-7"
-     style="fill:none;stroke:#000000;stroke-width:3.55955458;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"><path
-       d="m 433.54,951.88 12.666,-0.45007 -0.45028,-12.672 -12.666,0.45007 z"
-       id="path9533-0-7"
-       inkscape:connector-curvature="0"
-       style="stroke-width:3.55955458" /><path
-       d="m 446.21,951.43 11.921,-0.42359 -0.45029,-12.672 -11.921,0.4236 z"
-       id="path9537-6-6"
-       inkscape:connector-curvature="0"
-       style="stroke-width:3.55955458" /><path
-       d="m 458.13,951 12.666,-0.45008 -0.45029,-12.672 -12.666,0.45007 z"
-       id="path9541-2-7"
-       inkscape:connector-curvature="0"
-       style="stroke-width:3.55955458" /><path
-       d="m 470.79,950.55 12.666,-0.45007 -0.45029,-12.672 -12.666,0.45007 z"
-       id="path9545-6-3"
-       inkscape:connector-curvature="0"
-       style="stroke-width:3.55955458" /><path
-       d="m 483.46,950.1 12.666,-0.45007 -0.45028,-12.672 -12.666,0.45007 z"
-       id="path9549-1-6"
-       inkscape:connector-curvature="0"
-       style="stroke-width:3.55955458" /><path
-       d="m 496.13,949.65 11.921,-0.42359 -0.45029,-12.672 -11.921,0.4236 z"
-       id="path9553-8-5"
-       inkscape:connector-curvature="0"
-       style="stroke-width:3.55955458" /><path
-       d="m 508.05,949.23 12.666,-0.45007 -0.45029,-12.672 -12.666,0.45007 z"
-       id="path9557-7-6"
-       inkscape:connector-curvature="0"
-       style="stroke-width:3.55955458" /><path
-       d="m 520.71,948.78 12.666,-0.45008 -0.45029,-12.672 -12.666,0.45007 z"
-       id="path9561-9-3"
-       inkscape:connector-curvature="0"
-       style="stroke-width:3.55955458" /><path
-       d="m 533.38,948.33 12.666,-0.45007 -0.45028,-12.672 -12.666,0.45007 z"
-       id="path9565-2-9"
-       inkscape:connector-curvature="0"
-       style="stroke-width:3.55955458" /><path
-       d="m 420.88,952.33 12.666,-0.45007 -0.45029,-12.672 -12.666,0.45007 z"
-       id="path13395-3-4"
-       inkscape:connector-curvature="0"
-       style="stroke-width:3.55955458" /><path
-       d="m 408.21,952.78 12.666,-0.45007 -0.45029,-12.672 -12.666,0.45007 z"
-       id="path13403-1-8"
-       inkscape:connector-curvature="0"
-       style="stroke-width:3.55955458" /><path
-       d="m 396.29,953.2 11.921,-0.4236 -0.45028,-12.672 -11.921,0.4236 z"
-       id="path13411-9-1"
-       inkscape:connector-curvature="0"
-       style="stroke-width:3.55955458" /><path
-       d="m 384.13,953.65 11.921,-0.4236 -0.45028,-12.672 -11.921,0.4236 z"
-       id="path13411-9-7-2"
-       inkscape:connector-curvature="0"
-       style="stroke-width:3.55955458" /><path
-       d="m 372.16,954.1 11.921,-0.4236 -0.45028,-12.672 -11.921,0.4236 z"
-       id="path13411-9-7-5-9"
-       inkscape:connector-curvature="0"
-       style="stroke-width:3.55955458" /></g></g><g
-   transform="matrix(0.64122038,0,0,0.63496589,619.2666,101.52346)"
-   id="g16172-1"
-   style="stroke-width:1.56718814"><g
-     word-spacing="0px"
-     letter-spacing="0px"
-     transform="matrix(0.00335265,-0.31720702,-0.31720702,-0.00335265,191.17943,570.29773)"
-     id="g6733-7-1"
-     style="font-family:'Myriad Pro';letter-spacing:0px;word-spacing:0px;fill:#000000;stroke-width:1.18568754px"><text
-   xml:space="preserve"
-   style="line-height:0%;stroke-width:1.18568754px"
-   y="615.89191"
-   x="-958.08167"
-   transform="matrix(0.0085916,-0.99988,1.0001,0.0081441,0,0)"
-   id="text10848-1-6-9-1-4"><tspan
-     style="font-size:33.33300018px;line-height:1.25;stroke-width:1.18568754px"
-     font-size="33.333px"
-     y="615.89191"
-     x="-958.08167"
-     id="tspan10850-74-1-3-1-3">toilets</tspan></text>
-
-
-
-
-
-
-<text
-   xml:space="preserve"
-   style="line-height:0%;stroke-width:1.18568754px"
-   y="607.51147"
-   x="-866.85199"
-   transform="rotate(-90)"
-   id="text9724-7-5-7"><tspan
-     style="font-size:16.66699982px;line-height:1.25;stroke-width:1.18568754px"
-     font-size="16.667px"
-     y="607.51147"
-     x="-866.85199"
-     id="tspan9726-4-9-2">15</tspan></text>
-
-
-
-
-
-
-</g><g
-     stroke-miterlimit="10"
-     transform="matrix(0.2119878,-0.00852629,-0.00886228,-0.21032371,-182.9615,573.05771)"
-     id="g6732-7-7"
-     style="fill:none;stroke:#000000;stroke-width:3.55955458;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"><path
-       d="m 433.54,951.88 12.666,-0.45007 -0.45028,-12.672 -12.666,0.45007 z"
-       id="path9533-0-7-3"
-       inkscape:connector-curvature="0"
-       style="stroke-width:3.55955458" /><path
-       d="m 446.21,951.43 11.921,-0.42359 -0.45029,-12.672 -11.921,0.4236 z"
-       id="path9537-6-6-3"
-       inkscape:connector-curvature="0"
-       style="stroke-width:3.55955458" /><path
-       d="m 458.13,951 12.666,-0.45008 -0.45029,-12.672 -12.666,0.45007 z"
-       id="path9541-2-7-9"
-       inkscape:connector-curvature="0"
-       style="stroke-width:3.55955458" /><path
-       d="m 470.79,950.55 12.666,-0.45007 -0.45029,-12.672 -12.666,0.45007 z"
-       id="path9545-6-3-2"
-       inkscape:connector-curvature="0"
-       style="stroke-width:3.55955458" /><path
-       d="m 483.46,950.1 12.666,-0.45007 -0.45028,-12.672 -12.666,0.45007 z"
-       id="path9549-1-6-4"
-       inkscape:connector-curvature="0"
-       style="stroke-width:3.55955458" /><path
-       d="m 496.13,949.65 11.921,-0.42359 -0.45029,-12.672 -11.921,0.4236 z"
-       id="path9553-8-5-4"
-       inkscape:connector-curvature="0"
-       style="stroke-width:3.55955458" /><path
-       d="m 508.05,949.23 12.666,-0.45007 -0.45029,-12.672 -12.666,0.45007 z"
-       id="path9557-7-6-4"
-       inkscape:connector-curvature="0"
-       style="stroke-width:3.55955458" /><path
-       d="m 520.71,948.78 12.666,-0.45008 -0.45029,-12.672 -12.666,0.45007 z"
-       id="path9561-9-3-9"
-       inkscape:connector-curvature="0"
-       style="stroke-width:3.55955458" /><path
-       d="m 533.38,948.33 12.666,-0.45007 -0.45028,-12.672 -12.666,0.45007 z"
-       id="path9565-2-9-9"
-       inkscape:connector-curvature="0"
-       style="stroke-width:3.55955458" /><path
-       d="m 420.88,952.33 12.666,-0.45007 -0.45029,-12.672 -12.666,0.45007 z"
-       id="path13395-3-4-3"
-       inkscape:connector-curvature="0"
-       style="stroke-width:3.55955458" /><path
-       d="m 408.21,952.78 12.666,-0.45007 -0.45029,-12.672 -12.666,0.45007 z"
-       id="path13403-1-8-8"
-       inkscape:connector-curvature="0"
-       style="stroke-width:3.55955458" /><path
-       d="m 396.29,953.2 11.921,-0.4236 -0.45028,-12.672 -11.921,0.4236 z"
-       id="path13411-9-1-3"
-       inkscape:connector-curvature="0"
-       style="stroke-width:3.55955458" /><path
-       d="m 384.13,953.65 11.921,-0.4236 -0.45028,-12.672 -11.921,0.4236 z"
-       id="path13411-9-7-2-2"
-       inkscape:connector-curvature="0"
-       style="stroke-width:3.55955458" /><path
-       d="m 372.16,954.1 11.921,-0.4236 -0.45028,-12.672 -11.921,0.4236 z"
-       id="path13411-9-7-5-9-9"
-       inkscape:connector-curvature="0"
-       style="stroke-width:3.55955458" /></g></g><g
-   style="font-family:'Myriad Pro';letter-spacing:0px;word-spacing:0px;fill:#000000;stroke-width:1.18568754px"
-   id="g6733-7-4"
-   transform="matrix(0.00214979,-0.20141564,-0.20339961,-0.00212882,884.76371,442.78507)"
-   letter-spacing="0px"
-   word-spacing="0px"><text
-   id="text10848-1-6-9-1-3"
-   transform="matrix(0.0085916,-0.99988,1.0001,0.0081441,0,0)"
-   x="-958.08167"
-   y="615.89191"
-   style="line-height:0%;stroke-width:1.18568754px"
-   xml:space="preserve"><tspan
-     id="tspan10850-74-1-3-1-9"
-     x="-958.08167"
-     y="615.89191"
-     font-size="33.333px"
-     style="font-size:33.33300018px;line-height:1.25;stroke-width:1.18568754px">toilets</tspan></text>
-
-
-
-
-
-
-<text
-   id="text9724-7-5-4"
-   transform="rotate(-90)"
-   x="-866.85199"
-   y="607.51147"
-   style="line-height:0%;stroke-width:1.18568754px"
-   xml:space="preserve"><tspan
-     id="tspan9726-4-9-9"
-     x="-866.85199"
-     y="607.51147"
-     font-size="16.667px"
-     style="font-size:16.66699982px;line-height:1.25;stroke-width:1.18568754px">15</tspan></text>
-
-
-
-
-
-
-</g><g
+<g
    style="fill:none;stroke:#000000;stroke-width:3.55955458;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
-   id="g6732-7-5"
-   transform="matrix(0.06653516,0.11865746,0.1164126,-0.06569299,573.32989,323.5041)"
+   id="g6732-7"
+   transform="matrix(0.1359309,-0.0054139,-0.00568267,-0.13354838,590.86768,483.06531)"
    stroke-miterlimit="10"><path
      style="stroke-width:3.55955458"
      inkscape:connector-curvature="0"
-     id="path9533-0-7-5"
+     id="path9533-0-7"
      d="m 433.54,951.88 12.666,-0.45007 -0.45028,-12.672 -12.666,0.45007 z" /><path
      style="stroke-width:3.55955458"
      inkscape:connector-curvature="0"
-     id="path9537-6-6-7"
+     id="path9537-6-6"
      d="m 446.21,951.43 11.921,-0.42359 -0.45029,-12.672 -11.921,0.4236 z" /><path
      style="stroke-width:3.55955458"
      inkscape:connector-curvature="0"
-     id="path9541-2-7-3"
+     id="path9541-2-7"
      d="m 458.13,951 12.666,-0.45008 -0.45029,-12.672 -12.666,0.45007 z" /><path
      style="stroke-width:3.55955458"
      inkscape:connector-curvature="0"
-     id="path9545-6-3-9"
+     id="path9545-6-3"
      d="m 470.79,950.55 12.666,-0.45007 -0.45029,-12.672 -12.666,0.45007 z" /><path
      style="stroke-width:3.55955458"
      inkscape:connector-curvature="0"
-     id="path9549-1-6-0"
+     id="path9549-1-6"
      d="m 483.46,950.1 12.666,-0.45007 -0.45028,-12.672 -12.666,0.45007 z" /><path
      style="stroke-width:3.55955458"
      inkscape:connector-curvature="0"
-     id="path9553-8-5-7"
+     id="path9553-8-5"
      d="m 496.13,949.65 11.921,-0.42359 -0.45029,-12.672 -11.921,0.4236 z" /><path
      style="stroke-width:3.55955458"
      inkscape:connector-curvature="0"
-     id="path9557-7-6-2"
+     id="path9557-7-6"
      d="m 508.05,949.23 12.666,-0.45007 -0.45029,-12.672 -12.666,0.45007 z" /><path
      style="stroke-width:3.55955458"
      inkscape:connector-curvature="0"
-     id="path9561-9-3-7"
+     id="path9561-9-3"
      d="m 520.71,948.78 12.666,-0.45008 -0.45029,-12.672 -12.666,0.45007 z" /><path
      style="stroke-width:3.55955458"
      inkscape:connector-curvature="0"
-     id="path9565-2-9-2"
+     id="path9565-2-9"
      d="m 533.38,948.33 12.666,-0.45007 -0.45028,-12.672 -12.666,0.45007 z" /><path
      style="stroke-width:3.55955458"
      inkscape:connector-curvature="0"
-     id="path13395-3-4-90"
+     id="path13395-3-4"
      d="m 420.88,952.33 12.666,-0.45007 -0.45029,-12.672 -12.666,0.45007 z" /><path
      style="stroke-width:3.55955458"
      inkscape:connector-curvature="0"
-     id="path13403-1-8-5"
+     id="path13403-1-8"
      d="m 408.21,952.78 12.666,-0.45007 -0.45029,-12.672 -12.666,0.45007 z" /><path
      style="stroke-width:3.55955458"
      inkscape:connector-curvature="0"
-     id="path13411-9-1-04"
+     id="path13411-9-1"
      d="m 396.29,953.2 11.921,-0.4236 -0.45028,-12.672 -11.921,0.4236 z" /><path
      style="stroke-width:3.55955458"
      inkscape:connector-curvature="0"
-     id="path13411-9-7-2-1"
+     id="path13411-9-7-2"
      d="m 384.13,953.65 11.921,-0.4236 -0.45028,-12.672 -11.921,0.4236 z" /><path
      style="stroke-width:3.55955458"
      inkscape:connector-curvature="0"
-     id="path13411-9-7-5-9-7"
+     id="path13411-9-7-5-9"
      d="m 372.16,954.1 11.921,-0.4236 -0.45028,-12.672 -11.921,0.4236 z" /></g><text
    transform="matrix(0.99955696,0.03552269,0.0355019,-0.99918156,0,0)"
    id="text25088-2"
@@ -3455,6 +3282,7 @@
 
 
 
+
 <g
    id="g16607"
    transform="translate(12.352607,-0.38601898)"><g
@@ -3535,6 +3363,7 @@
 
 
 
+
 </g><g
    id="g6116"
    transform="matrix(0.81235313,-0.18766285,0.18766285,0.81235313,107.70555,190.2196)"><rect
@@ -3562,6 +3391,7 @@
 
 
 
+
 </g>
 
 
@@ -3591,6 +3421,7 @@
 
 
 
+
 <text
    xml:space="preserve"
    style="line-height:0%;stroke-width:1.18568754px"
@@ -3609,6 +3440,7 @@
 
 
 
+
 </g><g
      stroke-miterlimit="10"
      transform="matrix(0.2119878,-0.00852629,-0.00886228,-0.21032371,-182.9615,573.05771)"
@@ -3685,6 +3517,7 @@
      y="-253.68369"
      x="214.96136"
      id="tspan1613-0">tog bag</tspan></text>
+
 <g
    id="g16791"
    transform="rotate(33.755113,27.387415,404.00828)"><rect
@@ -3715,6 +3548,7 @@
 
 
 
+
 </g>
 
 <g
@@ -3747,6 +3581,7 @@
 
 
 
+
 </g><g
    id="g1683"
    transform="matrix(0.71486419,-0.01269628,0.01224022,0.71822014,96.829755,106.63513)"
@@ -3777,6 +3612,7 @@
 
 
 
+
 </g>
 <g
    transform="matrix(0.2399406,0.00532266,0.00532266,-0.2399406,-572.31914,557.46764)"
@@ -3818,140 +3654,135 @@
 
 
 
+
 </g><g
-   id="g6111"><g
-     style="stroke-width:1.72055066"
-     transform="matrix(0.58120928,0,0,0.58120928,152.42801,148.54736)"
-     id="g1996"><g
-   style="stroke-width:2.22673655"
+   id="g1996"
+   transform="matrix(0.58120928,0,0,0.58120928,152.42801,148.54736)"
+   style="stroke-width:1.72055066"><g
+   transform="matrix(0.18541866,0.00293924,-0.00293924,0.18541866,-41.511695,147.52877)"
    id="g7148-9-1"
-   transform="matrix(0.18541866,0.00293924,-0.00293924,0.18541866,-41.511695,147.52877)"><rect
-     style="opacity:0.96199999;fill:#050404;fill-opacity:0.98430996;stroke-width:2.22673655"
+   style="stroke-width:2.22673655"><rect
+     height="16"
+     width="16"
+     y="1039.4"
+     x="2236.6001"
      id="rect6283-2-8"
-     x="2236.6001"
-     y="1039.4"
-     width="16"
-     height="16" /><path
-     style="fill:none;stroke:#000000;stroke-width:4.45347309;marker-end:url(#Arrow2Send-61-3)"
-     inkscape:connector-curvature="0"
+     style="opacity:0.96199999;fill:#050404;fill-opacity:0.98430996;stroke-width:2.22673655" /><path
+     d="m 2244.7,1037.6 -0.463,-26.932"
      id="path6287-2-7"
-     d="m 2244.7,1037.6 -0.463,-26.932" /><path
-     style="fill:none;stroke:#000000;stroke-width:4.45347309;marker-end:url(#Arrow2Send-3-92-0)"
      inkscape:connector-curvature="0"
+     style="fill:none;stroke:#000000;stroke-width:4.45347309;marker-end:url(#Arrow2Send-61-3)" /><path
+     d="m 2252.3,1037.6 5.448,-26.604"
      id="path6287-4-8-9"
-     d="m 2252.3,1037.6 5.448,-26.604" /><path
-     style="fill:none;stroke:#000000;stroke-width:4.45347309;marker-end:url(#Arrow2Send-9-2-2)"
      inkscape:connector-curvature="0"
+     style="fill:none;stroke:#000000;stroke-width:4.45347309;marker-end:url(#Arrow2Send-3-92-0)" /><path
+     d="m 2237.2,1037.6 -5.0605,-26.275"
      id="path6287-0-9-2"
-     d="m 2237.2,1037.6 -5.0605,-26.275" /></g><text
-   id="text7138-6-3-0"
-   transform="matrix(0.99960326,0.02816588,0.02816588,-0.99960326,0,0)"
-   x="361.65707"
-   y="-323.57126"
-   font-size="17.605px"
-   letter-spacing="0px"
-   word-spacing="0px"
+     inkscape:connector-curvature="0"
+     style="fill:none;stroke:#000000;stroke-width:4.45347309;marker-end:url(#Arrow2Send-9-2-2)" /></g><text
+   xml:space="preserve"
    style="font-size:4.22513294px;line-height:0%;font-family:'Myriad Pro';letter-spacing:0px;word-spacing:0px;fill:#000000;stroke-width:0.4129256px"
-   xml:space="preserve"><tspan
-     id="tspan7140-1-9-2"
-     x="361.65707"
-     y="-323.57126"
+   word-spacing="0px"
+   letter-spacing="0px"
+   font-size="17.605px"
+   y="-323.57126"
+   x="361.65707"
+   transform="matrix(0.99960326,0.02816588,0.02816588,-0.99960326,0,0)"
+   id="text7138-6-3-0"><tspan
+     style="font-size:8.80210018px;line-height:1.25;stroke-width:0.4129256px"
      font-size="36.676px"
-     style="font-size:8.80210018px;line-height:1.25;stroke-width:0.4129256px">speaker</tspan></text>
+     y="-323.57126"
+     x="361.65707"
+     id="tspan7140-1-9-2">speaker</tspan></text>
+
 
 
 
 
 
 </g><g
-     style="stroke-width:1.72055066"
-     transform="matrix(0.58120928,0,0,0.58120928,210.62906,145.83085)"
-     id="g1996-0"><g
-   style="stroke-width:2.22673655"
+   id="g1996-0"
+   transform="matrix(0.58120928,0,0,0.58120928,210.62906,145.83085)"
+   style="stroke-width:1.72055066"><g
+   transform="matrix(0.18541866,0.00293924,-0.00293924,0.18541866,-41.511695,147.52877)"
    id="g7148-9-1-3"
-   transform="matrix(0.18541866,0.00293924,-0.00293924,0.18541866,-41.511695,147.52877)"><rect
-     style="opacity:0.96199999;fill:#050404;fill-opacity:0.98430996;stroke-width:2.22673655"
-     id="rect6283-2-8-6"
-     x="2236.6001"
-     y="1039.4"
+   style="stroke-width:2.22673655"><rect
+     height="16"
      width="16"
-     height="16" /><path
-     style="fill:none;stroke:#000000;stroke-width:4.45347309;marker-end:url(#Arrow2Send-61-3-9)"
-     inkscape:connector-curvature="0"
+     y="1039.4"
+     x="2236.6001"
+     id="rect6283-2-8-6"
+     style="opacity:0.96199999;fill:#050404;fill-opacity:0.98430996;stroke-width:2.22673655" /><path
+     d="m 2244.7,1037.6 -0.463,-26.932"
      id="path6287-2-7-1"
-     d="m 2244.7,1037.6 -0.463,-26.932" /><path
-     style="fill:none;stroke:#000000;stroke-width:4.45347309;marker-end:url(#Arrow2Send-3-92-0-7)"
      inkscape:connector-curvature="0"
+     style="fill:none;stroke:#000000;stroke-width:4.45347309;marker-end:url(#Arrow2Send-61-3-9)" /><path
+     d="m 2252.3,1037.6 5.448,-26.604"
      id="path6287-4-8-9-0"
-     d="m 2252.3,1037.6 5.448,-26.604" /><path
-     style="fill:none;stroke:#000000;stroke-width:4.45347309;marker-end:url(#Arrow2Send-9-2-2-4)"
      inkscape:connector-curvature="0"
+     style="fill:none;stroke:#000000;stroke-width:4.45347309;marker-end:url(#Arrow2Send-3-92-0-7)" /><path
+     d="m 2237.2,1037.6 -5.0605,-26.275"
      id="path6287-0-9-2-6"
-     d="m 2237.2,1037.6 -5.0605,-26.275" /></g><text
-   id="text7138-6-3-0-3"
-   transform="matrix(0.99960326,0.02816588,0.02816588,-0.99960326,0,0)"
-   x="361.65707"
-   y="-323.57126"
-   font-size="17.605px"
-   letter-spacing="0px"
-   word-spacing="0px"
+     inkscape:connector-curvature="0"
+     style="fill:none;stroke:#000000;stroke-width:4.45347309;marker-end:url(#Arrow2Send-9-2-2-4)" /></g><text
+   xml:space="preserve"
    style="font-size:4.22513294px;line-height:0%;font-family:'Myriad Pro';letter-spacing:0px;word-spacing:0px;fill:#000000;stroke-width:0.4129256px"
-   xml:space="preserve"><tspan
-     id="tspan7140-1-9-2-2"
-     x="361.65707"
-     y="-323.57126"
+   word-spacing="0px"
+   letter-spacing="0px"
+   font-size="17.605px"
+   y="-323.57126"
+   x="361.65707"
+   transform="matrix(0.99960326,0.02816588,0.02816588,-0.99960326,0,0)"
+   id="text7138-6-3-0-3"><tspan
+     style="font-size:8.80210018px;line-height:1.25;stroke-width:0.4129256px"
      font-size="36.676px"
-     style="font-size:8.80210018px;line-height:1.25;stroke-width:0.4129256px">speaker</tspan></text>
+     y="-323.57126"
+     x="361.65707"
+     id="tspan7140-1-9-2-2">speaker</tspan></text>
+
 
 
 
 
 
 </g><g
-     style="stroke-width:1.72055066"
-     transform="matrix(0.58120928,0,0,0.58120928,249.67885,144.13304)"
-     id="g1996-4"><g
-   style="stroke-width:2.22673655"
-   id="g7148-9-1-30"
-   transform="matrix(0.18541866,0.00293924,-0.00293924,0.18541866,-41.511695,147.52877)"><rect
-     style="opacity:0.96199999;fill:#050404;fill-opacity:0.98430996;stroke-width:2.22673655"
-     id="rect6283-2-8-7"
-     x="2236.6001"
-     y="1039.4"
-     width="16"
-     height="16" /><path
-     style="fill:none;stroke:#000000;stroke-width:4.45347309;marker-end:url(#Arrow2Send-61-3-5)"
-     inkscape:connector-curvature="0"
-     id="path6287-2-7-8"
-     d="m 2244.7,1037.6 -0.463,-26.932" /><path
-     style="fill:none;stroke:#000000;stroke-width:4.45347309;marker-end:url(#Arrow2Send-3-92-0-5)"
-     inkscape:connector-curvature="0"
-     id="path6287-4-8-9-6"
-     d="m 2252.3,1037.6 5.448,-26.604" /><path
-     style="fill:none;stroke:#000000;stroke-width:4.45347309;marker-end:url(#Arrow2Send-9-2-2-7)"
-     inkscape:connector-curvature="0"
-     id="path6287-0-9-2-8"
-     d="m 2237.2,1037.6 -5.0605,-26.275" /></g><text
-   id="text7138-6-3-0-8"
-   transform="matrix(0.99960326,0.02816588,0.02816588,-0.99960326,0,0)"
-   x="361.65707"
-   y="-323.57126"
-   font-size="17.605px"
-   letter-spacing="0px"
-   word-spacing="0px"
-   style="font-size:4.22513294px;line-height:0%;font-family:'Myriad Pro';letter-spacing:0px;word-spacing:0px;fill:#000000;stroke-width:0.4129256px"
-   xml:space="preserve"><tspan
-     id="tspan7140-1-9-2-4"
-     x="361.65707"
-     y="-323.57126"
-     font-size="36.676px"
-     style="font-size:8.80210018px;line-height:1.25;stroke-width:0.4129256px">speaker</tspan></text>
-
-
-
-
-
-</g></g>
+   id="g1283"><g
+     transform="matrix(0.10776705,0.00170831,-0.00170831,0.10776705,245.05187,228.37813)"
+     id="g7148-9-1-30"
+     style="stroke-width:2.22673655"><rect
+       height="16"
+       width="16"
+       y="1039.4"
+       x="2236.6001"
+       id="rect6283-2-8-7"
+       style="opacity:0.96199999;fill:#050404;fill-opacity:0.98430996;stroke-width:2.22673655" /><path
+       d="m 2244.7,1037.6 -0.463,-26.932"
+       id="path6287-2-7-8"
+       inkscape:connector-curvature="0"
+       style="fill:none;stroke:#000000;stroke-width:4.45347309;marker-end:url(#Arrow2Send-61-3-5)" /><path
+       d="m 2252.3,1037.6 5.448,-26.604"
+       id="path6287-4-8-9-6"
+       inkscape:connector-curvature="0"
+       style="fill:none;stroke:#000000;stroke-width:4.45347309;marker-end:url(#Arrow2Send-3-92-0-5)" /><path
+       d="m 2237.2,1037.6 -5.0605,-26.275"
+       id="path6287-0-9-2-8"
+       inkscape:connector-curvature="0"
+       style="fill:none;stroke:#000000;stroke-width:4.45347309;marker-end:url(#Arrow2Send-9-2-2-7)" /></g><text
+     xml:space="preserve"
+     style="font-size:2.45568657px;line-height:0%;font-family:'Myriad Pro';letter-spacing:0px;word-spacing:0px;fill:#000000;stroke-width:0.23999619px"
+     word-spacing="0px"
+     letter-spacing="0px"
+     font-size="17.605px"
+     y="-322.84622"
+     x="490.78497"
+     transform="matrix(0.99960326,0.02816588,0.02816588,-0.99960326,0,0)"
+     id="text7138-6-3-0-8"><tspan
+       style="font-size:5.11586237px;line-height:1.25;stroke-width:0.23999619px"
+       font-size="36.676px"
+       y="-322.84622"
+       x="490.78497"
+       id="tspan7140-1-9-2-4">speaker</tspan></text>
+</g>
 
 
 
@@ -4043,6 +3874,7 @@
 
 
 
+
 <text
    id="text4757-7"
    transform="matrix(0.99967862,0.03550073,0.03552271,-0.99905999,0,0)"
@@ -4062,6 +3894,7 @@
 
 
 
+
 <path
    sodipodi:nodetypes="csc"
    inkscape:connector-curvature="0"
@@ -4110,6 +3943,7 @@
 
 
 
+
 <path
    d="m 389.52563,352.33063 -0.45523,0.33974 0.46142,0.31804 -0.45524,0.33975 0.46142,0.31805 -0.45522,0.33973 0.46141,0.31805 -0.45525,0.33974 0.46143,0.31803 -0.45525,0.33975 0.46142,0.31803 -0.45524,0.33975 0.46142,0.31804 -0.45523,0.33973 0.46142,0.31804 -0.45525,0.33974 0.46143,0.31805 -0.45524,0.33975 0.46143,0.31804 -0.45525,0.33975 0.46142,0.31804 -0.45523,0.33973 0.46142,0.31806 -0.45524,0.33972 0.46143,0.31807 -0.45524,0.33973 0.46142,0.31805 -0.45524,0.33973 0.46141,0.31807"
    id="path4755-1"
@@ -4137,6 +3971,7 @@
 
 
 
+
 <text
    xml:space="preserve"
    style="font-size:1.76879084px;line-height:0%;font-family:'Myriad Pro';letter-spacing:0px;word-spacing:0px;fill:#000000;stroke-width:0.23999619px"
@@ -4156,6 +3991,7 @@
 
 
 
+
 <text
    xml:space="preserve"
    style="font-size:1.76879084px;line-height:0%;font-family:'Myriad Pro';letter-spacing:0px;word-spacing:0px;fill:#000000;stroke-width:0.23999619px"
@@ -4175,6 +4011,7 @@
 
 
 
+
 <text
    xml:space="preserve"
    style="font-size:1.76879084px;line-height:0%;font-family:'Myriad Pro';letter-spacing:0px;word-spacing:0px;fill:#000000;stroke-width:0.23999619px"
@@ -4194,6 +4031,7 @@
 
 
 
+
 <path
    d="m 401.80125,350.34432 c 0,0 0.65735,2.81414 -0.55031,2.92692 -0.78635,0.0734 -1.52935,0.17368 -1.52935,0.17368"
    id="path4816-2-8-9-9-6"
@@ -4297,6 +4135,7 @@
      y="-361.91162"
      x="600.83752"
      id="tspan1613-4-6">tog bag</tspan></text>
+
 <text
    xml:space="preserve"
    style="font-size:2.37156439px;line-height:0%;font-family:'Myriad Pro';letter-spacing:0px;word-spacing:0px;fill:#000000;stroke-width:0.1612322px"
@@ -4312,9 +4151,259 @@
      y="-391.69778"
      x="652.34192"
      id="tspan1613-4-6-5">tog bag</tspan></text>
+
 <path
-   style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.75000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:0.75000002,0.75000002;stroke-dashoffset:0"
-   d="m 596.87393,337.52912 0.5974,5.0032 h 13.74013 l 13.88947,0.97077 16.50308,0.74674 14.48687,1.12012 15.38296,0.22403"
+   style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.75;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.75000002, 0.75000002;stroke-dashoffset:0;stroke-opacity:1"
+   d="m 758.87393,328.52912 0.5974,5.0032 13.21741,-1.34414 7.39278,-0.5974"
    id="path2363"
    inkscape:connector-curvature="0"
-   sodipodi:nodetypes="ccccccc" /></g></svg>
\ No newline at end of file
+   sodipodi:nodetypes="cccc" /><g
+   id="g1243"
+   transform="translate(-87,9)"><g
+     id="text10848-1-6-9-1-4"
+     style="line-height:0%;font-family:'Myriad Pro';letter-spacing:0px;word-spacing:0px;fill:#000000;stroke-width:1.18568754px"
+     transform="matrix(0.15642418,3.0615329e-4,3.7953519e-4,-0.15493176,696.5026,427.38763)"
+     aria-label="toilets"><path
+       inkscape:connector-curvature="0"
+       id="path975"
+       style="font-size:33.33300018px;line-height:1.25;stroke-width:1.18568754px"
+       d="m -952.11506,595.12545 v 4.63328 h 4.19996 v 2.23332 h -4.19996 v 8.69991 q 0,1.49998 0.46666,2.33331 0.5,0.79999 1.73332,0.79999 0.56666,0 0.99999,-0.0667 0.43333,-0.0667 0.69999,-0.13333 l 0.13334,2.19998 q -0.43333,0.16667 -1.09999,0.26666 -0.63333,0.13334 -1.49999,0.13334 -2.09998,0 -3.16663,-1.23332 -0.63333,-0.66666 -0.9,-1.69999 -0.23333,-1.06665 -0.23333,-2.49997 v -8.79991 h -2.49997 v -2.23332 h 2.49997 v -3.86662 z" /><path
+       inkscape:connector-curvature="0"
+       id="path977"
+       style="font-size:33.33300018px;line-height:1.25;stroke-width:1.18568754px"
+       d="m -938.00791,599.39207 q 1.73332,0 3.16664,0.6 1.43332,0.59999 2.43331,1.69998 1.03332,1.09999 1.59998,2.63331 0.56666,1.53331 0.56666,3.36663 0,2.23331 -0.69999,3.86663 -0.69999,1.59998 -1.86665,2.66664 -1.13332,1.03332 -2.56664,1.53331 -1.43332,0.5 -2.89997,0.5 -1.63332,0 -3.06664,-0.56666 -1.39998,-0.6 -2.43331,-1.66665 -1.03332,-1.06666 -1.63331,-2.59998 -0.6,-1.56665 -0.6,-3.46663 0,-2.03331 0.6,-3.59996 0.63332,-1.59999 1.69998,-2.69997 1.09999,-1.09999 2.56664,-1.66665 1.46665,-0.6 3.1333,-0.6 z m -0.0667,2.19998 q -1.29999,0 -2.23331,0.56666 -0.93333,0.53333 -1.56666,1.43332 -0.59999,0.86666 -0.89999,1.99998 -0.26666,1.13332 -0.26666,2.26664 0,1.33332 0.36666,2.46665 0.36667,1.13332 0.99999,1.96664 0.66666,0.83333 1.56665,1.29999 0.89999,0.46666 1.96665,0.46666 1.03332,0 1.93331,-0.46666 0.9,-0.46666 1.56666,-1.29999 0.66666,-0.83332 1.03332,-1.96664 0.36666,-1.16666 0.36666,-2.53331 0,-1.03333 -0.26666,-2.13331 -0.26667,-1.09999 -0.86666,-1.99998 -0.56666,-0.9 -1.49999,-1.46666 -0.89999,-0.59999 -2.19997,-0.59999 z" /><path
+       inkscape:connector-curvature="0"
+       id="path979"
+       style="font-size:33.33300018px;line-height:1.25;stroke-width:1.18568754px"
+       d="m -926.54708,615.89191 v -16.13318 h 2.9333 v 16.13318 z m 1.46665,-22.49978 q 0.83332,0 1.29999,0.53333 0.49999,0.53333 0.49999,1.29999 0.0333,0.76666 -0.49999,1.29998 -0.5,0.5 -1.36666,0.5 -0.76666,0 -1.26665,-0.5 -0.5,-0.53332 -0.5,-1.29998 0,-0.76666 0.5,-1.29999 0.53333,-0.53333 1.33332,-0.53333 z" /><path
+       inkscape:connector-curvature="0"
+       id="path981"
+       style="font-size:33.33300018px;line-height:1.25;stroke-width:1.18568754px"
+       d="m -918.73466,592.22548 h 2.9333 v 23.66643 h -2.9333 z" /><path
+       inkscape:connector-curvature="0"
+       id="path983"
+       style="font-size:33.33300018px;line-height:1.25;stroke-width:1.18568754px"
+       d="m -909.22382,608.35865 q 0.0333,1.49998 0.46666,2.56664 0.46666,1.03332 1.19999,1.73332 0.76666,0.66666 1.76665,0.99999 0.99999,0.29999 2.09998,0.29999 1.59998,0 2.59997,-0.23333 1.03332,-0.23333 1.86665,-0.59999 l 0.49999,2.09998 q -0.76666,0.36666 -2.09998,0.66666 -1.33332,0.33333 -3.26663,0.33333 -1.86665,0 -3.3333,-0.56666 -1.46665,-0.6 -2.49997,-1.66665 -1.03333,-1.06666 -1.56666,-2.56665 -0.53332,-1.49998 -0.53332,-3.3333 0,-1.83331 0.49999,-3.39996 0.53333,-1.59999 1.49999,-2.76664 0.99999,-1.16666 2.39997,-1.83332 1.39999,-0.69999 3.16664,-0.69999 1.96664,0 3.26663,0.76666 1.29999,0.76666 2.03331,1.93331 0.76666,1.13333 1.06666,2.46665 0.3,1.33332 0.3,2.43331 0,0.46666 -0.0333,0.79999 -0.0333,0.33333 -0.0667,0.56666 z m 8.59991,-2.09998 q 0,-0.69999 -0.16666,-1.53332 -0.16667,-0.83332 -0.63333,-1.53332 -0.43333,-0.73332 -1.23332,-1.19998 -0.79999,-0.5 -2.03331,-0.5 -1.09999,0 -1.93332,0.46666 -0.79999,0.46666 -1.36665,1.16666 -0.53333,0.69999 -0.83333,1.53332 -0.26666,0.83332 -0.36666,1.59998 z" /><path
+       inkscape:connector-curvature="0"
+       id="path985"
+       style="font-size:33.33300018px;line-height:1.25;stroke-width:1.18568754px"
+       d="m -890.59223,595.12545 v 4.63328 h 4.19995 v 2.23332 h -4.19995 v 8.69991 q 0,1.49998 0.46666,2.33331 0.49999,0.79999 1.73331,0.79999 0.56666,0 0.99999,-0.0667 0.43333,-0.0667 0.7,-0.13333 l 0.13333,2.19998 q -0.43333,0.16667 -1.09999,0.26666 -0.63333,0.13334 -1.49999,0.13334 -2.09997,0 -3.16663,-1.23332 -0.63333,-0.66666 -0.89999,-1.69999 -0.23333,-1.06665 -0.23333,-2.49997 v -8.79991 h -2.49998 v -2.23332 h 2.49998 v -3.86662 z" /><path
+       inkscape:connector-curvature="0"
+       id="path987"
+       style="font-size:33.33300018px;line-height:1.25;stroke-width:1.18568754px"
+       d="m -883.52304,612.89194 q 0.66666,0.43333 1.69999,0.79999 1.06665,0.36666 2.16664,0.36666 1.59998,0 2.36664,-0.69999 0.76666,-0.69999 0.76666,-1.69998 0,-1.06666 -0.69999,-1.69999 -0.66666,-0.66666 -2.29998,-1.26665 -2.19998,-0.76666 -3.2333,-1.93332 -1.03332,-1.16665 -1.03332,-2.6333 0,-0.96666 0.36666,-1.83332 0.4,-0.86666 1.09999,-1.49998 0.73333,-0.66666 1.76665,-1.03333 1.03332,-0.36666 2.33331,-0.36666 1.23332,0 2.26664,0.3 1.03333,0.3 1.69999,0.69999 l -0.73333,2.13331 q -0.46666,-0.29999 -1.33332,-0.59999 -0.83332,-0.33333 -1.96665,-0.33333 -1.29998,0 -1.99998,0.66666 -0.69999,0.63333 -0.69999,1.53332 0,0.99999 0.73333,1.56665 0.73332,0.56666 2.33331,1.16665 2.09998,0.8 3.16663,1.93332 1.06666,1.13332 1.06666,2.9333 0,2.13331 -1.56665,3.49997 -1.56665,1.33332 -4.46663,1.33332 -1.33332,0 -2.49997,-0.3 -1.16666,-0.3 -2.03331,-0.79999 z" /></g><path
+     style="fill:none;stroke:#000000;stroke-width:0.48000059;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+     inkscape:connector-curvature="0"
+     id="path9533-0-7-3"
+     d="m 555.47022,335.92639 1.72426,-0.008 0.0108,1.69476 -1.72425,0.008 z" /><path
+     style="fill:none;stroke:#000000;stroke-width:0.48000059;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+     inkscape:connector-curvature="0"
+     id="path9537-6-6-3"
+     d="m 557.19502,335.91789 1.62284,-0.008 0.0108,1.69476 -1.62284,0.008 z" /><path
+     style="fill:none;stroke:#000000;stroke-width:0.48000059;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+     inkscape:connector-curvature="0"
+     id="path9541-2-7-9"
+     d="m 558.81776,335.91078 1.72426,-0.008 0.0108,1.69476 -1.72425,0.008 z" /><path
+     style="fill:none;stroke:#000000;stroke-width:0.48000059;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+     inkscape:connector-curvature="0"
+     id="path9545-6-3-2"
+     d="m 560.54121,335.90234 1.72425,-0.008 0.0108,1.69476 -1.72426,0.008 z" /><path
+     style="fill:none;stroke:#000000;stroke-width:0.48000059;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+     inkscape:connector-curvature="0"
+     id="path9549-1-6-4"
+     d="m 562.26601,335.89384 1.72426,-0.008 0.0108,1.69477 -1.72426,0.008 z" /><path
+     style="fill:none;stroke:#000000;stroke-width:0.48000059;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+     inkscape:connector-curvature="0"
+     id="path13395-3-4-3"
+     d="m 553.74678,335.93483 1.72426,-0.008 0.0108,1.69477 -1.72426,0.008 z" /><path
+     style="fill:none;stroke:#000000;stroke-width:0.48000059;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+     inkscape:connector-curvature="0"
+     id="path13403-1-8-8"
+     d="m 552.02198,335.94333 1.72426,-0.008 0.0108,1.69476 -1.72426,0.008 z" /><path
+     style="fill:none;stroke:#000000;stroke-width:0.48000059;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+     inkscape:connector-curvature="0"
+     id="path13411-9-1-3"
+     d="m 550.3993,335.95177 1.62283,-0.008 0.0108,1.69476 -1.62284,0.008 z" /><path
+     style="fill:none;stroke:#000000;stroke-width:0.48000059;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+     inkscape:connector-curvature="0"
+     id="path13411-9-7-2-2"
+     d="m 548.74382,335.95751 1.62284,-0.008 0.0108,1.69476 -1.62284,0.008 z" /><path
+     style="fill:none;stroke:#000000;stroke-width:0.48000059;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+     inkscape:connector-curvature="0"
+     id="path13411-9-7-5-9-9"
+     d="m 547.11417,335.96221 1.62284,-0.008 0.0108,1.69476 -1.62284,0.008 z" /><text
+     transform="scale(1,-1)"
+     id="text1145"
+     y="-332.9418"
+     x="560.90881"
+     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.25632381px;line-height:125%;font-family:Sans;-inkscape-font-specification:'Sans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.17444593px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Myriad Pro';-inkscape-font-specification:'Myriad Pro';stroke-width:0.17444593px"
+       y="-332.9418"
+       x="560.90881"
+       id="tspan1143"
+       sodipodi:role="line">10</tspan></text>
+</g><text
+   xml:space="preserve"
+   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.25632381px;line-height:125%;font-family:Sans;-inkscape-font-specification:'Sans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.17444593px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+   x="656.53552"
+   y="-357.08099"
+   id="text1145-9"
+   transform="scale(1,-1)"><tspan
+     sodipodi:role="line"
+     id="tspan1143-5"
+     x="656.53552"
+     y="-357.08099"
+     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Myriad Pro';-inkscape-font-specification:'Myriad Pro';stroke-width:0.17444593px">40</tspan></text>
+<g
+   id="g1364"><text
+     id="text10848-1-6-9-1-3"
+     transform="matrix(1.0048024,0.0019666,0.00243797,-0.99521575,0,0)"
+     x="687.67389"
+     y="-318.50174"
+     style="font-size:2.42905855px;line-height:0%;font-family:'Myriad Pro';letter-spacing:0px;word-spacing:0px;fill:#000000;stroke-width:0.24000871px"
+     xml:space="preserve"><tspan
+       id="tspan10850-74-1-3-1-9"
+       x="687.67389"
+       y="-318.50174"
+       font-size="33.333px"
+       style="font-size:6.74731779px;line-height:1.25;stroke-width:0.24000871px">toilets</tspan></text>
+<path
+     style="fill:none;stroke:#000000;stroke-width:0.48000059;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+     inkscape:connector-curvature="0"
+     id="path9533-0-7-5"
+     d="m 712.98637,312.41501 0.79034,1.53248 -1.50514,0.77904 -0.79034,-1.53249 z" /><path
+     style="fill:none;stroke:#000000;stroke-width:0.48000059;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+     inkscape:connector-curvature="0"
+     id="path9537-6-6-7"
+     d="m 713.77698,313.94796 0.74386,1.44235 -1.50514,0.77903 -0.74386,-1.44235 z" /><path
+     style="fill:none;stroke:#000000;stroke-width:0.48000059;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+     inkscape:connector-curvature="0"
+     id="path9541-2-7-3"
+     d="m 714.52003,315.39061 0.79033,1.53248 -1.50514,0.77903 -0.79034,-1.53248 z" /><path
+     style="fill:none;stroke:#000000;stroke-width:0.48000059;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+     inkscape:connector-curvature="0"
+     id="path9545-6-3-9"
+     d="m 715.30997,316.92237 0.79035,1.53249 -1.50515,0.77903 -0.79034,-1.53248 z" /><path
+     style="fill:none;stroke:#000000;stroke-width:0.48000059;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+     inkscape:connector-curvature="0"
+     id="path9549-1-6-0"
+     d="m 716.10059,318.45533 0.79034,1.53248 -1.50514,0.77903 -0.79034,-1.53248 z" /><path
+     style="fill:none;stroke:#000000;stroke-width:0.48000059;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+     inkscape:connector-curvature="0"
+     id="path9553-8-5-7"
+     d="m 716.8912,319.98828 0.74386,1.44234 -1.50514,0.77903 -0.74385,-1.44234 z" /><path
+     style="fill:none;stroke:#000000;stroke-width:0.48000059;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+     inkscape:connector-curvature="0"
+     id="path9557-7-6-2"
+     d="m 717.63541,321.43027 0.79034,1.53248 -1.50514,0.77903 -0.79034,-1.53248 z" /><path
+     style="fill:none;stroke:#000000;stroke-width:0.48000059;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+     inkscape:connector-curvature="0"
+     id="path9561-9-3-7"
+     d="m 718.42536,322.96203 0.79034,1.53248 -1.50514,0.77903 -0.79034,-1.53248 z" /><path
+     style="fill:none;stroke:#000000;stroke-width:0.48000059;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+     inkscape:connector-curvature="0"
+     id="path9565-2-9-2"
+     d="m 719.21597,324.49498 0.79035,1.53248 -1.50514,0.77904 -0.79035,-1.53248 z" /><path
+     style="fill:none;stroke:#000000;stroke-width:0.48000059;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+     inkscape:connector-curvature="0"
+     id="path13395-3-4-90"
+     d="m 712.19642,310.88325 0.79034,1.53248 -1.50514,0.77903 -0.79034,-1.53248 z" /><text
+     transform="scale(1,-1)"
+     id="text1145-6-3"
+     y="-318.75992"
+     x="708.67194"
+     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.25632381px;line-height:125%;font-family:Sans;-inkscape-font-specification:'Sans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.17444593px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Myriad Pro';-inkscape-font-specification:'Myriad Pro';stroke-width:0.17444593px"
+       y="-318.75992"
+       x="708.67194"
+       id="tspan1143-1-7"
+       sodipodi:role="line">10</tspan></text>
+</g><g
+   id="g1243-2"
+   transform="translate(113.91302,1.4869806)"><g
+     id="text10848-1-6-9-1-4-73"
+     style="line-height:0%;font-family:'Myriad Pro';letter-spacing:0px;word-spacing:0px;fill:#000000;stroke-width:1.18568754px"
+     transform="matrix(0.15642418,3.0615329e-4,3.7953519e-4,-0.15493176,696.5026,427.38763)"
+     aria-label="toilets"><path
+       inkscape:connector-curvature="0"
+       id="path975-3"
+       style="font-size:33.33300018px;line-height:1.25;stroke-width:1.18568754px"
+       d="m -952.11506,595.12545 v 4.63328 h 4.19996 v 2.23332 h -4.19996 v 8.69991 q 0,1.49998 0.46666,2.33331 0.5,0.79999 1.73332,0.79999 0.56666,0 0.99999,-0.0667 0.43333,-0.0667 0.69999,-0.13333 l 0.13334,2.19998 q -0.43333,0.16667 -1.09999,0.26666 -0.63333,0.13334 -1.49999,0.13334 -2.09998,0 -3.16663,-1.23332 -0.63333,-0.66666 -0.9,-1.69999 -0.23333,-1.06665 -0.23333,-2.49997 v -8.79991 h -2.49997 v -2.23332 h 2.49997 v -3.86662 z" /><path
+       inkscape:connector-curvature="0"
+       id="path977-9"
+       style="font-size:33.33300018px;line-height:1.25;stroke-width:1.18568754px"
+       d="m -938.00791,599.39207 q 1.73332,0 3.16664,0.6 1.43332,0.59999 2.43331,1.69998 1.03332,1.09999 1.59998,2.63331 0.56666,1.53331 0.56666,3.36663 0,2.23331 -0.69999,3.86663 -0.69999,1.59998 -1.86665,2.66664 -1.13332,1.03332 -2.56664,1.53331 -1.43332,0.5 -2.89997,0.5 -1.63332,0 -3.06664,-0.56666 -1.39998,-0.6 -2.43331,-1.66665 -1.03332,-1.06666 -1.63331,-2.59998 -0.6,-1.56665 -0.6,-3.46663 0,-2.03331 0.6,-3.59996 0.63332,-1.59999 1.69998,-2.69997 1.09999,-1.09999 2.56664,-1.66665 1.46665,-0.6 3.1333,-0.6 z m -0.0667,2.19998 q -1.29999,0 -2.23331,0.56666 -0.93333,0.53333 -1.56666,1.43332 -0.59999,0.86666 -0.89999,1.99998 -0.26666,1.13332 -0.26666,2.26664 0,1.33332 0.36666,2.46665 0.36667,1.13332 0.99999,1.96664 0.66666,0.83333 1.56665,1.29999 0.89999,0.46666 1.96665,0.46666 1.03332,0 1.93331,-0.46666 0.9,-0.46666 1.56666,-1.29999 0.66666,-0.83332 1.03332,-1.96664 0.36666,-1.16666 0.36666,-2.53331 0,-1.03333 -0.26666,-2.13331 -0.26667,-1.09999 -0.86666,-1.99998 -0.56666,-0.9 -1.49999,-1.46666 -0.89999,-0.59999 -2.19997,-0.59999 z" /><path
+       inkscape:connector-curvature="0"
+       id="path979-2"
+       style="font-size:33.33300018px;line-height:1.25;stroke-width:1.18568754px"
+       d="m -926.54708,615.89191 v -16.13318 h 2.9333 v 16.13318 z m 1.46665,-22.49978 q 0.83332,0 1.29999,0.53333 0.49999,0.53333 0.49999,1.29999 0.0333,0.76666 -0.49999,1.29998 -0.5,0.5 -1.36666,0.5 -0.76666,0 -1.26665,-0.5 -0.5,-0.53332 -0.5,-1.29998 0,-0.76666 0.5,-1.29999 0.53333,-0.53333 1.33332,-0.53333 z" /><path
+       inkscape:connector-curvature="0"
+       id="path981-4"
+       style="font-size:33.33300018px;line-height:1.25;stroke-width:1.18568754px"
+       d="m -918.73466,592.22548 h 2.9333 v 23.66643 h -2.9333 z" /><path
+       inkscape:connector-curvature="0"
+       id="path983-4"
+       style="font-size:33.33300018px;line-height:1.25;stroke-width:1.18568754px"
+       d="m -909.22382,608.35865 q 0.0333,1.49998 0.46666,2.56664 0.46666,1.03332 1.19999,1.73332 0.76666,0.66666 1.76665,0.99999 0.99999,0.29999 2.09998,0.29999 1.59998,0 2.59997,-0.23333 1.03332,-0.23333 1.86665,-0.59999 l 0.49999,2.09998 q -0.76666,0.36666 -2.09998,0.66666 -1.33332,0.33333 -3.26663,0.33333 -1.86665,0 -3.3333,-0.56666 -1.46665,-0.6 -2.49997,-1.66665 -1.03333,-1.06666 -1.56666,-2.56665 -0.53332,-1.49998 -0.53332,-3.3333 0,-1.83331 0.49999,-3.39996 0.53333,-1.59999 1.49999,-2.76664 0.99999,-1.16666 2.39997,-1.83332 1.39999,-0.69999 3.16664,-0.69999 1.96664,0 3.26663,0.76666 1.29999,0.76666 2.03331,1.93331 0.76666,1.13333 1.06666,2.46665 0.3,1.33332 0.3,2.43331 0,0.46666 -0.0333,0.79999 -0.0333,0.33333 -0.0667,0.56666 z m 8.59991,-2.09998 q 0,-0.69999 -0.16666,-1.53332 -0.16667,-0.83332 -0.63333,-1.53332 -0.43333,-0.73332 -1.23332,-1.19998 -0.79999,-0.5 -2.03331,-0.5 -1.09999,0 -1.93332,0.46666 -0.79999,0.46666 -1.36665,1.16666 -0.53333,0.69999 -0.83333,1.53332 -0.26666,0.83332 -0.36666,1.59998 z" /><path
+       inkscape:connector-curvature="0"
+       id="path985-4"
+       style="font-size:33.33300018px;line-height:1.25;stroke-width:1.18568754px"
+       d="m -890.59223,595.12545 v 4.63328 h 4.19995 v 2.23332 h -4.19995 v 8.69991 q 0,1.49998 0.46666,2.33331 0.49999,0.79999 1.73331,0.79999 0.56666,0 0.99999,-0.0667 0.43333,-0.0667 0.7,-0.13333 l 0.13333,2.19998 q -0.43333,0.16667 -1.09999,0.26666 -0.63333,0.13334 -1.49999,0.13334 -2.09997,0 -3.16663,-1.23332 -0.63333,-0.66666 -0.89999,-1.69999 -0.23333,-1.06665 -0.23333,-2.49997 v -8.79991 h -2.49998 v -2.23332 h 2.49998 v -3.86662 z" /><path
+       inkscape:connector-curvature="0"
+       id="path987-9"
+       style="font-size:33.33300018px;line-height:1.25;stroke-width:1.18568754px"
+       d="m -883.52304,612.89194 q 0.66666,0.43333 1.69999,0.79999 1.06665,0.36666 2.16664,0.36666 1.59998,0 2.36664,-0.69999 0.76666,-0.69999 0.76666,-1.69998 0,-1.06666 -0.69999,-1.69999 -0.66666,-0.66666 -2.29998,-1.26665 -2.19998,-0.76666 -3.2333,-1.93332 -1.03332,-1.16665 -1.03332,-2.6333 0,-0.96666 0.36666,-1.83332 0.4,-0.86666 1.09999,-1.49998 0.73333,-0.66666 1.76665,-1.03333 1.03332,-0.36666 2.33331,-0.36666 1.23332,0 2.26664,0.3 1.03333,0.3 1.69999,0.69999 l -0.73333,2.13331 q -0.46666,-0.29999 -1.33332,-0.59999 -0.83332,-0.33333 -1.96665,-0.33333 -1.29998,0 -1.99998,0.66666 -0.69999,0.63333 -0.69999,1.53332 0,0.99999 0.73333,1.56665 0.73332,0.56666 2.33331,1.16665 2.09998,0.8 3.16663,1.93332 1.06666,1.13332 1.06666,2.9333 0,2.13331 -1.56665,3.49997 -1.56665,1.33332 -4.46663,1.33332 -1.33332,0 -2.49997,-0.3 -1.16666,-0.3 -2.03331,-0.79999 z" /></g><path
+     style="fill:none;stroke:#000000;stroke-width:0.48000059;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+     inkscape:connector-curvature="0"
+     id="path9533-0-7-3-93"
+     d="m 555.47022,335.92639 1.72426,-0.008 0.0108,1.69476 -1.72425,0.008 z" /><path
+     style="fill:none;stroke:#000000;stroke-width:0.48000059;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+     inkscape:connector-curvature="0"
+     id="path9537-6-6-3-8"
+     d="m 557.19502,335.91789 1.62284,-0.008 0.0108,1.69476 -1.62284,0.008 z" /><path
+     style="fill:none;stroke:#000000;stroke-width:0.48000059;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+     inkscape:connector-curvature="0"
+     id="path9541-2-7-9-3"
+     d="m 558.81776,335.91078 1.72426,-0.008 0.0108,1.69476 -1.72425,0.008 z" /><path
+     style="fill:none;stroke:#000000;stroke-width:0.48000059;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+     inkscape:connector-curvature="0"
+     id="path9545-6-3-2-2"
+     d="m 560.54121,335.90234 1.72425,-0.008 0.0108,1.69476 -1.72426,0.008 z" /><path
+     style="fill:none;stroke:#000000;stroke-width:0.48000059;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+     inkscape:connector-curvature="0"
+     id="path9549-1-6-4-9"
+     d="m 562.26601,335.89384 1.72426,-0.008 0.0108,1.69477 -1.72426,0.008 z" /><path
+     style="fill:none;stroke:#000000;stroke-width:0.48000059;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+     inkscape:connector-curvature="0"
+     id="path13395-3-4-3-5"
+     d="m 553.74678,335.93483 1.72426,-0.008 0.0108,1.69477 -1.72426,0.008 z" /><path
+     style="fill:none;stroke:#000000;stroke-width:0.48000059;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+     inkscape:connector-curvature="0"
+     id="path13403-1-8-8-4"
+     d="m 552.02198,335.94333 1.72426,-0.008 0.0108,1.69476 -1.72426,0.008 z" /><path
+     style="fill:none;stroke:#000000;stroke-width:0.48000059;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+     inkscape:connector-curvature="0"
+     id="path13411-9-1-3-3"
+     d="m 550.3993,335.95177 1.62283,-0.008 0.0108,1.69476 -1.62284,0.008 z" /><path
+     style="fill:none;stroke:#000000;stroke-width:0.48000059;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+     inkscape:connector-curvature="0"
+     id="path13411-9-7-2-2-9"
+     d="m 548.74382,335.95751 1.62284,-0.008 0.0108,1.69476 -1.62284,0.008 z" /><path
+     style="fill:none;stroke:#000000;stroke-width:0.48000059;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+     inkscape:connector-curvature="0"
+     id="path13411-9-7-5-9-9-49"
+     d="m 547.11417,335.96221 1.62284,-0.008 0.0108,1.69476 -1.62284,0.008 z" /><text
+     transform="scale(1,-1)"
+     id="text1145-5"
+     y="-332.9418"
+     x="560.90881"
+     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.25632381px;line-height:125%;font-family:Sans;-inkscape-font-specification:'Sans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.17444593px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Myriad Pro';-inkscape-font-specification:'Myriad Pro';stroke-width:0.17444593px"
+       y="-332.9418"
+       x="560.90881"
+       id="tspan1143-57"
+       sodipodi:role="line">20</tspan></text>
+</g></g></svg>
\ No newline at end of file