diff --git a/Logic/Osm/Overpass.ts b/Logic/Osm/Overpass.ts
index d0aa14343c..3a883ce6a7 100644
--- a/Logic/Osm/Overpass.ts
+++ b/Logic/Osm/Overpass.ts
@@ -37,11 +37,12 @@ export class Overpass {
         }
         Utils.downloadJson(query)
             .then(json => {
-                if (json.elements === [] && json.remarks.indexOf("runtime error") > 0) {
+                if (json.elements === [] && (json.remarks.indexOf("runtime error") > 0)) {
                     console.log("Timeout or other runtime error");
                     onFail("Runtime error (timeout)")
                     return;
                 }
+                
 
                 ExtractRelations.RegisterRelations(json)
                 // @ts-ignore
diff --git a/assets/themes/cycle_highways/cycle_highways.json b/assets/themes/cycle_highways/cycle_highways.json
index 5b9ca7e192..4ea4e2f630 100644
--- a/assets/themes/cycle_highways/cycle_highways.json
+++ b/assets/themes/cycle_highways/cycle_highways.json
@@ -14,13 +14,14 @@
   "language": [
     "en"
   ],
-  "version": "2021-05-22",
+  "version": "2021-08-23",
   "startLat": 51.1599,
   "startLon": 3.3475,
-  "startZoom": 8,
+  "startZoom": 10,
   "clustering": {
     "maxZoom": 1
   },
+  "widenFactor": 0.005,
   "enableDownload": true,
   "enablePdfDownload": true,
   "layers": [
diff --git a/assets/themes/cycle_highways/fietssnelwegen-logo.svg b/assets/themes/cycle_highways/fietssnelwegen-logo.svg
index c4d6c96658..0cffc1071c 100644
--- a/assets/themes/cycle_highways/fietssnelwegen-logo.svg
+++ b/assets/themes/cycle_highways/fietssnelwegen-logo.svg
@@ -1,64 +1,65 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 22.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg preserveAspectRatio="none" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="165px" height="155px" viewBox="0 0 165 155" style="enable-background:new 0 0 165 155;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#1582DE;}
-	.st1{fill:#FFFFFF;}
-</style>
-<path id="Polygon_2_copy_19" class="st0" d="M81.8,0c-6.4,0-12,3.1-14.8,6.9C56.6,21.2,47,36,38.3,51.4
-	c-14.1,24.8-23.5,43.4-26.9,52.8c-1.8,5.3-1.2,11.1,1.7,15.8c2.7,4.9,7.5,8.2,13,9c11.7,1.3,28,2.9,55.4,2.8c0.1,0-0.1,0,0,0
-	c27.4,0.2,44-1.4,55.7-2.7c5.5-0.8,10.4-4.1,13.1-9c2.9-4.8,3.5-10.6,1.7-15.9c-3.4-9.4-12.8-28-26.9-52.8
-	c-8.7-15.4-18.3-30.3-28.8-44.6C93.6,3.1,87.9,0,81.5,0"/>
-<path id="F" class="st1" d="M65.8,105.3c0,4.7,3,7.3,7,7.3s7-2.6,7-7.3V85h14.4c3.5,0.2,6.5-2.5,6.7-6c0-0.2,0-0.4,0-0.5
-	c0.1-3.4-2.7-6.3-6.1-6.3c-0.2,0-0.4,0-0.5,0H79.7V58.6h17.1c4.2,0,6.2-3.3,6.2-6.4c0-3.3-2.1-6.4-6.2-6.4H73
-	c-3.8-0.1-7.1,2.9-7.2,6.7c0,0.2,0,0.4,0,0.6L65.8,105.3L65.8,105.3z"/>
-<path id="Fietssnelwegen.be" class="st1" d="M0,153.4c-0.1,0.7,0.5,1.4,1.2,1.4c0.1,0,0.1,0,0.2,0c0.7,0,1.4-0.5,1.4-1.3
-	c0-0.1,0-0.1,0-0.2v-4.1h2.9c0.7,0,1.3-0.5,1.3-1.2c0,0,0-0.1,0-0.1c0-0.7-0.5-1.3-1.2-1.3c0,0-0.1,0-0.1,0H2.8v-2.7h3.4
-	c0.7,0,1.3-0.6,1.2-1.3c0-0.7-0.6-1.2-1.2-1.2H1.5c-0.8,0-1.4,0.6-1.4,1.3c0,0,0,0.1,0,0.1L0,153.4L0,153.4z M8.5,153.4
-	c-0.1,0.7,0.5,1.4,1.2,1.4c0.1,0,0.1,0,0.2,0c0.7,0,1.4-0.5,1.4-1.3c0-0.1,0-0.1,0-0.2v-10.6c0.1-0.7-0.5-1.4-1.2-1.4
-	c-0.1,0-0.1,0-0.2,0c-0.7,0-1.4,0.5-1.4,1.3c0,0.1,0,0.1,0,0.2V153.4z M13.2,153.3c0,0.7,0.6,1.4,1.3,1.4c0,0,0.1,0,0.1,0h4.8
-	c0.7,0,1.3-0.5,1.3-1.2c0,0,0-0.1,0-0.1c0-0.7-0.5-1.3-1.2-1.3c0,0-0.1,0-0.1,0H16v-2.8h3c0.7,0,1.3-0.5,1.3-1.2c0,0,0-0.1,0-0.1
-	c0-0.7-0.5-1.3-1.2-1.3c0,0-0.1,0-0.1,0h-3v-2.7h3.3c0.7,0,1.3-0.5,1.3-1.2c0,0,0-0.1,0-0.1c0-0.7-0.5-1.3-1.2-1.3c0,0-0.1,0-0.1,0
-	h-4.6c-0.8,0-1.4,0.6-1.5,1.4c0,0.1,0,0.2,0,0.2L13.2,153.3L13.2,153.3z M24.3,153.4c0,0.8,0.5,1.4,1.3,1.5c0.8,0,1.4-0.5,1.5-1.3
-	c0,0,0-0.1,0-0.1v-9.3h2c0.7,0,1.2-0.5,1.3-1.1c0,0,0-0.1,0-0.1c0-0.7-0.5-1.3-1.2-1.3c0,0,0,0-0.1,0h-6.8c-0.7,0-1.2,0.5-1.3,1.2
-	c0,0,0,0,0,0.1c0,0.7,0.5,1.2,1.1,1.3c0,0,0.1,0,0.1,0h2L24.3,153.4L24.3,153.4z M35.4,141.3c-2.4-0.2-4.4,1.6-4.6,4
-	c0,0.1,0,0.2,0,0.2c0,4.3,6.2,3,6.2,5.2c0,0.9-0.8,1.6-1.7,1.6c-0.1,0-0.1,0-0.2,0c-1.2,0-2.2-0.7-3.1-0.7c-0.7,0-1.2,0.6-1.2,1.2
-	c0,0,0,0.1,0,0.1c0,1.7,3.1,2.1,4.5,2.1c2.6,0,4.7-1.7,4.7-4.3c0-4.8-6.2-3.6-6.2-5.5c0.1-0.7,0.7-1.3,1.5-1.2c0,0,0,0,0.1,0
-	c1.1,0,1.7,0.6,2.5,0.6c0.7,0,1.3-0.6,1.2-1.3c0,0,0,0,0,0C39,141.7,36.4,141.3,35.4,141.3L35.4,141.3z M45.6,141.3
-	c-2.4-0.2-4.4,1.6-4.6,4c0,0.1,0,0.2,0,0.2c0,4.3,6.2,3,6.2,5.2c0,0.9-0.8,1.6-1.7,1.6c-0.1,0-0.1,0-0.2,0c-1.2,0-2.2-0.7-3.1-0.7
-	c-0.7,0-1.2,0.6-1.2,1.2c0,0,0,0.1,0,0.1c0,1.7,3.1,2.1,4.5,2.1c2.6,0,4.7-1.7,4.7-4.3c0-4.8-6.2-3.6-6.2-5.5
-	c0.1-0.7,0.7-1.3,1.5-1.2c0,0,0,0,0.1,0c1.1,0,1.7,0.6,2.5,0.6c0.7,0,1.3-0.6,1.2-1.3c0,0,0,0,0,0C49.2,141.7,46.7,141.3,45.6,141.3
-	L45.6,141.3z M51.6,153.4c0,0.8,0.5,1.4,1.3,1.5c0.8,0,1.4-0.5,1.5-1.3c0,0,0-0.1,0-0.1v-6.9h0l5.9,7.8c0.3,0.3,0.7,0.6,1.2,0.6
-	c0.7,0,1.4-0.5,1.4-1.3c0-0.1,0-0.1,0-0.2v-10.6c0-0.8-0.5-1.4-1.3-1.5c-0.8,0-1.4,0.5-1.5,1.3c0,0,0,0.1,0,0.1v7h0l-5.9-7.9
-	c-0.3-0.4-0.7-0.6-1.2-0.6c-0.7,0-1.4,0.5-1.4,1.3c0,0.1,0,0.1,0,0.2L51.6,153.4L51.6,153.4z M64.6,153.3c0,0.7,0.6,1.4,1.3,1.4
-	c0,0,0.1,0,0.1,0h4.8c0.7,0,1.3-0.5,1.3-1.2c0,0,0-0.1,0-0.1c0-0.7-0.5-1.3-1.2-1.3c0,0-0.1,0-0.1,0h-3.4v-2.8h3
-	c0.7,0,1.3-0.5,1.3-1.2c0,0,0-0.1,0-0.1c0-0.7-0.5-1.3-1.2-1.3c0,0-0.1,0-0.1,0h-3v-2.7h3.3c0.7,0,1.3-0.5,1.3-1.2c0,0,0-0.1,0-0.1
-	c0-0.7-0.5-1.3-1.2-1.3c0,0-0.1,0-0.1,0h-4.6c-0.8,0-1.4,0.6-1.5,1.4c0,0.1,0,0.2,0,0.2L64.6,153.3L64.6,153.3z M73.5,153.2
-	c-0.1,0.8,0.5,1.4,1.2,1.5c0.1,0,0.2,0,0.2,0h4.6c0.7,0,1.3-0.5,1.3-1.2c0-0.7-0.5-1.3-1.2-1.3c-0.1,0-0.1,0-0.2,0h-3.3v-9.3
-	c0-0.8-0.6-1.4-1.3-1.5c-0.8,0-1.4,0.6-1.5,1.3c0,0,0,0.1,0,0.1L73.5,153.2L73.5,153.2z M82,153.4c0.2,0.9,0.9,1.5,1.8,1.4
-	c0.8,0,1.6-0.5,1.8-1.4l2.1-7.2h0l2.1,7.2c0.2,0.8,1,1.4,1.8,1.4c0.9,0,1.7-0.6,1.8-1.4l2.3-10.1c0.1-0.2,0.1-0.4,0.1-0.6
-	c0-0.7-0.6-1.2-1.3-1.2c0,0,0,0,0,0c-0.8,0-1.4,0.6-1.5,1.3l-1.6,7.9h0l-2.4-8.1c-0.2-0.8-1.1-1.3-1.9-1c-0.5,0.1-0.9,0.5-1,1
-	l-2.4,8.1h0l-1.6-7.9c0-0.8-0.7-1.4-1.5-1.3c-0.7,0-1.3,0.5-1.3,1.2c0,0,0,0,0,0c0,0.2,0,0.4,0.1,0.6L82,153.4z M97.3,153.3
-	c0,0.7,0.6,1.4,1.3,1.4c0,0,0.1,0,0.1,0h4.8c0.7,0,1.3-0.5,1.3-1.2c0,0,0-0.1,0-0.1c0-0.7-0.5-1.3-1.2-1.3c0,0-0.1,0-0.1,0h-3.4
-	v-2.8h3c0.7,0,1.3-0.5,1.3-1.2c0,0,0-0.1,0-0.1c0-0.7-0.5-1.3-1.2-1.3c0,0-0.1,0-0.1,0h-3v-2.7h3.3c0.7,0,1.3-0.5,1.3-1.2
-	c0,0,0-0.1,0-0.1c0-0.7-0.5-1.3-1.2-1.3c0,0-0.1,0-0.1,0h-4.6c-0.8,0-1.4,0.6-1.5,1.4c0,0.1,0,0.2,0,0.2L97.3,153.3L97.3,153.3z
-	 M113.3,146.9c-0.7,0-1.3,0.6-1.3,1.3c0,0.7,0.6,1.3,1.3,1.3c0,0,0,0,0,0h1.9c0,1.6-1.2,2.9-2.8,2.9c-0.1,0-0.2,0-0.3,0
-	c-2.3,0-3.5-2-3.5-4.3c0-2.2,1.2-4.3,3.5-4.3c2.4,0,2.7,1.4,3.9,1.4c0.6,0,1.2-0.5,1.2-1.2c0,0,0-0.1,0-0.1c0-1.3-2.3-2.6-5.1-2.6
-	c-3.8,0-6.4,3-6.4,6.8c0,3.8,2.6,6.8,6.4,6.8c3.7,0,6-2.7,6-6.3c0-1.2-0.5-1.8-1.6-1.8L113.3,146.9L113.3,146.9z M119.5,153.3
-	c0,0.7,0.6,1.4,1.3,1.4c0,0,0.1,0,0.1,0h4.8c0.7,0,1.3-0.5,1.3-1.2c0,0,0-0.1,0-0.1c0-0.7-0.5-1.3-1.2-1.3c0,0-0.1,0-0.1,0h-3.4
-	v-2.8h3c0.7,0,1.3-0.5,1.3-1.2c0,0,0-0.1,0-0.1c0-0.7-0.5-1.3-1.2-1.3c0,0-0.1,0-0.1,0h-3v-2.7h3.3c0.7,0,1.3-0.5,1.3-1.2
-	c0,0,0-0.1,0-0.1c0-0.7-0.5-1.3-1.2-1.3c0,0-0.1,0-0.1,0h-4.6c-0.8,0-1.4,0.6-1.5,1.4c0,0.1,0,0.2,0,0.2L119.5,153.3L119.5,153.3z
-	 M128.2,153.4c0,0.8,0.6,1.4,1.3,1.4s1.4-0.6,1.4-1.3c0,0,0-0.1,0-0.1v-6.9h0l5.9,7.8c0.3,0.3,0.7,0.6,1.2,0.6
-	c0.7,0,1.4-0.5,1.4-1.3c0-0.1,0-0.1,0-0.2v-10.6c0-0.8-0.6-1.4-1.3-1.4s-1.4,0.6-1.4,1.3c0,0,0,0.1,0,0.1v7h0l-5.9-7.9
-	c-0.3-0.4-0.7-0.6-1.2-0.6c-0.7,0-1.4,0.5-1.4,1.3c0,0.1,0,0.1,0,0.2L128.2,153.4L128.2,153.4z M141.4,153.5c0,0.8,0.7,1.4,1.4,1.4
-	s1.4-0.7,1.4-1.4c0-0.8-0.6-1.4-1.4-1.4C142.1,152.1,141.4,152.7,141.4,153.5C141.4,153.5,141.4,153.5,141.4,153.5L141.4,153.5z
-	 M146.5,153.3c0,0.8,0.6,1.4,1.3,1.4c0.1,0,0.1,0,0.2,0h3.8c2.6,0,4.3-1.4,4.3-4c0-1.6-1.2-3-2.8-3.2v0c1.1-0.4,1.8-1.5,1.7-2.7
-	c0-1.8-1.5-3.3-3.3-3.3c-0.1,0-0.1,0-0.2,0h-3.6c-0.7-0.1-1.4,0.5-1.5,1.2c0,0.1,0,0.1,0,0.2L146.5,153.3L146.5,153.3z M149.3,144
-	h1.4c0.7-0.1,1.4,0.4,1.5,1.2c0,0.1,0,0.1,0,0.2c0.1,0.8-0.5,1.4-1.3,1.5c-0.1,0-0.2,0-0.2,0h-1.4V144z M149.3,149.2h2
-	c1.3,0,2,0.6,2,1.5c0,0.9-0.7,1.6-1.5,1.6c-0.1,0-0.1,0-0.2,0h-2.2V149.2z M157.4,153.3c0,0.7,0.6,1.4,1.3,1.4c0,0,0.1,0,0.1,0h4.8
-	c0.7,0,1.3-0.5,1.3-1.2c0,0,0-0.1,0-0.1c0-0.7-0.5-1.3-1.2-1.3c0,0-0.1,0-0.1,0h-3.4v-2.8h3c0.7,0,1.3-0.5,1.3-1.2c0,0,0-0.1,0-0.1
-	c0-0.7-0.5-1.3-1.2-1.3c0,0-0.1,0-0.1,0h-3v-2.7h3.3c0.7,0,1.3-0.5,1.3-1.2c0,0,0-0.1,0-0.1c0-0.7-0.5-1.3-1.2-1.3c0,0-0.1,0-0.1,0
-	h-4.6c-0.8,0-1.4,0.6-1.5,1.4c0,0.1,0,0.2,0,0.3V153.3L157.4,153.3z"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 22.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   preserveAspectRatio="none"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="142.63567"
+   height="131.81705"
+   viewBox="0 0 142.63567 131.81705"
+   xml:space="preserve"
+   sodipodi:docname="fietssnelwegen-logo.svg"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"><metadata
+   id="metadata12"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs10" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1920"
+   inkscape:window-height="1003"
+   id="namedview8"
+   showgrid="false"
+   inkscape:zoom="1.5225806"
+   inkscape:cx="72.117836"
+   inkscape:cy="54.317045"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_1" />
+<style
+   type="text/css"
+   id="style2">
+	.st0{fill:#1582DE;}
+	.st1{fill:#FFFFFF;}
+</style>
+<path
+   id="Polygon_2_copy_19"
+   class="st0"
+   d="m 71.417836,0 c -6.4,0 -12,3.1 -14.8,6.9 -10.4,14.3 -20,29.1 -28.7,44.5 -14.1,24.8 -23.4999998,43.4 -26.8999998,52.8 -1.79999998,5.3 -1.19999998,11.1 1.7,15.8 2.7,4.9 7.4999998,8.2 12.9999998,9 11.7,1.3 28,2.9 55.4,2.8 0.1,0 -0.1,0 0,0 27.4,0.2 44.000004,-1.4 55.700004,-2.7 5.5,-0.8 10.4,-4.1 13.1,-9 2.9,-4.8 3.5,-10.6 1.7,-15.9 -3.4,-9.4 -12.8,-28 -26.9,-52.8 -8.7,-15.4 -18.300004,-30.3 -28.800004,-44.6 -2.7,-3.7 -8.4,-6.8 -14.8,-6.8"
+   inkscape:connector-curvature="0"
+   style="fill:#1582de" />
+<path
+   id="F"
+   class="st1"
+   d="m 55.417836,105.3 c 0,4.7 3,7.3 7,7.3 4,0 7,-2.6 7,-7.3 V 85 h 14.4 c 3.5,0.2 6.5,-2.5 6.7,-6 0,-0.2 0,-0.4 0,-0.5 0.1,-3.4 -2.7,-6.3 -6.1,-6.3 -0.2,0 -0.4,0 -0.5,0 h -14.6 V 58.6 h 17.1 c 4.2,0 6.2,-3.3 6.2,-6.4 0,-3.3 -2.1,-6.4 -6.2,-6.4 h -23.8 c -3.8,-0.1 -7.1,2.9 -7.2,6.7 0,0.2 0,0.4 0,0.6 z"
+   inkscape:connector-curvature="0"
+   style="fill:#ffffff" />
+
+</svg>
\ No newline at end of file