diff --git a/UI/Input/ValidatedTextField.ts b/UI/Input/ValidatedTextField.ts
index ec3aa62ce..eb65544a0 100644
--- a/UI/Input/ValidatedTextField.ts
+++ b/UI/Input/ValidatedTextField.ts
@@ -120,13 +120,12 @@ export default class ValidatedTextField {
                 }
                 
                 // Bit of a hack: we project the centerpoint to the closes point on the road - if available
-                if(options.feature){
+                if(options.feature !== undefined && options.feature.geometry.type !== "Point"){
                     const lonlat: [number, number] = [...options.location]
                     lonlat.reverse()
                     options.location = <[number,number]> GeoOperations.nearestPoint(options.feature, lonlat).geometry.coordinates
                     options.location.reverse()
                 }
-                options.feature
                 
                 const location = new UIEventSource<Loc>({
                     lat: options.location[0],
@@ -142,7 +141,8 @@ export default class ValidatedTextField {
                 const li = new LengthInput(options.mapBackgroundLayer, location, value)
                 li.SetStyle("height: 20rem;")
                 return li;
-            }
+            },
+            "decimal"
         ),
         ValidatedTextField.tp(
             "wikidata",
diff --git a/assets/layers/barrier/barrier.json b/assets/layers/barrier/barrier.json
index ef50bda8d..ccd5479e9 100644
--- a/assets/layers/barrier/barrier.json
+++ b/assets/layers/barrier/barrier.json
@@ -208,8 +208,8 @@
         "nl": "Ruimte tussen barrières (langs de lengte van de weg): {width:seperation} m"
       },
       "question": {
-        "en": "How much space is there between the barriers (along the length of the road)?",
-        "nl": "Hoeveel ruimte is er tussen de barrières (langs de lengte van de weg)?"
+        "en": "How much space is there between the barriers (along the length of the road, in meter)?<br/><img src='./assets/themes/cycle_infra/Cycle_barrier_double_length.svg' style='width: 8em'/>",
+        "nl": "Hoeveel ruimte is er tussen de barrières (langs de lengte van de weg, in meter)?<br/><img src='./assets/themes/cycle_infra/Cycle_barrier_double_length.svg' style='width: 8em'/>"
       },
       "condition": {
         "or": [
@@ -221,7 +221,7 @@
         "key": "width:seperation",
         "type": "length",
         "helperArgs": [
-          "20",
+          "21",
           "map"
         ]
       }
@@ -233,8 +233,8 @@
         "nl": "Breedte van de opening: {width:opening} m"
       },
       "question": {
-        "en": "How wide is the smallest opening next to the barriers?",
-        "nl": "Hoe breed is de smalste opening naast de barrières?"
+        "en": "How wide is the smallest opening next to the barriers (in meter)?<br/><img src='./assets/themes/cycle_infra/Cycle_barrier_double_width.svg' style='width: 8em'/>",
+        "nl": "Hoe breed is de smalste opening naast de barrières (in meter)?<br/><img src='./assets/themes/cycle_infra/Cycle_barrier_double_width.svg' style='width: 8em'/>"
       },
       "condition": {
         "or": [
@@ -244,7 +244,11 @@
       },
       "freeform": {
         "key": "width:opening",
-        "type": "pfloat"
+        "type": "length",
+        "helperArgs": [
+          "21",
+          "map"
+        ]
       }
     },
     {
@@ -253,8 +257,8 @@
         "en": "Overlap: {overlap} m"
       },
       "question": {
-        "en": "How much overlap do the barriers have?",
-        "nl": "Hoeveel overlappen de barrières?"
+        "en": "How much overlap do the barriers have?<br/><img src='./assets/themes/cycle_infra/Cycle_barrier_double_overlap.svg' style='width: 8em'/>",
+        "nl": "Hoeveel overlappen de barrières (in meter)?<br/><img src='./assets/themes/cycle_infra/Cycle_barrier_double_overlap.svg' style='width: 8em'/>"
       },
       "condition": {
         "or": [
@@ -264,7 +268,11 @@
       },
       "freeform": {
         "key": "overlap",
-        "type": "pfloat"
+        "type": "length",
+        "helperArgs": [
+          "21",
+          "map"
+        ]
       }
     }
   ]
diff --git a/assets/layers/cycleways_and_roads/cycleways_and_roads.json b/assets/layers/cycleways_and_roads/cycleways_and_roads.json
new file mode 100644
index 000000000..3a0239cd4
--- /dev/null
+++ b/assets/layers/cycleways_and_roads/cycleways_and_roads.json
@@ -0,0 +1,1170 @@
+{
+  "id": "cycleways_and_roads",
+  "name": {
+    "en": "Cycleways and roads",
+    "nl": "Fietspaden, straten en wegen"
+  },
+  "minzoom": 16,
+  "source": {
+    "osmTags": {
+      "or": [
+        "highway=cycleway",
+        "cycleway=lane",
+        "cycleway=shared_lane",
+        "cycleway=track",
+        "cyclestreet=yes",
+        "highway=residential",
+        "highway=tertiary",
+        "highway=unclassified",
+        "highway=primary",
+        "highway=secondary",
+        {
+          "and": [
+            "highway=path",
+            "bicycle=designated"
+          ]
+        }
+      ]
+    }
+  },
+  "calculatedTags": [
+    "_comfort_score=feat.score('https://raw.githubusercontent.com/pietervdvn/AspectedRouting/master/Examples/bicycle/aspects/bicycle.comfort.json')"
+  ],
+  "title": {
+    "render": {
+      "en": "Cycleways",
+      "nl": "Fietspaden"
+    },
+    "mappings": [
+      {
+        "if": {
+          "or": [
+            "highway=cycleway",
+            "highway=path"
+          ]
+        },
+        "then": {
+          "nl": "Fietsweg",
+          "en": "Cycleway"
+        }
+      },
+      {
+        "if": "cycleway=shared_lane",
+        "then": {
+          "nl": "Fietssuggestiestrook",
+          "en": "Shared lane"
+        }
+      },
+      {
+        "if": "cycleway=lane",
+        "then": {
+          "nl": "Fietsstrook",
+          "en": "Bike lane"
+        }
+      },
+      {
+        "if": "cycleway=track",
+        "then": {
+          "en": "Cycleway next to the road",
+          "nl": "Fietsweg naast de weg"
+        }
+      },
+      {
+        "if": "cyclestreet=yes",
+        "then": {
+          "nl": "Fietsstraat",
+          "en": "Cyclestreet"
+        }
+      }
+    ]
+  },
+  "description": {},
+  "tagRenderings": [
+    {
+      "#": "Cycleway type for a road",
+      "question": {
+        "en": "What kind of cycleway is here?",
+        "nl": "Wat voor fietspad is hier?"
+      },
+      "condition": {
+        "and": [
+          "highway!=cycleway",
+          "highway!=path"
+        ]
+      },
+      "mappings": [
+        {
+          "if": "cycleway=shared_lane",
+          "then": {
+            "en": "There is a shared lane",
+            "nl": "Er is een fietssuggestiestrook"
+          }
+        },
+        {
+          "if": "cycleway=lane",
+          "then": {
+            "en": "There is a lane next to the road (seperated with paint)",
+            "nl": "Er is een fietspad aangrenzend aan de weg (gescheiden met verf)"
+          }
+        },
+        {
+          "if": "cycleway=track",
+          "then": {
+            "en": "There is a track, but no cycleway drawn seperately from this road on the map.",
+            "nl": "Er is een fietspad (los van de weg), maar geen fietspad afzonderlijk getekend naast deze weg."
+          }
+        },
+        {
+          "if": "cycleway=seperate",
+          "then": {
+            "en": "There is a seperately drawn cycleway",
+            "nl": "Er is een apart getekend fietspad."
+          }
+        },
+        {
+          "if": "cycleway=no",
+          "then": {
+            "en": "There is no cycleway",
+            "nl": "Er is geen fietspad aanwezig"
+          },
+          "hideInAnswer": "cycleway=opposite"
+        },
+        {
+          "if": "cycleway=no",
+          "then": {
+            "en": "There is no cycleway",
+            "nl": "Er is geen fietspad aanwezig"
+          },
+          "hideInAnswer": "cycleway!=opposite",
+          "addExtraTags": [
+            "oneway:bicycle=no",
+            "fixme=Changed from cycleway=opposite"
+          ]
+        }
+      ]
+    },
+    {
+      "#": "is lit?",
+      "question": {
+        "en": "Is this street lit?",
+        "nl": "Is deze weg verlicht?"
+      },
+      "mappings": [
+        {
+          "if": "lit=yes",
+          "then": {
+            "en": "This street is lit",
+            "nl": "Deze weg is verlicht"
+          }
+        },
+        {
+          "if": "lit=no",
+          "then": {
+            "en": "This road is not lit",
+            "nl": "Deze weg is niet verlicht"
+          }
+        },
+        {
+          "if": "lit=sunset-sunrise",
+          "then": {
+            "en": "This road is lit at night",
+            "nl": "Deze weg is 's nachts verlicht"
+          },
+          "hideInAnswer": true
+        },
+        {
+          "if": "lit=24/7",
+          "then": {
+            "en": "This road is lit 24/7",
+            "nl": "Deze weg is 24/7 verlicht"
+          }
+        }
+      ]
+    },
+    {
+      "#": "Is this a cyclestreet? (For a road)",
+      "question": {
+        "en": "Is this a cyclestreet?",
+        "nl": "Is dit een fietsstraat?"
+      },
+      "condition": {
+        "and": [
+          "highway!=cycleway",
+          "highway!=path"
+        ]
+      },
+      "mappings": [
+        {
+          "if": "cyclestreet=yes",
+          "then": {
+            "en": "This is a cyclestreet, and a 30km/h zone.",
+            "nl": "Dit is een fietsstraat, en dus een 30km/h zone"
+          },
+          "addExtraTags": [
+            "overtaking:motor_vehicle=no",
+            "maxspeed=30"
+          ],
+          "hideInAnswer": "_country!=be"
+        },
+        {
+          "if": "cyclestreet=yes",
+          "then": {
+            "en": "This is a cyclestreet",
+            "nl": "Dit is een fietsstraat"
+          },
+          "hideInAnswer": "_country=be"
+        },
+        {
+          "if": "cyclestreet=",
+          "then": {
+            "en": "This is not a cyclestreet.",
+            "nl": "Dit is geen fietsstraat"
+          },
+          "addExtraTags": [
+            "overtaking:motor_vehicle="
+          ]
+        }
+      ]
+    },
+    {
+      "#": "Maxspeed (for road)",
+      "render": {
+        "en": "The maximum speed on this road is {maxspeed} km/h",
+        "nl": "De maximumsnelheid op deze weg is {maxspeed} km/u"
+      },
+      "freeform": {
+        "key": "maxspeed",
+        "type": "nat"
+      },
+      "condition": {
+        "and": [
+          "highway!=cycleway",
+          "highway!=path"
+        ]
+      },
+      "mappings": [
+        {
+          "if": "maxspeed=20",
+          "then": {
+            "en": "The maximum speed is 20 km/h",
+            "nl": "De maximumsnelheid is 20 km/u"
+          }
+        },
+        {
+          "if": "maxspeed=30",
+          "then": {
+            "en": "The maximum speed is 30 km/h",
+            "nl": "De maximumsnelheid is 30 km/u"
+          }
+        },
+        {
+          "if": "maxspeed=50",
+          "then": {
+            "en": "The maximum speed is 50 km/h",
+            "nl": "De maximumsnelheid is 50 km/u"
+          }
+        },
+        {
+          "if": "maxspeed=70",
+          "then": {
+            "en": "The maximum speed is 70 km/h",
+            "nl": "De maximumsnelheid is 70 km/u"
+          }
+        },
+        {
+          "if": "maxspeed=90",
+          "then": {
+            "en": "The maximum speed is 90 km/h",
+            "nl": "De maximumsnelheid is 90 km/u"
+          }
+        }
+      ],
+      "question": {
+        "en": "What is the maximum speed in this street?",
+        "nl": "Wat is de maximumsnelheid in deze straat?"
+      }
+    },
+    {
+      "#": "Cycleway:surface",
+      "render": {
+        "en": "This cyleway is made of {cycleway:surface}",
+        "nl": "Dit fietspad is gemaakt van {cycleway:surface}"
+      },
+      "freeform": {
+        "key": "cycleway:surface"
+      },
+      "condition": {
+        "or": [
+          "cycleway=shared_lane",
+          "cycleway=lane",
+          "cycleway=track"
+        ]
+      },
+      "mappings": [
+        {
+          "if": "cycleway:surface=unpaved",
+          "then": {
+            "en": "This cycleway is unpaved",
+            "nl": "Dit fietspad is onverhard"
+          },
+          "hideInAnswer": true
+        },
+        {
+          "if": "cycleway:surface=paved",
+          "then": {
+            "en": "This cycleway is paved",
+            "nl": "Dit fietspad is geplaveid"
+          },
+          "hideInAnswer": true
+        },
+        {
+          "if": "cycleway:surface=asphalt",
+          "then": {
+            "en": "This cycleway is made of asphalt",
+            "nl": "Dit fietspad is gemaakt van asfalt"
+          }
+        },
+        {
+          "if": "cycleway:surface=paving_stones",
+          "then": {
+            "en": "This cycleway is made of smooth paving stones",
+            "nl": "Dit fietspad is gemaakt van straatstenen"
+          }
+        },
+        {
+          "if": "cycleway:surface=concrete",
+          "then": {
+            "en": "This cycleway is made of concrete",
+            "nl": "Dit fietspad is gemaakt van beton"
+          }
+        },
+        {
+          "if": "cycleway:surface=cobblestone",
+          "then": {
+            "en": "This cycleway is made of cobblestone (unhewn or sett)",
+            "nl": "Dit fietspad is gemaakt van kasseien (natuurlijk of verwerkt)"
+          },
+          "hideInAnswer": true
+        },
+        {
+          "if": "cycleway:surface=unhewn_cobblestone",
+          "then": {
+            "en": "This cycleway is made of raw, natural cobblestone",
+            "nl": "Dit fietspad is gemaakt van ruwe, natuurlijke kasseien"
+          }
+        },
+        {
+          "if": "cycleway:surface=sett",
+          "then": {
+            "en": "This cycleway is made of flat, square cobblestone",
+            "nl": "Dit fietspad is gemaakt van vlakke, rechthoekige kasseien"
+          }
+        },
+        {
+          "if": "cycleway:surface=wood",
+          "then": {
+            "en": "This cycleway is made of wood",
+            "nl": "Dit fietspad is gemaakt van hout"
+          }
+        },
+        {
+          "if": "cycleway:surface=gravel",
+          "then": {
+            "en": "This cycleway is made of gravel",
+            "nl": "Dit fietspad is gemaakt van grind"
+          }
+        },
+        {
+          "if": "cycleway:surface=fine_gravel",
+          "then": {
+            "en": "This cycleway is made of fine gravel",
+            "nl": "Dit fietspad is gemaakt van fijn grind"
+          }
+        },
+        {
+          "if": "cycleway:surface=pebblestone",
+          "then": {
+            "en": "This cycleway is made of pebblestone",
+            "nl": "Dit fietspad is gemaakt van kiezelsteentjes"
+          }
+        },
+        {
+          "if": "cycleway:surface=ground",
+          "then": {
+            "en": "This cycleway is made from raw ground",
+            "nl": "Dit fietspad is gemaakt van aarde"
+          }
+        }
+      ],
+      "question": {
+        "en": "What is the surface of the cycleway made from?",
+        "nl": "Waaruit is het oppervlak van het fietspad van gemaakt?"
+      }
+    },
+    {
+      "#": "Cycleway:smoothness",
+      "question": {
+        "en": "What is the smoothness of this cycleway?",
+        "nl": "Wat is de kwaliteit van dit fietspad?"
+      },
+      "condition": {
+        "or": [
+          "cycleway=shared_lane",
+          "cycleway=lane",
+          "cycleway=track"
+        ]
+      },
+      "mappings": [
+        {
+          "if": "cycleway:smoothness=excellent",
+          "then": {
+            "en": "Usable for thin rollers: rollerblade, skateboard",
+            "nl": "Geschikt voor fijne rollers: rollerblade, skateboard"
+          }
+        },
+        {
+          "if": "cycleway:smoothness=good",
+          "then": {
+            "en": "Usable for thin wheels: racing bike",
+            "nl": "Geschikt voor fijne wielen: racefiets"
+          }
+        },
+        {
+          "if": "cycleway:smoothness=intermediate",
+          "then": {
+            "en": "Usable for normal wheels: city bike, wheelchair, scooter",
+            "nl": "Geschikt voor normale wielen: stadsfiets, rolstoel, scooter"
+          }
+        },
+        {
+          "if": "cycleway:smoothness=bad",
+          "then": {
+            "en": "Usable for robust wheels: trekking bike, car, rickshaw",
+            "nl": "Geschikt voor brede wielen: trekfiets, auto, rickshaw"
+          }
+        },
+        {
+          "if": "cycleway:smoothness=very_bad",
+          "then": {
+            "en": "Usable for vehicles with high clearance: light duty off-road vehicle",
+            "nl": "Geschikt voor voertuigen met hoge banden: lichte terreinwagen"
+          }
+        },
+        {
+          "if": "cycleway:smoothness=horrible",
+          "then": {
+            "en": "Usable for off-road vehicles: heavy duty off-road vehicle",
+            "nl": "Geschikt voor terreinwagens: zware terreinwagen"
+          }
+        },
+        {
+          "if": "cycleway:smoothness=very_horrible",
+          "then": {
+            "en": "Usable for specialized off-road vehicles: tractor, ATV",
+            "nl": "Geschikt voor gespecialiseerde terreinwagens: tractor, alleterreinwagen"
+          }
+        },
+        {
+          "if": "cycleway:smoothness=impassable",
+          "then": {
+            "en": "Impassable / No wheeled vehicle",
+            "nl": "Niet geschikt voor voertuigen met wielen"
+          }
+        }
+      ]
+    },
+    {
+      "#": "Surface of the road",
+      "render": {
+        "en": "This road is made of {surface}",
+        "nl": "Deze weg is gemaakt van {surface}"
+      },
+      "freeform": {
+        "key": "surface"
+      },
+      "mappings": [
+        {
+          "if": "surface=unpaved",
+          "then": {
+            "en": "This cycleway is unhardened",
+            "nl": "Dit fietspad is onverhard"
+          },
+          "hideInAnswer": true
+        },
+        {
+          "if": "surface=paved",
+          "then": {
+            "en": "This cycleway is paved",
+            "nl": "Dit fietspad is geplaveid"
+          },
+          "hideInAnswer": true
+        },
+        {
+          "if": "surface=asphalt",
+          "then": {
+            "en": "This cycleway is made of asphalt",
+            "nl": "Dit fietspad is gemaakt van asfalt"
+          }
+        },
+        {
+          "if": "surface=paving_stones",
+          "then": {
+            "en": "This cycleway is made of smooth paving stones",
+            "nl": "Dit fietspad is gemaakt van straatstenen"
+          }
+        },
+        {
+          "if": "surface=concrete",
+          "then": {
+            "en": "This cycleway is made of concrete",
+            "nl": "Dit fietspad is gemaakt van beton"
+          }
+        },
+        {
+          "if": "surface=cobblestone",
+          "then": {
+            "en": "This cycleway is made of cobblestone (unhewn or sett)",
+            "nl": "Dit fietspad is gemaakt van kasseien (natuurlijk of verwerkt)"
+          },
+          "hideInAnswer": true
+        },
+        {
+          "if": "surface=unhewn_cobblestone",
+          "then": {
+            "en": "This cycleway is made of raw, natural cobblestone",
+            "nl": "Dit fietspad is gemaakt van ruwe, natuurlijke kasseien"
+          }
+        },
+        {
+          "if": "surface=sett",
+          "then": {
+            "en": "This cycleway is made of flat, square cobblestone",
+            "nl": "Dit fietspad is gemaakt van vlakke, rechthoekige kasseien"
+          }
+        },
+        {
+          "if": "surface=wood",
+          "then": {
+            "en": "This cycleway is made of wood",
+            "nl": "Dit fietspad is gemaakt van hout"
+          }
+        },
+        {
+          "if": "surface=gravel",
+          "then": {
+            "en": "This cycleway is made of gravel",
+            "nl": "Dit fietspad is gemaakt van grind"
+          }
+        },
+        {
+          "if": "surface=fine_gravel",
+          "then": {
+            "en": "This cycleway is made of fine gravel",
+            "nl": "Dit fietspad is gemaakt van fijn grind"
+          }
+        },
+        {
+          "if": "surface=pebblestone",
+          "then": {
+            "en": "This cycleway is made of pebblestone",
+            "nl": "Dit fietspad is gemaakt van kiezelsteentjes"
+          }
+        },
+        {
+          "if": "surface=ground",
+          "then": {
+            "en": "This cycleway is made from raw ground",
+            "nl": "Dit fietspad is gemaakt van aarde"
+          }
+        }
+      ],
+      "question": {
+        "en": "What is the surface of the street made from?",
+        "nl": "Waaruit is het oppervlak van de straat gemaakt?"
+      }
+    },
+    {
+      "#": "Surface of the street",
+      "question": {
+        "en": "What is the smoothness of this street?",
+        "nl": "Wat is de kwaliteit van deze straat?"
+      },
+      "condition": {
+        "or": [
+          "cycleway=no",
+          "highway=cycleway"
+        ]
+      },
+      "mappings": [
+        {
+          "if": "smoothness=excellent",
+          "then": {
+            "en": "Usable for thin rollers: rollerblade, skateboard"
+          }
+        },
+        {
+          "if": "smoothness=good",
+          "then": {
+            "en": "Usable for thin wheels: racing bike"
+          }
+        },
+        {
+          "if": "smoothness=intermediate",
+          "then": {
+            "en": "Usable for normal wheels: city bike, wheelchair, scooter"
+          }
+        },
+        {
+          "if": "smoothness=bad",
+          "then": {
+            "en": "Usable for robust wheels: trekking bike, car, rickshaw"
+          }
+        },
+        {
+          "if": "smoothness=very_bad",
+          "then": {
+            "en": "Usable for vehicles with high clearance: light duty off-road vehicle"
+          }
+        },
+        {
+          "if": "smoothness=horrible",
+          "then": {
+            "en": "Usable for off-road vehicles: heavy duty off-road vehicle"
+          }
+        },
+        {
+          "if": "smoothness=very_horrible",
+          "then": {
+            "en": "Usable for specialized off-road vehicles: tractor, ATV"
+          }
+        },
+        {
+          "if": "smoothness=impassable",
+          "then": {
+            "en": "Impassable / No wheeled vehicle"
+          }
+        }
+      ]
+    },
+    {
+      "#": "width:carriageway",
+      "condition": {
+        "and": [
+          "highway!=cycleway",
+          "highway!=path"
+        ]
+      },
+      "render": {
+        "en": "The carriage width of this road is <strong>{width:carriageway}m</strong>",
+        "nl": "De breedte van deze rijbaan in deze straat is <strong>{width:carriageway}m</strong>"
+      },
+      "freeform": {
+        "key": "width:carriageway",
+        "type": "length",
+        "helperArgs": [
+          "20",
+          "map"
+        ]
+      },
+      "question": {
+        "en": "What is the carriage width of this road (in meters)?",
+        "nl": "Hoe breed is de rijbaan in deze straat (in meters)?"
+      }
+    },
+    {
+      "question": {
+        "en": "What traffic sign does this cycleway have?",
+        "nl": "Welk verkeersbord heeft dit fietspad?"
+      },
+      "condition": {
+        "or": [
+          "cycleway=lane",
+          "cycleway=track"
+        ]
+      },
+      "mappings": [
+        {
+          "if": "cycleway:traffic_sign=BE:D7",
+          "then": {
+            "en": "Compulsory cycleway <img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 3em'>",
+            "nl": "Verplicht fietspad <img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 3em'>"
+          },
+          "hideInAnswer": "_country!=be"
+        },
+        {
+          "if": "cycleway:traffic_sign~BE:D7;.*",
+          "then": {
+            "en": "Compulsory cycleway (with supplementary sign)<br><img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 3em'> ",
+            "nl": "Verplicht fietspad (met onderbord)<br><img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 3em'>"
+          },
+          "hideInAnswer": true
+        },
+        {
+          "if": "cycleway:traffic_sign=BE:D9",
+          "then": {
+            "en": "Segregated foot/cycleway <img src='./assets/themes/cycle_infra/Belgian_road_sign_D09.svg' style='width: 3em'>",
+            "nl": "Afgescheiden voet-/fietspad <img src='./assets/themes/cycle_infra/Belgian_road_sign_D09.svg' style='width: 3em'>"
+          },
+          "hideInAnswer": "_country!=be",
+          "addExtraTags": [
+            "cycleway:foot=designated",
+            "cycleway:segregated=yes"
+          ]
+        },
+        {
+          "if": "cycleway:traffic_sign=BE:D10",
+          "then": {
+            "en": "Unsegregated foot/cycleway <img src='./assets/themes/cycle_infra/Belgian_road_sign_D10.svg' style='width: 3em'>",
+            "nl": "Gedeeld voet-/fietspad <img src='./assets/themes/cycle_infra/Belgian_road_sign_D10.svg' style='width: 3em'>"
+          },
+          "hideInAnswer": "_country!=be",
+          "addExtraTags": [
+            "cycleway:foot=designated",
+            "cycleway:segregated=no"
+          ]
+        },
+        {
+          "if": "cycleway:traffic_sign=none",
+          "then": {
+            "en": "No traffic sign present",
+            "nl": "Geen verkeersbord aanwezig"
+          }
+        }
+      ]
+    },
+    {
+      "question": {
+        "en": "What traffic sign does this cycleway have?",
+        "nl": "Welk verkeersbord heeft dit fietspad?"
+      },
+      "condition": {
+        "or": [
+          "highway=cycleway",
+          "highway=path"
+        ]
+      },
+      "mappings": [
+        {
+          "if": "traffic_sign=BE:D7",
+          "then": {
+            "en": "Compulsory cycleway <img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 3em'>",
+            "nl": "Verplicht fietspad <img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 3em'>"
+          },
+          "hideInAnswer": "_country!=be",
+          "addExtraTags": [
+            "bicycle=designated",
+            "mofa=designated",
+            "moped=yes",
+            "speed_pedelec=yes"
+          ]
+        },
+        {
+          "if": "traffic_sign~BE:D7;.*",
+          "then": {
+            "en": "Compulsory cycleway (with supplementary sign)<br><img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 3em'> ",
+            "nl": "Verplicht fietspad (met onderbord)<br><img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 3em'>"
+          },
+          "hideInAnswer": true
+        },
+        {
+          "if": "traffic_sign=BE:D9",
+          "then": {
+            "en": "Segregated foot/cycleway <img src='./assets/themes/cycle_infra/Belgian_road_sign_D09.svg' style='width: 3em'>",
+            "nl": "Afgescheiden voet-/fietspad <img src='./assets/themes/cycle_infra/Belgian_road_sign_D09.svg' style='width: 3em'>"
+          },
+          "hideInAnswer": "_country!=be",
+          "addExtraTags": [
+            "foot=designated",
+            "bicycle=designated",
+            "mofa=designated",
+            "moped=no",
+            "speed_pedelec=no",
+            "segregated=yes"
+          ]
+        },
+        {
+          "if": "traffic_sign=BE:D10",
+          "then": {
+            "en": "Unsegregated foot/cycleway <img src='./assets/themes/cycle_infra/Belgian_road_sign_D10.svg' style='width: 3em'>",
+            "nl": "Gedeeld voet-/fietspad <img src='./assets/themes/cycle_infra/Belgian_road_sign_D10.svg' style='width: 3em'>"
+          },
+          "hideInAnswer": "_country!=be",
+          "addExtraTags": [
+            "foot=designated",
+            "bicycle=designated",
+            "mofa=designated",
+            "moped=no",
+            "speed_pedelec=no",
+            "segregated=no"
+          ]
+        },
+        {
+          "if": "traffic_sign=none",
+          "then": {
+            "en": "No traffic sign present",
+            "nl": "Geen verkeersbord aanwezig"
+          }
+        }
+      ]
+    },
+    {
+      "question": {
+        "en": "Does the traffic sign D7 (<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 1.5em'>) have a supplementary sign?",
+        "nl": "Heeft het verkeersbord D7 (<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 1.5em'>) een onderbord?"
+      },
+      "condition": {
+        "or": [
+          "cycleway:traffic_sign=BE:D7",
+          "cycleway:traffic_sign~BE:D7;.*"
+        ]
+      },
+      "mappings": [
+        {
+          "if": "cycleway:traffic_sign=BE:D7;BE:M6",
+          "then": {
+            "en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M6.svg' style='width: 3em'>",
+            "nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M6.svg' style='width: 3em'>"
+          },
+          "hideInAnswer": "_country!=be",
+          "addExtraTags": [
+            "cycleway:moped=designated"
+          ]
+        },
+        {
+          "if": "cycleway:traffic_sign=BE:D7;BE:M13",
+          "then": {
+            "en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M13.svg' style='width: 3em'>",
+            "nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M13.svg' style='width: 3em'>"
+          },
+          "hideInAnswer": "_country!=be",
+          "addExtraTags": [
+            "cycleway:speed_pedelec=designated"
+          ]
+        },
+        {
+          "if": "cycleway:traffic_sign=BE:D7;BE:M14",
+          "then": {
+            "en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M14.svg' style='width: 3em'>",
+            "nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M14.svg' style='width: 3em'>"
+          },
+          "hideInAnswer": "_country!=be",
+          "addExtraTags": [
+            "cycleway:moped=designated",
+            "cycleway:speed_pedelec=designated"
+          ]
+        },
+        {
+          "if": "cycleway:traffic_sign=BE:D7;BE:M7",
+          "then": {
+            "en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M7.svg' style='width: 3em'>",
+            "nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M7.svg' style='width: 3em'>"
+          },
+          "hideInAnswer": "_country!=be",
+          "addExtraTags": [
+            "cycleway:moped=no"
+          ]
+        },
+        {
+          "if": "cycleway:traffic_sign=BE:D7;BE:M15",
+          "then": {
+            "en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M15.svg' style='width: 3em'>",
+            "nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M15.svg' style='width: 3em'>"
+          },
+          "hideInAnswer": "_country!=be",
+          "addExtraTags": [
+            "cycleway:speed_pedelec=no"
+          ]
+        },
+        {
+          "if": "cycleway:traffic_sign=BE:D7;BE:M16",
+          "then": {
+            "en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M16.svg' style='width: 3em'>",
+            "nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M16.svg' style='width: 3em'>"
+          },
+          "hideInAnswer": "_country!=be",
+          "addExtraTags": [
+            "cycleway:moped=designated",
+            "cycleway:speed_pedelec=no"
+          ]
+        },
+        {
+          "if": "cycleway:traffic_sign:supplementary=none",
+          "then": {
+            "en": "No supplementary traffic sign present",
+            "nl": "Geen onderbord aanwezig"
+          }
+        }
+      ]
+    },
+    {
+      "question": {
+        "en": "Does the traffic sign D7 (<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 1.5em'>) have a supplementary sign?",
+        "nl": "Heeft het verkeersbord D7 (<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 1.5em'>) een onderbord?"
+      },
+      "condition": {
+        "or": [
+          "traffic_sign=BE:D7",
+          "traffic_sign~BE:D7;.*"
+        ]
+      },
+      "mappings": [
+        {
+          "if": "traffic_sign=BE:D7;BE:M6",
+          "then": {
+            "en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M6.svg' style='width: 3em'>",
+            "nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M6.svg' style='width: 3em'>"
+          },
+          "hideInAnswer": "_country!=be",
+          "addExtraTags": [
+            "moped=designated"
+          ]
+        },
+        {
+          "if": "traffic_sign=BE:D7;BE:M13",
+          "then": {
+            "en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M13.svg' style='width: 3em'>",
+            "nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M13.svg' style='width: 3em'>"
+          },
+          "hideInAnswer": "_country!=be",
+          "addExtraTags": [
+            "speed_pedelec=designated"
+          ]
+        },
+        {
+          "if": "traffic_sign=BE:D7;BE:M14",
+          "then": {
+            "en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M14.svg' style='width: 3em'>",
+            "nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M14.svg' style='width: 3em'>"
+          },
+          "hideInAnswer": "_country!=be",
+          "addExtraTags": [
+            "moped=designated",
+            "speed_pedelec=designated"
+          ]
+        },
+        {
+          "if": "traffic_sign=BE:D7;BE:M7",
+          "then": {
+            "en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M7.svg' style='width: 3em'>",
+            "nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M7.svg' style='width: 3em'>"
+          },
+          "hideInAnswer": "_country!=be",
+          "addExtraTags": [
+            "moped=no"
+          ]
+        },
+        {
+          "if": ":traffic_sign=BE:D7;BE:M15",
+          "then": {
+            "en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M15.svg' style='width: 3em'>",
+            "nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M15.svg' style='width: 3em'>"
+          },
+          "hideInAnswer": "_country!=be",
+          "addExtraTags": [
+            "speed_pedelec=no"
+          ]
+        },
+        {
+          "if": "traffic_sign=BE:D7;BE:M16",
+          "then": {
+            "en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M16.svg' style='width: 3em'>",
+            "nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M16.svg' style='width: 3em'>"
+          },
+          "hideInAnswer": "_country!=be",
+          "addExtraTags": [
+            "moped=designated",
+            "speed_pedelec=no"
+          ]
+        },
+        {
+          "if": "traffic_sign:supplementary=none",
+          "then": {
+            "en": "No supplementary traffic sign present",
+            "nl": "Geen onderbord aanwezig"
+          }
+        }
+      ]
+    },
+    {
+      "render": {
+        "en": "The buffer besides this cycleway is {cycleway:buffer} m",
+        "nl": "De schrikafstand van dit fietspad is {cycleway:buffer} m"
+      },
+      "question": {
+        "en": "How wide is the gap between the cycleway and the road?",
+        "nl": "Hoe breed is de ruimte tussen het fietspad en de weg?"
+      },
+      "condition": {
+        "or": [
+          "cycleway=track",
+          "cycleway=lane"
+        ]
+      },
+      "freeform": {
+        "key": "cycleway:buffer",
+        "type": "length",
+        "helperArgs": [
+          "20",
+          "map"
+        ]
+      }
+    },
+    {
+      "question": {
+        "en": "How is this cycleway seperated from the road?",
+        "nl": "Hoe is dit fietspad gescheiden van de weg?"
+      },
+      "condition": {
+        "or": [
+          "cycleway=track",
+          "cycleway=lane"
+        ]
+      },
+      "mappings": [
+        {
+          "if": "cycleway:seperation=dashed_line",
+          "then": {
+            "en": "This cycleway is seperated by a dashed line",
+            "nl": "Dit fietspad is gescheiden van de weg met een onderbroken streep"
+          }
+        },
+        {
+          "if": "cycleway:seperation=solid_line",
+          "then": {
+            "en": "This cycleway is seperated by a solid line",
+            "nl": "Dit fietspad is gescheiden van de weg met een doorgetrokken streep"
+          }
+        },
+        {
+          "if": "cycleway:seperation=parking_lane",
+          "then": {
+            "en": "This cycleway is seperated by a parking lane",
+            "nl": "Dit fietspad is gescheiden van de weg met parkeervakken"
+          }
+        },
+        {
+          "if": "cycleway:seperation=kerb",
+          "then": {
+            "en": "This cycleway is seperated by a kerb",
+            "nl": "Dit fietspad is gescheiden van de weg met een stoeprand"
+          }
+        }
+      ]
+    },
+    {
+      "question": {
+        "en": "How is this cycleway seperated from the road?",
+        "nl": "Hoe is dit fietspad gescheiden van de weg?"
+      },
+      "condition": {
+        "or": [
+          "highway=cycleway",
+          "highway=path"
+        ]
+      },
+      "mappings": [
+        {
+          "if": "seperation=dashed_line",
+          "then": {
+            "en": "This cycleway is seperated by a dashed line",
+            "nl": "Dit fietspad is gescheiden van de weg met een onderbroken streep"
+          }
+        },
+        {
+          "if": "seperation=solid_line",
+          "then": {
+            "en": "This cycleway is seperated by a solid line",
+            "nl": "Dit fietspad is gescheiden van de weg met een doorgetrokken streep"
+          }
+        },
+        {
+          "if": "seperation=parking_lane",
+          "then": {
+            "en": "This cycleway is seperated by a parking lane",
+            "nl": "Dit fietspad is gescheiden van de weg met parkeervakken"
+          }
+        },
+        {
+          "if": "seperation=kerb",
+          "then": {
+            "en": "This cycleway is seperated by a kerb",
+            "nl": "Dit fietspad is gescheiden van de weg met een stoeprand"
+          }
+        }
+      ]
+    }
+  ],
+  "icon": {
+    "render": "./assets/themes/cycle_infra/bicycleway.svg"
+  },
+  "width": {
+    "render": "8"
+  },
+  "iconSize": {
+    "render": "40,40,center"
+  },
+  "color": {
+    "render": "rgba(170, 170, 170, 0.7)",
+    "mappings": [
+      {
+        "if": "highway=cycleway",
+        "then": "rgba(0, 189, 141, 0.7)"
+      },
+      {
+        "if": "highway=path",
+        "then": "rgba(204, 74, 207, 0.7)"
+      },
+      {
+        "if": "cycleway=track",
+        "then": "rgba(113, 3, 200, 0.7)"
+      },
+      {
+        "if": "cycleway=shared_lane",
+        "then": "rgba(74, 59, 247, 0.7)"
+      },
+      {
+        "if": "cycleway=lane",
+        "then": "rgba(254, 155, 6, 0.9)"
+      },
+      {
+        "if": "cyclestreet=yes",
+        "then": "rgba(57, 159, 191, 0.7)"
+      }
+    ]
+  },
+  "dashArray": {
+    "render": "",
+    "mappings": [
+      {
+        "if": {
+          "or": [
+            "oneway=yes",
+            {
+              "or": [
+                "highway=cycleway",
+                "highway=path"
+              ]
+            }
+          ]
+        },
+        "then": ""
+      },
+      {
+        "if": "cycleway=track",
+        "then": ""
+      },
+      {
+        "if": "cycleway=shared_lane",
+        "then": "15 30"
+      },
+      {
+        "if": "cycleway=lane",
+        "then": "25 15 15 15 25"
+      },
+      {
+        "if": "cyclestreet=yes",
+        "then": ""
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/assets/themes/cycle_infra/Cycle_barrier_double.svg b/assets/themes/cycle_infra/Cycle_barrier_double.svg
new file mode 100644
index 000000000..04e9e5265
--- /dev/null
+++ b/assets/themes/cycle_infra/Cycle_barrier_double.svg
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   width="96.08979mm"
+   height="101.50655mm"
+   viewBox="0 0 96.08979 101.50655"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
+   sodipodi:docname="Cycle_barrier_double.svg">
+  <defs
+     id="defs2">
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lend"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path865"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker1147"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path1145"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path832"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:#ffff00;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker1147-3"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path1145-6"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lend-7"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path865-5"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker1147-3-5"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path1145-6-6"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lend-7-2"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path865-5-9"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker1147-2"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path1145-7"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lend-0"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path865-9"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.9899495"
+     inkscape:cx="-250.89268"
+     inkscape:cy="135.5249"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="999"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-37.152374,-106.72141)">
+    <rect
+       style="fill:#c8c8c8;fill-opacity:1;stroke:none;stroke-width:0.42857912;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:10.28589898, 10.28589898;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect815"
+       width="96.08979"
+       height="101.50655"
+       x="37.152374"
+       y="106.72141" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:4.85307503;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 74.434563,136.77191 H 130.96207"
+       id="path819"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path830"
+       d="M 74.434563,136.77191 H 130.96207"
+       style="fill:none;stroke:#ffff00;stroke-width:4.85300016;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:4.85300037, 4.85300037;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:4.85307503;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 40.157243,179.93594 H 96.684755"
+       id="path819-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path830-6"
+       d="M 40.157243,179.93594 H 96.684755"
+       style="fill:none;stroke:#ffff00;stroke-width:4.85300016;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:4.85300042, 4.85300042;stroke-dashoffset:0;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/assets/themes/cycle_infra/Cycle_barrier_double.png b/assets/themes/cycle_infra/Cycle_barrier_double_length.png
similarity index 100%
rename from assets/themes/cycle_infra/Cycle_barrier_double.png
rename to assets/themes/cycle_infra/Cycle_barrier_double_length.png
diff --git a/assets/themes/cycle_infra/Cycle_barrier_double_length.svg b/assets/themes/cycle_infra/Cycle_barrier_double_length.svg
new file mode 100644
index 000000000..ebb1193e2
--- /dev/null
+++ b/assets/themes/cycle_infra/Cycle_barrier_double_length.svg
@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   width="96.08979mm"
+   height="101.50655mm"
+   viewBox="0 0 96.08979 101.50655"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
+   sodipodi:docname="Cycle_barrier_double_length.svg">
+  <defs
+     id="defs2">
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lend"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path865"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker1147"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path1145"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path832"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:#ffff00;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker1147-3"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path1145-6"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lend-7"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path865-5"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker1147-3-5"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path1145-6-6"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lend-7-2"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path865-5-9"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker1147-2"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path1145-7"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lend-0"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path865-9"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.9899495"
+     inkscape:cx="-250.89268"
+     inkscape:cy="135.5249"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="999"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-37.152374,-106.72141)">
+    <rect
+       style="fill:#c8c8c8;fill-opacity:1;stroke:none;stroke-width:0.42857912;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:10.28589898, 10.28589898;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect815"
+       width="96.08979"
+       height="101.50655"
+       x="37.152374"
+       y="106.72141" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:4.85307503;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 74.434563,136.77191 H 130.96207"
+       id="path819"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path830"
+       d="M 74.434563,136.77191 H 130.96207"
+       style="fill:none;stroke:#ffff00;stroke-width:4.85300016;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:4.85300037, 4.85300037;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:4.85307503;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 40.157243,179.93594 H 96.684755"
+       id="path819-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path830-6"
+       d="M 40.157243,179.93594 H 96.684755"
+       style="fill:none;stroke:#ffff00;stroke-width:4.85300016;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:4.85300042, 4.85300042;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       style="fill:none;stroke:#ff0000;stroke-width:0.69999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker1147);marker-end:url(#Arrow1Lend)"
+       d="M 86.329966,176.10909 V 141.23041"
+       id="path848"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/assets/themes/cycle_infra/Cycle_barrier_double_overlap.svg b/assets/themes/cycle_infra/Cycle_barrier_double_overlap.svg
new file mode 100644
index 000000000..7a6d71289
--- /dev/null
+++ b/assets/themes/cycle_infra/Cycle_barrier_double_overlap.svg
@@ -0,0 +1,239 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   width="96.08979mm"
+   height="101.50655mm"
+   viewBox="0 0 96.08979 101.50655"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
+   sodipodi:docname="Cycle_barrier_double_overlap.svg">
+  <defs
+     id="defs2">
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lend"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path865"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker1147"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path1145"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path832"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:#ffff00;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker1147-3"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path1145-6"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lend-7"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path865-5"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker1147-3-5"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path1145-6-6"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lend-7-2"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path865-5-9"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker1147-2"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path1145-7"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lend-0"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path865-9"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.9899495"
+     inkscape:cx="-250.89268"
+     inkscape:cy="135.5249"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="999"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-37.152374,-106.72141)">
+    <rect
+       style="fill:#c8c8c8;fill-opacity:1;stroke:none;stroke-width:0.42857912;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:10.28589898, 10.28589898;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect815"
+       width="96.08979"
+       height="101.50655"
+       x="37.152374"
+       y="106.72141" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:4.85307503;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 74.434563,136.77191 H 130.96207"
+       id="path819"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path830"
+       d="M 74.434563,136.77191 H 130.96207"
+       style="fill:none;stroke:#ffff00;stroke-width:4.85300016;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:4.85300037, 4.85300037;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:4.85307503;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 40.157243,179.93594 H 96.684755"
+       id="path819-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path830-6"
+       d="M 40.157243,179.93594 H 96.684755"
+       style="fill:none;stroke:#ffff00;stroke-width:4.85300016;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:4.85300042, 4.85300042;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       style="fill:none;stroke:#ff0000;stroke-width:0.50884938;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker1147-3-5);marker-end:url(#Arrow1Lend-7-2)"
+       d="m 73.923064,158.60293 h 24.012"
+       id="path848-3-1"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#ff0000;stroke-width:0.74671692;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.74671694, 0.74671694;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 99.29254,180.05131 V 140.36179"
+       id="path848-36"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#ff0000;stroke-width:0.73786479;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.73786477, 0.73786477;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 72.431955,176.71044 V 137.95636"
+       id="path848-36-0"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/assets/themes/cycle_infra/Cycle_barrier_double_template.svg b/assets/themes/cycle_infra/Cycle_barrier_double_template.svg
new file mode 100644
index 000000000..1ed26983d
--- /dev/null
+++ b/assets/themes/cycle_infra/Cycle_barrier_double_template.svg
@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   width="96.08979mm"
+   height="101.50655mm"
+   viewBox="0 0 96.08979 101.50655"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
+   sodipodi:docname="Cycle_barrier_double_template.svg">
+  <defs
+     id="defs2">
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lend"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path865"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker1147"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path1145"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path832"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:#ffff00;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker1147-3"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path1145-6"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lend-7"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path865-5"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker1147-3-5"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path1145-6-6"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lend-7-2"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path865-5-9"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker1147-2"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path1145-7"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lend-0"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path865-9"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.9899495"
+     inkscape:cx="-46.841867"
+     inkscape:cy="135.5249"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="999"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-37.152374,-106.72141)">
+    <rect
+       style="fill:#c8c8c8;fill-opacity:1;stroke:none;stroke-width:0.42857912;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:10.28589898, 10.28589898;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect815"
+       width="96.08979"
+       height="101.50655"
+       x="37.152374"
+       y="106.72141" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:4.85307503;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 74.434563,136.77191 H 130.96207"
+       id="path819"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path830"
+       d="M 74.434563,136.77191 H 130.96207"
+       style="fill:none;stroke:#ffff00;stroke-width:4.85300016;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:4.85300037, 4.85300037;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:4.85307503;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 40.157243,179.93594 H 96.684755"
+       id="path819-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path830-6"
+       d="M 40.157243,179.93594 H 96.684755"
+       style="fill:none;stroke:#ffff00;stroke-width:4.85300016;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:4.85300042, 4.85300042;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       style="fill:none;stroke:#ff0000;stroke-width:0.69999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker1147);marker-end:url(#Arrow1Lend)"
+       d="M 86.329966,176.10909 V 141.23041"
+       id="path848"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#ff0000;stroke-width:0.66294146;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker1147-3);marker-end:url(#Arrow1Lend-7)"
+       d="m 38.886647,136.77191 h 31.28342"
+       id="path848-3"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#ff0000;stroke-width:0.50884938;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker1147-3-5);marker-end:url(#Arrow1Lend-7-2)"
+       d="m 73.923064,158.60293 h 24.012"
+       id="path848-3-1"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#ff0000;stroke-width:0.74671692;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.74671694, 0.74671694;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 99.29254,180.05131 V 140.36179"
+       id="path848-36"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#ff0000;stroke-width:0.73786479;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.73786477, 0.73786477;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 72.431955,176.71044 V 137.95636"
+       id="path848-36-0"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/assets/themes/cycle_infra/Cycle_barrier_double_width.svg b/assets/themes/cycle_infra/Cycle_barrier_double_width.svg
new file mode 100644
index 000000000..36773aec6
--- /dev/null
+++ b/assets/themes/cycle_infra/Cycle_barrier_double_width.svg
@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   width="96.08979mm"
+   height="101.50655mm"
+   viewBox="0 0 96.08979 101.50655"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
+   sodipodi:docname="Cycle_barrier_double_width.svg">
+  <defs
+     id="defs2">
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lend"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path865"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker1147"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path1145"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path832"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:#ffff00;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker1147-3"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path1145-6"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lend-7"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path865-5"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker1147-3-5"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path1145-6-6"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lend-7-2"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path865-5-9"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker1147-2"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path1145-7"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lend-0"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path865-9"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.9899495"
+     inkscape:cx="-250.89268"
+     inkscape:cy="135.5249"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="999"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-37.152374,-106.72141)">
+    <rect
+       style="fill:#c8c8c8;fill-opacity:1;stroke:none;stroke-width:0.42857912;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:10.28589898, 10.28589898;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect815"
+       width="96.08979"
+       height="101.50655"
+       x="37.152374"
+       y="106.72141" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:4.85307503;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 74.434563,136.77191 H 130.96207"
+       id="path819"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path830"
+       d="M 74.434563,136.77191 H 130.96207"
+       style="fill:none;stroke:#ffff00;stroke-width:4.85300016;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:4.85300037, 4.85300037;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:4.85307503;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 40.157243,179.93594 H 96.684755"
+       id="path819-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path830-6"
+       d="M 40.157243,179.93594 H 96.684755"
+       style="fill:none;stroke:#ffff00;stroke-width:4.85300016;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:4.85300042, 4.85300042;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       style="fill:none;stroke:#ff0000;stroke-width:0.66294146;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker1147-3);marker-end:url(#Arrow1Lend-7)"
+       d="m 38.886647,136.77191 h 31.28342"
+       id="path848-3"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/assets/themes/cycle_infra/cycle_infra.json b/assets/themes/cycle_infra/cycle_infra.json
index dda6b5836..901770305 100644
--- a/assets/themes/cycle_infra/cycle_infra.json
+++ b/assets/themes/cycle_infra/cycle_infra.json
@@ -27,1354 +27,8 @@
   "socialImage": "./assets/themes/cycle_infra/cycle-infra.svg",
   "enableDownload": true,
   "layers": [
-    {
-      "id": "cycleways",
-      "name": {
-        "en": "Cycleways",
-        "nl": "Fietspaden"
-      },
-      "minzoom": 16,
-      "source": {
-        "osmTags": {
-          "or": [
-            "highway=cycleway",
-            "cycleway=lane",
-            "cycleway=shared_lane",
-            "cycleway=track",
-            "cyclestreet=yes",
-            {
-              "and": [
-                "highway=path",
-                "bicycle=designated"
-              ]
-            }
-          ]
-        }
-      },
-      "calculatedTags": [
-        "_comfort_score=feat.score('https://raw.githubusercontent.com/pietervdvn/AspectedRouting/master/Examples/bicycle/aspects/bicycle.comfort.json')"
-      ],
-      "title": {
-        "render": {
-          "en": "Cycleways",
-          "nl": "Fietspaden"
-        },
-        "mappings": [
-          {
-            "if": {
-              "or": [
-                "highway=cycleway",
-                "highway=path"
-              ]
-            },
-            "then": {
-              "nl": "Fietsweg",
-              "en": "Cycleway"
-            }
-          },
-          {
-            "if": "cycleway=shared_lane",
-            "then": {
-              "nl": "Fietssuggestiestrook",
-              "en": "Shared lane"
-            }
-          },
-          {
-            "if": "cycleway=lane",
-            "then": {
-              "nl": "Fietsstrook",
-              "en": "Bike lane"
-            }
-          },
-          {
-            "if": "cycleway=track",
-            "then": {
-              "en": "Cycleway next to the road",
-              "nl": "Fietsweg naast de weg"
-            }
-          },
-          {
-            "if": "cyclestreet=yes",
-            "then": {
-              "nl": "Fietsstraat",
-              "en": "Cyclestreet"
-            }
-          }
-        ]
-      },
-      "description": {},
-      "tagRenderings": [
-        {
-          "question": {
-            "en": "What kind of cycleway is there?",
-            "nl": "Wat voor fietspad is hier?"
-          },
-          "condition": {
-            "and": [
-              "highway!=cycleway",
-              "highway!=path"
-            ]
-          },
-          "mappings": [
-            {
-              "if": "cycleway=shared_lane",
-              "then": {
-                "en": "There is a shared lane",
-                "nl": "Er is een fietssuggestiestrook"
-              }
-            },
-            {
-              "if": "cycleway=lane",
-              "then": {
-                "en": "There is a lane next to the road (seperated with paint)",
-                "nl": "Er is een fietspad aangrenzend aan de weg (gescheiden met verf)"
-              }
-            },
-            {
-              "if": "cycleway=track",
-              "then": {
-                "en": "There is a track, but no cycleway drawn seperately from this road on the map.",
-                "nl": "Er is een fietspad (los van de weg), maar geen fietspad afzonderlijk getekend naast deze weg."
-              }
-            },
-            {
-              "if": "cycleway=seperate",
-              "then": {
-                "en": "There is a seperately drawn cycleway",
-                "nl": "Er is een apart getekend fietspad."
-              }
-            },
-            {
-              "if": "cycleway=no",
-              "then": {
-                "en": "There is no cycleway",
-                "nl": "Er is geen fietspad aanwezig"
-              },
-              "hideInAnswer": "cycleway=opposite"
-            },
-            {
-              "if": "cycleway=no",
-              "then": {
-                "en": "There is no cycleway",
-                "nl": "Er is geen fietspad aanwezig"
-              },
-              "hideInAnswer": "cycleway!=opposite",
-              "addExtraTags": [
-                "oneway:bicycle=no",
-                "fixme=Changed from cycleway=opposite"
-              ]
-            }
-          ]
-        },
-        {
-          "question": {
-            "en": "Is this street lit?",
-            "nl": "Is deze weg verlicht?"
-          },
-          "mappings": [
-            {
-              "if": "lit=yes",
-              "then": {
-                "en": "This street is lit",
-                "nl": "Deze weg is verlicht"
-              }
-            },
-            {
-              "if": "lit=no",
-              "then": {
-                "en": "This road is not lit",
-                "nl": "Deze weg is niet verlicht"
-              }
-            },
-            {
-              "if": "lit=sunset-sunrise",
-              "then": {
-                "en": "This road is lit at night",
-                "nl": "Deze weg is 's nachts verlicht"
-              },
-              "hideInAnswer": true
-            },
-            {
-              "if": "lit=24/7",
-              "then": {
-                "en": "This road is lit 24/7",
-                "nl": "Deze weg is 24/7 verlicht"
-              }
-            }
-          ]
-        },
-        {
-          "question": {
-            "en": "Is this a cyclestreet?",
-            "nl": "Is dit een fietsstraat?"
-          },
-          "condition": {
-            "and": [
-              "highway!=cycleway",
-              "highway!=path"
-            ]
-          },
-          "mappings": [
-            {
-              "if": "cyclestreet=yes",
-              "then": {
-                "en": "This is a cyclestreet, and a 30km/h zone.",
-                "nl": "Dit is een fietsstraat, en dus een 30km/h zone"
-              },
-              "addExtraTags": [
-                "overtaking:motor_vehicle=no",
-                "maxspeed=30"
-              ],
-              "hideInAnswer": "_country!=be"
-            },
-            {
-              "if": "cyclestreet=yes",
-              "then": {
-                "en": "This is a cyclestreet",
-                "nl": "Dit is een fietsstraat"
-              },
-              "hideInAnswer": "_country=be"
-            },
-            {
-              "if": "cyclestreet=",
-              "then": {
-                "en": "This is not a cyclestreet.",
-                "nl": "Dit is geen fietsstraat"
-              },
-              "addExtraTags": [
-                "overtaking:motor_vehicle="
-              ]
-            }
-          ]
-        },
-        {
-          "render": {
-            "en": "The maximum speed on this road is {maxspeed} km/h",
-            "nl": "De maximumsnelheid op deze weg is {maxspeed} km/u"
-          },
-          "freeform": {
-            "key": "maxspeed",
-            "type": "nat"
-          },
-          "condition": {
-            "or": [
-              "cycleway=shared_lane",
-              "cycleway=lane"
-            ]
-          },
-          "mappings": [
-            {
-              "if": "maxspeed=20",
-              "then": {
-                "en": "The maximum speed is 20 km/h",
-                "nl": "De maximumsnelheid is 20 km/u"
-              }
-            },
-            {
-              "if": "maxspeed=30",
-              "then": {
-                "en": "The maximum speed is 30 km/h",
-                "nl": "De maximumsnelheid is 30 km/u"
-              }
-            },
-            {
-              "if": "maxspeed=50",
-              "then": {
-                "en": "The maximum speed is 50 km/h",
-                "nl": "De maximumsnelheid is 50 km/u"
-              }
-            },
-            {
-              "if": "maxspeed=70",
-              "then": {
-                "en": "The maximum speed is 70 km/h",
-                "nl": "De maximumsnelheid is 70 km/u"
-              }
-            },
-            {
-              "if": "maxspeed=90",
-              "then": {
-                "en": "The maximum speed is 90 km/h",
-                "nl": "De maximumsnelheid is 90 km/u"
-              }
-            }
-          ],
-          "question": {
-            "en": "What is the maximum speed in this street?",
-            "nl": "Wat is de maximumsnelheid in deze straat?"
-          }
-        },
-        {
-          "render": {
-            "en": "This cyleway is made of {cycleway:surface}",
-            "nl": "Dit fietspad is gemaakt van {cycleway:surface}"
-          },
-          "freeform": {
-            "key": "cycleway:surface",
-            "addExtraTags": []
-          },
-          "condition": {
-            "or": [
-              "cycleway=shared_lane",
-              "cycleway=lane",
-              "cycleway=track"
-            ]
-          },
-          "mappings": [
-            {
-              "if": "cycleway:surface=unpaved",
-              "then": {
-                "en": "This cycleway is unhardened",
-                "nl": "Dit fietspad is onverhard"
-              },
-              "hideInAnswer": true
-            },
-            {
-              "if": "cycleway:surface=paved",
-              "then": {
-                "en": "This cycleway is paved",
-                "nl": "Dit fietspad is geplaveid"
-              },
-              "hideInAnswer": true
-            },
-            {
-              "if": "cycleway:surface=asphalt",
-              "then": {
-                "en": "This cycleway is made of asphalt",
-                "nl": "Dit fietspad is gemaakt van asfalt"
-              }
-            },
-            {
-              "if": "cycleway:surface=paving_stones",
-              "then": {
-                "en": "This cycleway is made of smooth paving stones",
-                "nl": "Dit fietspad is gemaakt van straatstenen"
-              }
-            },
-            {
-              "if": "cycleway:surface=concrete",
-              "then": {
-                "en": "This cycleway is made of concrete",
-                "nl": "Dit fietspad is gemaakt van beton"
-              }
-            },
-            {
-              "if": "cycleway:surface=cobblestone",
-              "then": {
-                "en": "This cycleway is made of cobblestone (unhewn or sett)",
-                "nl": "Dit fietspad is gemaakt van kasseien (natuurlijk of verwerkt)"
-              },
-              "hideInAnswer": true
-            },
-            {
-              "if": "cycleway:surface=unhewn_cobblestone",
-              "then": {
-                "en": "This cycleway is made of raw, natural cobblestone",
-                "nl": "Dit fietspad is gemaakt van ruwe, natuurlijke kasseien"
-              }
-            },
-            {
-              "if": "cycleway:surface=sett",
-              "then": {
-                "en": "This cycleway is made of flat, square cobblestone",
-                "nl": "Dit fietspad is gemaakt van vlakke, rechthoekige kasseien"
-              }
-            },
-            {
-              "if": "cycleway:surface=wood",
-              "then": {
-                "en": "This cycleway is made of wood",
-                "nl": "Dit fietspad is gemaakt van hout"
-              }
-            },
-            {
-              "if": "cycleway:surface=gravel",
-              "then": {
-                "en": "This cycleway is made of gravel",
-                "nl": "Dit fietspad is gemaakt van grind"
-              }
-            },
-            {
-              "if": "cycleway:surface=fine_gravel",
-              "then": {
-                "en": "This cycleway is made of fine gravel",
-                "nl": "Dit fietspad is gemaakt van fijn grind"
-              }
-            },
-            {
-              "if": "cycleway:surface=pebblestone",
-              "then": {
-                "en": "This cycleway is made of pebblestone",
-                "nl": "Dit fietspad is gemaakt van kiezelsteentjes"
-              }
-            },
-            {
-              "if": "cycleway:surface=ground",
-              "then": {
-                "en": "This cycleway is made from raw ground",
-                "nl": "Dit fietspad is gemaakt van aarde"
-              }
-            }
-          ],
-          "question": {
-            "en": "What is the surface of the cycleway made from?",
-            "nl": "Waaruit is het oppervlak van het fietspad van gemaakt?"
-          }
-        },
-        {
-          "question": {
-            "en": "What is the smoothness of this cycleway?",
-            "nl": "Wat is de kwaliteit van dit fietspad?"
-          },
-          "condition": {
-            "or": [
-              "cycleway=shared_lane",
-              "cycleway=lane",
-              "cycleway=track"
-            ]
-          },
-          "mappings": [
-            {
-              "if": "cycleway:smoothness=excellent",
-              "then": {
-                "en": "Usable for thin rollers: rollerblade, skateboard",
-                "nl": "Geschikt voor fijne rollers: rollerblade, skateboard"
-              }
-            },
-            {
-              "if": "cycleway:smoothness=good",
-              "then": {
-                "en": "Usable for thin wheels: racing bike",
-                "nl": "Geschikt voor fijne wielen: racefiets"
-              }
-            },
-            {
-              "if": "cycleway:smoothness=intermediate",
-              "then": {
-                "en": "Usable for normal wheels: city bike, wheelchair, scooter",
-                "nl": "Geschikt voor normale wielen: stadsfiets, rolstoel, scooter"
-              }
-            },
-            {
-              "if": "cycleway:smoothness=bad",
-              "then": {
-                "en": "Usable for robust wheels: trekking bike, car, rickshaw",
-                "nl": "Geschikt voor brede wielen: trekfiets, auto, rickshaw"
-              }
-            },
-            {
-              "if": "cycleway:smoothness=very_bad",
-              "then": {
-                "en": "Usable for vehicles with high clearance: light duty off-road vehicle",
-                "nl": "Geschikt voor voertuigen met hoge banden: lichte terreinwagen"
-              }
-            },
-            {
-              "if": "cycleway:smoothness=horrible",
-              "then": {
-                "en": "Usable for off-road vehicles: heavy duty off-road vehicle",
-                "nl": "Geschikt voor terreinwagens: zware terreinwagen"
-              }
-            },
-            {
-              "if": "cycleway:smoothness=very_horrible",
-              "then": {
-                "en": "Usable for specialized off-road vehicles: tractor, ATV",
-                "nl": "Geschikt voor gespecialiseerde terreinwagens: tractor, alleterreinwagen"
-              }
-            },
-            {
-              "if": "cycleway:smoothness=impassable",
-              "then": {
-                "en": "Impassable / No wheeled vehicle",
-                "nl": "Niet geschikt voor voertuigen met wielen"
-              }
-            }
-          ]
-        },
-        {
-          "render": {
-            "en": "This road is made of {surface}",
-            "nl": "Deze weg is gemaakt van {surface}"
-          },
-          "freeform": {
-            "key": "surface",
-            "addExtraTags": []
-          },
-          "mappings": [
-            {
-              "if": "surface=unpaved",
-              "then": {
-                "en": "This cycleway is unhardened",
-                "nl": "Dit fietspad is onverhard"
-              },
-              "hideInAnswer": true
-            },
-            {
-              "if": "surface=paved",
-              "then": {
-                "en": "This cycleway is paved",
-                "nl": "Dit fietspad is geplaveid"
-              },
-              "hideInAnswer": true
-            },
-            {
-              "if": "surface=asphalt",
-              "then": {
-                "en": "This cycleway is made of asphalt",
-                "nl": "Dit fietspad is gemaakt van asfalt"
-              }
-            },
-            {
-              "if": "surface=paving_stones",
-              "then": {
-                "en": "This cycleway is made of smooth paving stones",
-                "nl": "Dit fietspad is gemaakt van straatstenen"
-              }
-            },
-            {
-              "if": "surface=concrete",
-              "then": {
-                "en": "This cycleway is made of concrete",
-                "nl": "Dit fietspad is gemaakt van beton"
-              }
-            },
-            {
-              "if": "surface=cobblestone",
-              "then": {
-                "en": "This cycleway is made of cobblestone (unhewn or sett)",
-                "nl": "Dit fietspad is gemaakt van kasseien (natuurlijk of verwerkt)"
-              },
-              "hideInAnswer": true
-            },
-            {
-              "if": "surface=unhewn_cobblestone",
-              "then": {
-                "en": "This cycleway is made of raw, natural cobblestone",
-                "nl": "Dit fietspad is gemaakt van ruwe, natuurlijke kasseien"
-              }
-            },
-            {
-              "if": "surface=sett",
-              "then": {
-                "en": "This cycleway is made of flat, square cobblestone",
-                "nl": "Dit fietspad is gemaakt van vlakke, rechthoekige kasseien"
-              }
-            },
-            {
-              "if": "surface=wood",
-              "then": {
-                "en": "This cycleway is made of wood",
-                "nl": "Dit fietspad is gemaakt van hout"
-              }
-            },
-            {
-              "if": "surface=gravel",
-              "then": {
-                "en": "This cycleway is made of gravel",
-                "nl": "Dit fietspad is gemaakt van grind"
-              }
-            },
-            {
-              "if": "surface=fine_gravel",
-              "then": {
-                "en": "This cycleway is made of fine gravel",
-                "nl": "Dit fietspad is gemaakt van fijn grind"
-              }
-            },
-            {
-              "if": "surface=pebblestone",
-              "then": {
-                "en": "This cycleway is made of pebblestone",
-                "nl": "Dit fietspad is gemaakt van kiezelsteentjes"
-              }
-            },
-            {
-              "if": "surface=ground",
-              "then": {
-                "en": "This cycleway is made from raw ground",
-                "nl": "Dit fietspad is gemaakt van aarde"
-              }
-            }
-          ],
-          "question": {
-            "en": "What is the surface of the street made from?",
-            "nl": "Waaruit is het oppervlak van de straat gemaakt?"
-          }
-        },
-        {
-          "question": {
-            "en": "What is the smoothness of this street?",
-            "nl": "Wat is de kwaliteit van deze straat?"
-          },
-          "condition": {
-            "or": [
-              "cycleway=no",
-              "highway=cycleway"
-            ]
-          },
-          "mappings": [
-            {
-              "if": "smoothness=excellent",
-              "then": {
-                "en": "Usable for thin rollers: rollerblade, skateboard"
-              }
-            },
-            {
-              "if": "smoothness=good",
-              "then": {
-                "en": "Usable for thin wheels: racing bike"
-              }
-            },
-            {
-              "if": "smoothness=intermediate",
-              "then": {
-                "en": "Usable for normal wheels: city bike, wheelchair, scooter"
-              }
-            },
-            {
-              "if": "smoothness=bad",
-              "then": {
-                "en": "Usable for robust wheels: trekking bike, car, rickshaw"
-              }
-            },
-            {
-              "if": "smoothness=very_bad",
-              "then": {
-                "en": "Usable for vehicles with high clearance: light duty off-road vehicle"
-              }
-            },
-            {
-              "if": "smoothness=horrible",
-              "then": {
-                "en": "Usable for off-road vehicles: heavy duty off-road vehicle"
-              }
-            },
-            {
-              "if": "smoothness=very_horrible",
-              "then": {
-                "en": "Usable for specialized off-road vehicles: tractor, ATV"
-              }
-            },
-            {
-              "if": "smoothness=impassable",
-              "then": {
-                "en": "Impassable / No wheeled vehicle"
-              }
-            }
-          ]
-        },
-        {
-          "condition": {
-            "or": [
-              "cycleway=shared_lane",
-              "cycleway=no",
-              "cycleway="
-            ]
-          },
-          "render": {
-            "en": "The carriage width of this road is <strong>{width:carriageway}m</strong>",
-            "nl": "De breedte van deze rijbaan in deze straat is <strong>{width:carriageway}m</strong>"
-          },
-          "freeform": {
-            "key": "width:carriageway",
-            "type": "length",
-            "helperArgs": [
-              "20",
-              "map"
-            ]
-          },
-          "question": {
-            "en": "What is the carriage width of this road (in meters)?",
-            "nl": "Hoe breed is de rijbaan in deze straat (in meters)?"
-          }
-        },
-        {
-          "question": {
-            "en": "What traffic sign does this cycleway have?",
-            "nl": "Welk verkeersbord heeft dit fietspad?"
-          },
-          "condition": {
-            "or": [
-              "cycleway=lane",
-              "cycleway=track"
-            ]
-          },
-          "mappings": [
-            {
-              "if": "cycleway:traffic_sign=BE:D7",
-              "then": {
-                "en": "Compulsory cycleway <img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 3em'>",
-                "nl": "Verplicht fietspad <img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 3em'>"
-              },
-              "hideInAnswer": "_country!=be"
-            },
-            {
-              "if": "cycleway:traffic_sign~BE:D7;.*",
-              "then": {
-                "en": "Compulsory cycleway (with supplementary sign)<br><img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 3em'> ",
-                "nl": "Verplicht fietspad (met onderbord)<br><img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 3em'>"
-              },
-              "hideInAnswer": true
-            },
-            {
-              "if": "cycleway:traffic_sign=BE:D9",
-              "then": {
-                "en": "Segregated foot/cycleway <img src='./assets/themes/cycle_infra/Belgian_road_sign_D09.svg' style='width: 3em'>",
-                "nl": "Afgescheiden voet-/fietspad <img src='./assets/themes/cycle_infra/Belgian_road_sign_D09.svg' style='width: 3em'>"
-              },
-              "hideInAnswer": "_country!=be",
-              "addExtraTags": [
-                "cycleway:foot=designated",
-                "cycleway:segregated=yes"
-              ]
-            },
-            {
-              "if": "cycleway:traffic_sign=BE:D10",
-              "then": {
-                "en": "Unsegregated foot/cycleway <img src='./assets/themes/cycle_infra/Belgian_road_sign_D10.svg' style='width: 3em'>",
-                "nl": "Gedeeld voet-/fietspad <img src='./assets/themes/cycle_infra/Belgian_road_sign_D10.svg' style='width: 3em'>"
-              },
-              "hideInAnswer": "_country!=be",
-              "addExtraTags": [
-                "cycleway:foot=designated",
-                "cycleway:segregated=no"
-              ]
-            },
-            {
-              "if": "cycleway:traffic_sign=none",
-              "then": {
-                "en": "No traffic sign present",
-                "nl": "Geen verkeersbord aanwezig"
-              }
-            }
-          ]
-        },
-        {
-          "question": {
-            "en": "What traffic sign does this cycleway have?",
-            "nl": "Welk verkeersbord heeft dit fietspad?"
-          },
-          "condition": {
-            "or": [
-              "highway=cycleway",
-              "highway=path"
-            ]
-          },
-          "mappings": [
-            {
-              "if": "traffic_sign=BE:D7",
-              "then": {
-                "en": "Compulsory cycleway <img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 3em'>",
-                "nl": "Verplicht fietspad <img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 3em'>"
-              },
-              "hideInAnswer": "_country!=be",
-              "addExtraTags": [
-                "bicycle=designated",
-                "mofa=designated",
-                "moped=yes",
-                "speed_pedelec=yes"
-              ]
-            },
-            {
-              "if": "traffic_sign~BE:D7;.*",
-              "then": {
-                "en": "Compulsory cycleway (with supplementary sign)<br><img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 3em'> ",
-                "nl": "Verplicht fietspad (met onderbord)<br><img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 3em'>"
-              },
-              "hideInAnswer": true
-            },
-            {
-              "if": "traffic_sign=BE:D9",
-              "then": {
-                "en": "Segregated foot/cycleway <img src='./assets/themes/cycle_infra/Belgian_road_sign_D09.svg' style='width: 3em'>",
-                "nl": "Afgescheiden voet-/fietspad <img src='./assets/themes/cycle_infra/Belgian_road_sign_D09.svg' style='width: 3em'>"
-              },
-              "hideInAnswer": "_country!=be",
-              "addExtraTags": [
-                "foot=designated",
-                "bicycle=designated",
-                "mofa=designated",
-                "moped=no",
-                "speed_pedelec=no",
-                "segregated=yes"
-              ]
-            },
-            {
-              "if": "traffic_sign=BE:D10",
-              "then": {
-                "en": "Unsegregated foot/cycleway <img src='./assets/themes/cycle_infra/Belgian_road_sign_D10.svg' style='width: 3em'>",
-                "nl": "Gedeeld voet-/fietspad <img src='./assets/themes/cycle_infra/Belgian_road_sign_D10.svg' style='width: 3em'>"
-              },
-              "hideInAnswer": "_country!=be",
-              "addExtraTags": [
-                "foot=designated",
-                "bicycle=designated",
-                "mofa=designated",
-                "moped=no",
-                "speed_pedelec=no",
-                "segregated=no"
-              ]
-            },
-            {
-              "if": "traffic_sign=none",
-              "then": {
-                "en": "No traffic sign present",
-                "nl": "Geen verkeersbord aanwezig"
-              }
-            }
-          ]
-        },
-        {
-          "question": {
-            "en": "Does the traffic sign D7 (<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 1.5em'>) have a supplementary sign?",
-            "nl": "Heeft het verkeersbord D7 (<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 1.5em'>) een onderbord?"
-          },
-          "condition": {
-            "or": [
-              "cycleway:traffic_sign=BE:D7",
-              "cycleway:traffic_sign~BE:D7;.*"
-            ]
-          },
-          "mappings": [
-            {
-              "if": "cycleway:traffic_sign=BE:D7;BE:M6",
-              "then": {
-                "en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M6.svg' style='width: 3em'>",
-                "nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M6.svg' style='width: 3em'>"
-              },
-              "hideInAnswer": "_country!=be",
-              "addExtraTags": [
-                "cycleway:moped=designated"
-              ]
-            },
-            {
-              "if": "cycleway:traffic_sign=BE:D7;BE:M13",
-              "then": {
-                "en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M13.svg' style='width: 3em'>",
-                "nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M13.svg' style='width: 3em'>"
-              },
-              "hideInAnswer": "_country!=be",
-              "addExtraTags": [
-                "cycleway:speed_pedelec=designated"
-              ]
-            },
-            {
-              "if": "cycleway:traffic_sign=BE:D7;BE:M14",
-              "then": {
-                "en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M14.svg' style='width: 3em'>",
-                "nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M14.svg' style='width: 3em'>"
-              },
-              "hideInAnswer": "_country!=be",
-              "addExtraTags": [
-                "cycleway:moped=designated",
-                "cycleway:speed_pedelec=designated"
-              ]
-            },
-            {
-              "if": "cycleway:traffic_sign=BE:D7;BE:M7",
-              "then": {
-                "en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M7.svg' style='width: 3em'>",
-                "nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M7.svg' style='width: 3em'>"
-              },
-              "hideInAnswer": "_country!=be",
-              "addExtraTags": [
-                "cycleway:moped=no"
-              ]
-            },
-            {
-              "if": "cycleway:traffic_sign=BE:D7;BE:M15",
-              "then": {
-                "en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M15.svg' style='width: 3em'>",
-                "nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M15.svg' style='width: 3em'>"
-              },
-              "hideInAnswer": "_country!=be",
-              "addExtraTags": [
-                "cycleway:speed_pedelec=no"
-              ]
-            },
-            {
-              "if": "cycleway:traffic_sign=BE:D7;BE:M16",
-              "then": {
-                "en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M16.svg' style='width: 3em'>",
-                "nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M16.svg' style='width: 3em'>"
-              },
-              "hideInAnswer": "_country!=be",
-              "addExtraTags": [
-                "cycleway:moped=designated",
-                "cycleway:speed_pedelec=no"
-              ]
-            },
-            {
-              "if": "cycleway:traffic_sign:supplementary=none",
-              "then": {
-                "en": "No supplementary traffic sign present",
-                "nl": "Geen onderbord aanwezig"
-              }
-            }
-          ]
-        },
-        {
-          "question": {
-            "en": "Does the traffic sign D7 (<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 1.5em'>) have a supplementary sign?",
-            "nl": "Heeft het verkeersbord D7 (<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 1.5em'>) een onderbord?"
-          },
-          "condition": {
-            "or": [
-              "traffic_sign=BE:D7",
-              "traffic_sign~BE:D7;.*"
-            ]
-          },
-          "mappings": [
-            {
-              "if": "traffic_sign=BE:D7;BE:M6",
-              "then": {
-                "en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M6.svg' style='width: 3em'>",
-                "nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M6.svg' style='width: 3em'>"
-              },
-              "hideInAnswer": "_country!=be",
-              "addExtraTags": [
-                "moped=designated"
-              ]
-            },
-            {
-              "if": "traffic_sign=BE:D7;BE:M13",
-              "then": {
-                "en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M13.svg' style='width: 3em'>",
-                "nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M13.svg' style='width: 3em'>"
-              },
-              "hideInAnswer": "_country!=be",
-              "addExtraTags": [
-                "speed_pedelec=designated"
-              ]
-            },
-            {
-              "if": "traffic_sign=BE:D7;BE:M14",
-              "then": {
-                "en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M14.svg' style='width: 3em'>",
-                "nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M14.svg' style='width: 3em'>"
-              },
-              "hideInAnswer": "_country!=be",
-              "addExtraTags": [
-                "moped=designated",
-                "speed_pedelec=designated"
-              ]
-            },
-            {
-              "if": "traffic_sign=BE:D7;BE:M7",
-              "then": {
-                "en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M7.svg' style='width: 3em'>",
-                "nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M7.svg' style='width: 3em'>"
-              },
-              "hideInAnswer": "_country!=be",
-              "addExtraTags": [
-                "moped=no"
-              ]
-            },
-            {
-              "if": ":traffic_sign=BE:D7;BE:M15",
-              "then": {
-                "en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M15.svg' style='width: 3em'>",
-                "nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M15.svg' style='width: 3em'>"
-              },
-              "hideInAnswer": "_country!=be",
-              "addExtraTags": [
-                "speed_pedelec=no"
-              ]
-            },
-            {
-              "if": "traffic_sign=BE:D7;BE:M16",
-              "then": {
-                "en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M16.svg' style='width: 3em'>",
-                "nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M16.svg' style='width: 3em'>"
-              },
-              "hideInAnswer": "_country!=be",
-              "addExtraTags": [
-                "moped=designated",
-                "speed_pedelec=no"
-              ]
-            },
-            {
-              "if": "traffic_sign:supplementary=none",
-              "then": {
-                "en": "No supplementary traffic sign present",
-                "nl": "Geen onderbord aanwezig"
-              }
-            }
-          ]
-        },
-        {
-          "render": {
-            "en": "The buffer besides this cycleway is {cycleway:buffer} m",
-            "nl": "De schrikafstand van dit fietspad is {cycleway:buffer} m"
-          },
-          "question": {
-            "en": "How wide is the gap between the cycleway and the road?",
-            "nl": "Hoe breed is de ruimte tussen het fietspad en de weg?"
-          },
-          "condition": {
-            "or": [
-              "cycleway=track",
-              "cycleway=lane"
-            ]
-          },
-          "freeform": {
-            "key": "cycleway:buffer",
-            "type": "length",
-            "helperArgs": [
-              "20",
-              "map"
-            ]
-          }
-        },
-        {
-          "question": {
-            "en": "How is this cycleway seperated from the road?",
-            "nl": "Hoe is dit fietspad gescheiden van de weg?"
-          },
-          "condition": {
-            "or": [
-              "cycleway=track",
-              "cycleway=lane"
-            ]
-          },
-          "mappings": [
-            {
-              "if": "cycleway:seperation=dashed_line",
-              "then": {
-                "en": "This cycleway is seperated by a dashed line",
-                "nl": "Dit fietspad is gescheiden van de weg met een onderbroken streep"
-              }
-            },
-            {
-              "if": "cycleway:seperation=solid_line",
-              "then": {
-                "en": "This cycleway is seperated by a solid line",
-                "nl": "Dit fietspad is gescheiden van de weg met een doorgetrokken streep"
-              }
-            },
-            {
-              "if": "cycleway:seperation=parking_lane",
-              "then": {
-                "en": "This cycleway is seperated by a parking lane",
-                "nl": "Dit fietspad is gescheiden van de weg met parkeervakken"
-              }
-            },
-            {
-              "if": "cycleway:seperation=kerb",
-              "then": {
-                "en": "This cycleway is seperated by a kerb",
-                "nl": "Dit fietspad is gescheiden van de weg met een stoeprand"
-              }
-            }
-          ]
-        },
-        {
-          "question": {
-            "en": "How is this cycleway seperated from the road?",
-            "nl": "Hoe is dit fietspad gescheiden van de weg?"
-          },
-          "condition": {
-            "or": [
-              "highway=cycleway",
-              "highway=path"
-            ]
-          },
-          "mappings": [
-            {
-              "if": "seperation=dashed_line",
-              "then": {
-                "en": "This cycleway is seperated by a dashed line",
-                "nl": "Dit fietspad is gescheiden van de weg met een onderbroken streep"
-              }
-            },
-            {
-              "if": "seperation=solid_line",
-              "then": {
-                "en": "This cycleway is seperated by a solid line",
-                "nl": "Dit fietspad is gescheiden van de weg met een doorgetrokken streep"
-              }
-            },
-            {
-              "if": "seperation=parking_lane",
-              "then": {
-                "en": "This cycleway is seperated by a parking lane",
-                "nl": "Dit fietspad is gescheiden van de weg met parkeervakken"
-              }
-            },
-            {
-              "if": "seperation=kerb",
-              "then": {
-                "en": "This cycleway is seperated by a kerb",
-                "nl": "Dit fietspad is gescheiden van de weg met een stoeprand"
-              }
-            }
-          ]
-        }
-      ],
-      "icon": {
-        "render": "./assets/themes/cycle_infra/bicycleway.svg"
-      },
-      "width": {
-        "render": "8"
-      },
-      "iconSize": {
-        "render": "40,40,center"
-      },
-      "color": {
-        "render": "rgba(170, 170, 170, 0.7)",
-        "mappings": [
-          {
-            "if": "highway=cycleway",
-            "then": "rgba(0, 189, 141, 0.7)"
-          },
-          {
-            "if": "highway=path",
-            "then": "rgba(204, 74, 207, 0.7)"
-          },
-          {
-            "if": "cycleway=track",
-            "then": "rgba(113, 3, 200, 0.7)"
-          },
-          {
-            "if": "cycleway=shared_lane",
-            "then": "rgba(74, 59, 247, 0.7)"
-          },
-          {
-            "if": "cycleway=lane",
-            "then": "rgba(254, 155, 6, 0.9)"
-          },
-          {
-            "if": "cyclestreet=yes",
-            "then": "rgba(57, 159, 191, 0.7)"
-          }
-        ]
-      },
-      "dashArray": {
-        "render": "",
-        "mappings": [
-          {
-            "if": {
-              "or": [
-                "oneway=yes",
-                {
-                  "or": [
-                    "highway=cycleway",
-                    "highway=path"
-                  ]
-                }
-              ]
-            },
-            "then": ""
-          },
-          {
-            "if": "cycleway=track",
-            "then": ""
-          },
-          {
-            "if": "cycleway=shared_lane",
-            "then": "15 30"
-          },
-          {
-            "if": "cycleway=lane",
-            "then": "25 15 15 15 25"
-          },
-          {
-            "if": "cyclestreet=yes",
-            "then": ""
-          }
-        ]
-      },
-      "presets": []
-    },
-    {
-      "id": "all_streets",
-      "name": {
-        "nl": "Alle straten",
-        "en": "All streets"
-      },
-      "description": {
-        "nl": "Laag waar je nieuwe fietspaden kan aanduiden",
-        "en": "Layer to mark new cycleways"
-      },
-      "source": {
-        "osmTags": {
-          "or": [
-            "highway=residential",
-            "highway=tertiary",
-            "highway=unclassified",
-            "highway=primary",
-            "highway=secondary"
-          ]
-        }
-      },
-      "calculatedTags": [
-        "_comfort_score=feat.score('https://raw.githubusercontent.com/pietervdvn/AspectedRouting/master/Examples/bicycle/aspects/bicycle.comfort.json')"
-      ],
-      "minzoom": 16,
-      "wayHandling": 0,
-      "title": {
-        "render": {
-          "nl": "Straat",
-          "en": "Street"
-        },
-        "mappings": [
-          {
-            "if": "name~*",
-            "then": "{name}"
-          }
-        ]
-      },
-      "icon": "./assets/themes/cycle_infra/street.svg",
-      "width": "5",
-      "color": {
-        "render": "rgba(170, 170, 170, 0.7)",
-        "mappings": []
-      },
-      "tagRenderings": [
-        {
-          "freeform": {
-            "key": "cycleway",
-            "addExtraTags": []
-          },
-          "question": {
-            "en": "Is there a cycleway?",
-            "nl": "Is er een fietspad?"
-          },
-          "condition": {
-            "and": [
-              "highway!=cycleway",
-              "highway!=path"
-            ]
-          },
-          "mappings": [
-            {
-              "if": "cycleway=shared_lane",
-              "then": {
-                "en": "There is a shared lane",
-                "nl": "Er is een fietssugestiestrook"
-              }
-            },
-            {
-              "if": "cycleway=lane",
-              "then": {
-                "en": "There is a lane next to the road (seperated with paint)",
-                "nl": "Er is een fietspad aangrenzend aan de weg (gescheiden met verf)"
-              }
-            },
-            {
-              "if": "cycleway=track",
-              "then": {
-                "en": "There is a track, but no cycleway drawn seperately from this road on the map.",
-                "nl": "Er is een fietspad (los van de weg), maar geen fietspad afzonderlijk getekend naast deze weg."
-              }
-            },
-            {
-              "if": "cycleway=seperate",
-              "then": {
-                "en": "There is a seperately drawn cycleway",
-                "nl": "Er is een apart getekend fietspad."
-              }
-            },
-            {
-              "if": "cycleway=",
-              "then": {
-                "en": "There is no cycleway known here",
-                "nl": "Er is geen fietspad bekend hier"
-              },
-              "hideInAnswer": true
-            },
-            {
-              "if": "cycleway=no",
-              "then": {
-                "en": "There is no cycleway",
-                "nl": "Er is geen fietspad aanwezig"
-              },
-              "hideInAnswer": "cycleway=opposite"
-            },
-            {
-              "if": "cycleway=no",
-              "then": {
-                "en": "There is no cycleway",
-                "nl": "Er is geen fietspad aanwezig"
-              },
-              "hideInAnswer": "cycleway!=opposite",
-              "addExtraTags": [
-                "oneway:bicycle=no",
-                "fixme=Changed from cycleway=opposite"
-              ]
-            }
-          ],
-          "render": {
-            "en": "Unknown cycleway situation",
-            "nl": "Onbekende fietspad situatie"
-          }
-        },
-        {
-          "question": {
-            "en": "Is this a cyclestreet?",
-            "nl": "Is dit een fietsstraat?"
-          },
-          "condition": {
-            "and": [
-              "highway!=cycleway",
-              "highway!=path"
-            ]
-          },
-          "mappings": [
-            {
-              "if": "cyclestreet=yes",
-              "then": {
-                "en": "This is a cyclestreet, and a 30km/h zone.",
-                "nl": "Dit is een fietsstraat, en dus een 30km/h zone"
-              },
-              "addExtraTags": [
-                "overtaking:motor_vehicle=no",
-                "maxspeed=30"
-              ],
-              "hideInAnswer": "_country!=be"
-            },
-            {
-              "if": "cyclestreet=yes",
-              "then": {
-                "en": "This is a cyclestreet",
-                "nl": "Dit is een fietsstraat"
-              },
-              "hideInAnswer": "_country=be"
-            },
-            {
-              "if": "cyclestreet=",
-              "then": {
-                "en": "This is not a cyclestreet.",
-                "nl": "Dit is geen fietsstraat"
-              },
-              "addExtraTags": [
-                "overtaking:motor_vehicle="
-              ]
-            }
-          ]
-        },
-        {
-          "render": {
-            "en": "The carriage width of this road is <strong>{width:carriageway}m</strong>",
-            "nl": "De breedte van deze rijbaan in deze straat is <strong>{width:carriageway}m</strong>"
-          },
-          "freeform": {
-            "key": "width:carriageway",
-            "type": "length",
-            "helperArgs": [
-              "20",
-              "map"
-            ]
-          },
-          "question": {
-            "en": "What is the carriage width of this road (in meters)?<br/><span class='subtle'>This is measured from kerb to kerb, including parking lanes</span>",
-            "nl": "Hoe breed is de rijbaan in deze straat (in meters)?<br/><span class='subtle'>Gemeten van stoepsteen tot stoepsten, inclusief parkeerstroken</span>"
-          }
-        }
-      ]
-    },
- "barrier",
+    "cycleways_and_roads",
+    "barrier",
     "crossings"
   ]
 }
\ No newline at end of file
diff --git a/assets/themes/cycle_infra/license_info.json b/assets/themes/cycle_infra/license_info.json
index bd6a9f2bb..0fb9fe39e 100644
--- a/assets/themes/cycle_infra/license_info.json
+++ b/assets/themes/cycle_infra/license_info.json
@@ -1,4 +1,52 @@
 [
+  {
+    "authors": [
+      "Pieter Vander Vennet"
+    ],
+    "path": "Cycle_barrier_double.svg",
+    "license": "CC0",
+    "sources": []
+  },
+  {
+    "authors": [
+      "Pieter Vander Vennet"
+    ],
+    "path": "Cycle_barrier_double_length.png",
+    "license": "CC0",
+    "sources": []
+  },
+  {
+    "authors": [
+      "Pieter Vander Vennet"
+    ],
+    "path": "Cycle_barrier_double_length.svg",
+    "license": "CC0",
+    "sources": []
+  },
+  {
+    "authors": [
+      "Pieter Vander Vennet"
+    ],
+    "path": "Cycle_barrier_double_overlap.svg",
+    "license": "CC0",
+    "sources": []
+  },
+  {
+    "authors": [
+      "Pieter Vander Vennet"
+    ],
+    "path": "Cycle_barrier_double_template.svg",
+    "license": "CC0",
+    "sources": []
+  },
+  {
+    "authors": [
+      "Pieter Vander Vennet"
+    ],
+    "path": "Cycle_barrier_double_width.svg",
+    "license": "CC0",
+    "sources": []
+  },
   {
     "authors": [
       "Dávid Gladiš",
diff --git a/langs/layers/en.json b/langs/layers/en.json
index eedf2dbdb..3bf5ff4ca 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -919,6 +919,388 @@
             }
         }
     },
+    "cycleways_and_roads": {
+        "name": "Cycleways and roads",
+        "title": {
+            "render": "Cycleways",
+            "mappings": {
+                "0": {
+                    "then": "Cycleway"
+                },
+                "1": {
+                    "then": "Shared lane"
+                },
+                "2": {
+                    "then": "Bike lane"
+                },
+                "3": {
+                    "then": "Cycleway next to the road"
+                },
+                "4": {
+                    "then": "Cyclestreet"
+                }
+            }
+        },
+        "tagRenderings": {
+            "0": {
+                "question": "What kind of cycleway is here?",
+                "mappings": {
+                    "0": {
+                        "then": "There is a shared lane"
+                    },
+                    "1": {
+                        "then": "There is a lane next to the road (seperated with paint)"
+                    },
+                    "2": {
+                        "then": "There is a track, but no cycleway drawn seperately from this road on the map."
+                    },
+                    "3": {
+                        "then": "There is a seperately drawn cycleway"
+                    },
+                    "4": {
+                        "then": "There is no cycleway"
+                    },
+                    "5": {
+                        "then": "There is no cycleway"
+                    }
+                }
+            },
+            "1": {
+                "question": "Is this street lit?",
+                "mappings": {
+                    "0": {
+                        "then": "This street is lit"
+                    },
+                    "1": {
+                        "then": "This road is not lit"
+                    },
+                    "2": {
+                        "then": "This road is lit at night"
+                    },
+                    "3": {
+                        "then": "This road is lit 24/7"
+                    }
+                }
+            },
+            "2": {
+                "question": "Is this a cyclestreet?",
+                "mappings": {
+                    "0": {
+                        "then": "This is a cyclestreet, and a 30km/h zone."
+                    },
+                    "1": {
+                        "then": "This is a cyclestreet"
+                    },
+                    "2": {
+                        "then": "This is not a cyclestreet."
+                    }
+                }
+            },
+            "3": {
+                "render": "The maximum speed on this road is {maxspeed} km/h",
+                "mappings": {
+                    "0": {
+                        "then": "The maximum speed is 20 km/h"
+                    },
+                    "1": {
+                        "then": "The maximum speed is 30 km/h"
+                    },
+                    "2": {
+                        "then": "The maximum speed is 50 km/h"
+                    },
+                    "3": {
+                        "then": "The maximum speed is 70 km/h"
+                    },
+                    "4": {
+                        "then": "The maximum speed is 90 km/h"
+                    }
+                },
+                "question": "What is the maximum speed in this street?"
+            },
+            "4": {
+                "render": "This cyleway is made of {cycleway:surface}",
+                "mappings": {
+                    "0": {
+                        "then": "This cycleway is unpaved"
+                    },
+                    "1": {
+                        "then": "This cycleway is paved"
+                    },
+                    "2": {
+                        "then": "This cycleway is made of asphalt"
+                    },
+                    "3": {
+                        "then": "This cycleway is made of smooth paving stones"
+                    },
+                    "4": {
+                        "then": "This cycleway is made of concrete"
+                    },
+                    "5": {
+                        "then": "This cycleway is made of cobblestone (unhewn or sett)"
+                    },
+                    "6": {
+                        "then": "This cycleway is made of raw, natural cobblestone"
+                    },
+                    "7": {
+                        "then": "This cycleway is made of flat, square cobblestone"
+                    },
+                    "8": {
+                        "then": "This cycleway is made of wood"
+                    },
+                    "9": {
+                        "then": "This cycleway is made of gravel"
+                    },
+                    "10": {
+                        "then": "This cycleway is made of fine gravel"
+                    },
+                    "11": {
+                        "then": "This cycleway is made of pebblestone"
+                    },
+                    "12": {
+                        "then": "This cycleway is made from raw ground"
+                    }
+                },
+                "question": "What is the surface of the cycleway made from?"
+            },
+            "5": {
+                "question": "What is the smoothness of this cycleway?",
+                "mappings": {
+                    "0": {
+                        "then": "Usable for thin rollers: rollerblade, skateboard"
+                    },
+                    "1": {
+                        "then": "Usable for thin wheels: racing bike"
+                    },
+                    "2": {
+                        "then": "Usable for normal wheels: city bike, wheelchair, scooter"
+                    },
+                    "3": {
+                        "then": "Usable for robust wheels: trekking bike, car, rickshaw"
+                    },
+                    "4": {
+                        "then": "Usable for vehicles with high clearance: light duty off-road vehicle"
+                    },
+                    "5": {
+                        "then": "Usable for off-road vehicles: heavy duty off-road vehicle"
+                    },
+                    "6": {
+                        "then": "Usable for specialized off-road vehicles: tractor, ATV"
+                    },
+                    "7": {
+                        "then": "Impassable / No wheeled vehicle"
+                    }
+                }
+            },
+            "6": {
+                "render": "This road is made of {surface}",
+                "mappings": {
+                    "0": {
+                        "then": "This cycleway is unhardened"
+                    },
+                    "1": {
+                        "then": "This cycleway is paved"
+                    },
+                    "2": {
+                        "then": "This cycleway is made of asphalt"
+                    },
+                    "3": {
+                        "then": "This cycleway is made of smooth paving stones"
+                    },
+                    "4": {
+                        "then": "This cycleway is made of concrete"
+                    },
+                    "5": {
+                        "then": "This cycleway is made of cobblestone (unhewn or sett)"
+                    },
+                    "6": {
+                        "then": "This cycleway is made of raw, natural cobblestone"
+                    },
+                    "7": {
+                        "then": "This cycleway is made of flat, square cobblestone"
+                    },
+                    "8": {
+                        "then": "This cycleway is made of wood"
+                    },
+                    "9": {
+                        "then": "This cycleway is made of gravel"
+                    },
+                    "10": {
+                        "then": "This cycleway is made of fine gravel"
+                    },
+                    "11": {
+                        "then": "This cycleway is made of pebblestone"
+                    },
+                    "12": {
+                        "then": "This cycleway is made from raw ground"
+                    }
+                },
+                "question": "What is the surface of the street made from?"
+            },
+            "7": {
+                "question": "What is the smoothness of this street?",
+                "mappings": {
+                    "0": {
+                        "then": "Usable for thin rollers: rollerblade, skateboard"
+                    },
+                    "1": {
+                        "then": "Usable for thin wheels: racing bike"
+                    },
+                    "2": {
+                        "then": "Usable for normal wheels: city bike, wheelchair, scooter"
+                    },
+                    "3": {
+                        "then": "Usable for robust wheels: trekking bike, car, rickshaw"
+                    },
+                    "4": {
+                        "then": "Usable for vehicles with high clearance: light duty off-road vehicle"
+                    },
+                    "5": {
+                        "then": "Usable for off-road vehicles: heavy duty off-road vehicle"
+                    },
+                    "6": {
+                        "then": "Usable for specialized off-road vehicles: tractor, ATV"
+                    },
+                    "7": {
+                        "then": "Impassable / No wheeled vehicle"
+                    }
+                }
+            },
+            "8": {
+                "render": "The carriage width of this road is <strong>{width:carriageway}m</strong>",
+                "question": "What is the carriage width of this road (in meters)?"
+            },
+            "9": {
+                "question": "What traffic sign does this cycleway have?",
+                "mappings": {
+                    "0": {
+                        "then": "Compulsory cycleway <img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 3em'>"
+                    },
+                    "1": {
+                        "then": "Compulsory cycleway (with supplementary sign)<br><img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 3em'> "
+                    },
+                    "2": {
+                        "then": "Segregated foot/cycleway <img src='./assets/themes/cycle_infra/Belgian_road_sign_D09.svg' style='width: 3em'>"
+                    },
+                    "3": {
+                        "then": "Unsegregated foot/cycleway <img src='./assets/themes/cycle_infra/Belgian_road_sign_D10.svg' style='width: 3em'>"
+                    },
+                    "4": {
+                        "then": "No traffic sign present"
+                    }
+                }
+            },
+            "10": {
+                "question": "What traffic sign does this cycleway have?",
+                "mappings": {
+                    "0": {
+                        "then": "Compulsory cycleway <img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 3em'>"
+                    },
+                    "1": {
+                        "then": "Compulsory cycleway (with supplementary sign)<br><img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 3em'> "
+                    },
+                    "2": {
+                        "then": "Segregated foot/cycleway <img src='./assets/themes/cycle_infra/Belgian_road_sign_D09.svg' style='width: 3em'>"
+                    },
+                    "3": {
+                        "then": "Unsegregated foot/cycleway <img src='./assets/themes/cycle_infra/Belgian_road_sign_D10.svg' style='width: 3em'>"
+                    },
+                    "4": {
+                        "then": "No traffic sign present"
+                    }
+                }
+            },
+            "11": {
+                "question": "Does the traffic sign D7 (<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 1.5em'>) have a supplementary sign?",
+                "mappings": {
+                    "0": {
+                        "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M6.svg' style='width: 3em'>"
+                    },
+                    "1": {
+                        "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M13.svg' style='width: 3em'>"
+                    },
+                    "2": {
+                        "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M14.svg' style='width: 3em'>"
+                    },
+                    "3": {
+                        "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M7.svg' style='width: 3em'>"
+                    },
+                    "4": {
+                        "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M15.svg' style='width: 3em'>"
+                    },
+                    "5": {
+                        "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M16.svg' style='width: 3em'>"
+                    },
+                    "6": {
+                        "then": "No supplementary traffic sign present"
+                    }
+                }
+            },
+            "12": {
+                "question": "Does the traffic sign D7 (<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 1.5em'>) have a supplementary sign?",
+                "mappings": {
+                    "0": {
+                        "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M6.svg' style='width: 3em'>"
+                    },
+                    "1": {
+                        "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M13.svg' style='width: 3em'>"
+                    },
+                    "2": {
+                        "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M14.svg' style='width: 3em'>"
+                    },
+                    "3": {
+                        "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M7.svg' style='width: 3em'>"
+                    },
+                    "4": {
+                        "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M15.svg' style='width: 3em'>"
+                    },
+                    "5": {
+                        "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M16.svg' style='width: 3em'>"
+                    },
+                    "6": {
+                        "then": "No supplementary traffic sign present"
+                    }
+                }
+            },
+            "13": {
+                "render": "The buffer besides this cycleway is {cycleway:buffer} m",
+                "question": "How wide is the gap between the cycleway and the road?"
+            },
+            "14": {
+                "question": "How is this cycleway seperated from the road?",
+                "mappings": {
+                    "0": {
+                        "then": "This cycleway is seperated by a dashed line"
+                    },
+                    "1": {
+                        "then": "This cycleway is seperated by a solid line"
+                    },
+                    "2": {
+                        "then": "This cycleway is seperated by a parking lane"
+                    },
+                    "3": {
+                        "then": "This cycleway is seperated by a kerb"
+                    }
+                }
+            },
+            "15": {
+                "question": "How is this cycleway seperated from the road?",
+                "mappings": {
+                    "0": {
+                        "then": "This cycleway is seperated by a dashed line"
+                    },
+                    "1": {
+                        "then": "This cycleway is seperated by a solid line"
+                    },
+                    "2": {
+                        "then": "This cycleway is seperated by a parking lane"
+                    },
+                    "3": {
+                        "then": "This cycleway is seperated by a kerb"
+                    }
+                }
+            }
+        }
+    },
     "defibrillator": {
         "name": "Defibrillators",
         "title": {
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index d106d87b4..7b80a63d7 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -1008,6 +1008,362 @@
             }
         }
     },
+    "cycleways_and_roads": {
+        "name": "Fietspaden, straten en wegen",
+        "title": {
+            "render": "Fietspaden",
+            "mappings": {
+                "0": {
+                    "then": "Fietsweg"
+                },
+                "1": {
+                    "then": "Fietssuggestiestrook"
+                },
+                "2": {
+                    "then": "Fietsstrook"
+                },
+                "3": {
+                    "then": "Fietsweg naast de weg"
+                },
+                "4": {
+                    "then": "Fietsstraat"
+                }
+            }
+        },
+        "tagRenderings": {
+            "0": {
+                "question": "Wat voor fietspad is hier?",
+                "mappings": {
+                    "0": {
+                        "then": "Er is een fietssuggestiestrook"
+                    },
+                    "1": {
+                        "then": "Er is een fietspad aangrenzend aan de weg (gescheiden met verf)"
+                    },
+                    "2": {
+                        "then": "Er is een fietspad (los van de weg), maar geen fietspad afzonderlijk getekend naast deze weg."
+                    },
+                    "3": {
+                        "then": "Er is een apart getekend fietspad."
+                    },
+                    "4": {
+                        "then": "Er is geen fietspad aanwezig"
+                    },
+                    "5": {
+                        "then": "Er is geen fietspad aanwezig"
+                    }
+                }
+            },
+            "1": {
+                "question": "Is deze weg verlicht?",
+                "mappings": {
+                    "0": {
+                        "then": "Deze weg is verlicht"
+                    },
+                    "1": {
+                        "then": "Deze weg is niet verlicht"
+                    },
+                    "2": {
+                        "then": "Deze weg is 's nachts verlicht"
+                    },
+                    "3": {
+                        "then": "Deze weg is 24/7 verlicht"
+                    }
+                }
+            },
+            "2": {
+                "question": "Is dit een fietsstraat?",
+                "mappings": {
+                    "0": {
+                        "then": "Dit is een fietsstraat, en dus een 30km/h zone"
+                    },
+                    "1": {
+                        "then": "Dit is een fietsstraat"
+                    },
+                    "2": {
+                        "then": "Dit is geen fietsstraat"
+                    }
+                }
+            },
+            "3": {
+                "render": "De maximumsnelheid op deze weg is {maxspeed} km/u",
+                "mappings": {
+                    "0": {
+                        "then": "De maximumsnelheid is 20 km/u"
+                    },
+                    "1": {
+                        "then": "De maximumsnelheid is 30 km/u"
+                    },
+                    "2": {
+                        "then": "De maximumsnelheid is 50 km/u"
+                    },
+                    "3": {
+                        "then": "De maximumsnelheid is 70 km/u"
+                    },
+                    "4": {
+                        "then": "De maximumsnelheid is 90 km/u"
+                    }
+                },
+                "question": "Wat is de maximumsnelheid in deze straat?"
+            },
+            "4": {
+                "render": "Dit fietspad is gemaakt van {cycleway:surface}",
+                "mappings": {
+                    "0": {
+                        "then": "Dit fietspad is onverhard"
+                    },
+                    "1": {
+                        "then": "Dit fietspad is geplaveid"
+                    },
+                    "2": {
+                        "then": "Dit fietspad is gemaakt van asfalt"
+                    },
+                    "3": {
+                        "then": "Dit fietspad is gemaakt van straatstenen"
+                    },
+                    "4": {
+                        "then": "Dit fietspad is gemaakt van beton"
+                    },
+                    "5": {
+                        "then": "Dit fietspad is gemaakt van kasseien (natuurlijk of verwerkt)"
+                    },
+                    "6": {
+                        "then": "Dit fietspad is gemaakt van ruwe, natuurlijke kasseien"
+                    },
+                    "7": {
+                        "then": "Dit fietspad is gemaakt van vlakke, rechthoekige kasseien"
+                    },
+                    "8": {
+                        "then": "Dit fietspad is gemaakt van hout"
+                    },
+                    "9": {
+                        "then": "Dit fietspad is gemaakt van grind"
+                    },
+                    "10": {
+                        "then": "Dit fietspad is gemaakt van fijn grind"
+                    },
+                    "11": {
+                        "then": "Dit fietspad is gemaakt van kiezelsteentjes"
+                    },
+                    "12": {
+                        "then": "Dit fietspad is gemaakt van aarde"
+                    }
+                },
+                "question": "Waaruit is het oppervlak van het fietspad van gemaakt?"
+            },
+            "5": {
+                "question": "Wat is de kwaliteit van dit fietspad?",
+                "mappings": {
+                    "0": {
+                        "then": "Geschikt voor fijne rollers: rollerblade, skateboard"
+                    },
+                    "1": {
+                        "then": "Geschikt voor fijne wielen: racefiets"
+                    },
+                    "2": {
+                        "then": "Geschikt voor normale wielen: stadsfiets, rolstoel, scooter"
+                    },
+                    "3": {
+                        "then": "Geschikt voor brede wielen: trekfiets, auto, rickshaw"
+                    },
+                    "4": {
+                        "then": "Geschikt voor voertuigen met hoge banden: lichte terreinwagen"
+                    },
+                    "5": {
+                        "then": "Geschikt voor terreinwagens: zware terreinwagen"
+                    },
+                    "6": {
+                        "then": "Geschikt voor gespecialiseerde terreinwagens: tractor, alleterreinwagen"
+                    },
+                    "7": {
+                        "then": "Niet geschikt voor voertuigen met wielen"
+                    }
+                }
+            },
+            "6": {
+                "render": "Deze weg is gemaakt van {surface}",
+                "mappings": {
+                    "0": {
+                        "then": "Dit fietspad is onverhard"
+                    },
+                    "1": {
+                        "then": "Dit fietspad is geplaveid"
+                    },
+                    "2": {
+                        "then": "Dit fietspad is gemaakt van asfalt"
+                    },
+                    "3": {
+                        "then": "Dit fietspad is gemaakt van straatstenen"
+                    },
+                    "4": {
+                        "then": "Dit fietspad is gemaakt van beton"
+                    },
+                    "5": {
+                        "then": "Dit fietspad is gemaakt van kasseien (natuurlijk of verwerkt)"
+                    },
+                    "6": {
+                        "then": "Dit fietspad is gemaakt van ruwe, natuurlijke kasseien"
+                    },
+                    "7": {
+                        "then": "Dit fietspad is gemaakt van vlakke, rechthoekige kasseien"
+                    },
+                    "8": {
+                        "then": "Dit fietspad is gemaakt van hout"
+                    },
+                    "9": {
+                        "then": "Dit fietspad is gemaakt van grind"
+                    },
+                    "10": {
+                        "then": "Dit fietspad is gemaakt van fijn grind"
+                    },
+                    "11": {
+                        "then": "Dit fietspad is gemaakt van kiezelsteentjes"
+                    },
+                    "12": {
+                        "then": "Dit fietspad is gemaakt van aarde"
+                    }
+                },
+                "question": "Waaruit is het oppervlak van de straat gemaakt?"
+            },
+            "7": {
+                "question": "Wat is de kwaliteit van deze straat?"
+            },
+            "8": {
+                "render": "De breedte van deze rijbaan in deze straat is <strong>{width:carriageway}m</strong>",
+                "question": "Hoe breed is de rijbaan in deze straat (in meters)?"
+            },
+            "9": {
+                "question": "Welk verkeersbord heeft dit fietspad?",
+                "mappings": {
+                    "0": {
+                        "then": "Verplicht fietspad <img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 3em'>"
+                    },
+                    "1": {
+                        "then": "Verplicht fietspad (met onderbord)<br><img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 3em'>"
+                    },
+                    "2": {
+                        "then": "Afgescheiden voet-/fietspad <img src='./assets/themes/cycle_infra/Belgian_road_sign_D09.svg' style='width: 3em'>"
+                    },
+                    "3": {
+                        "then": "Gedeeld voet-/fietspad <img src='./assets/themes/cycle_infra/Belgian_road_sign_D10.svg' style='width: 3em'>"
+                    },
+                    "4": {
+                        "then": "Geen verkeersbord aanwezig"
+                    }
+                }
+            },
+            "10": {
+                "question": "Welk verkeersbord heeft dit fietspad?",
+                "mappings": {
+                    "0": {
+                        "then": "Verplicht fietspad <img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 3em'>"
+                    },
+                    "1": {
+                        "then": "Verplicht fietspad (met onderbord)<br><img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 3em'>"
+                    },
+                    "2": {
+                        "then": "Afgescheiden voet-/fietspad <img src='./assets/themes/cycle_infra/Belgian_road_sign_D09.svg' style='width: 3em'>"
+                    },
+                    "3": {
+                        "then": "Gedeeld voet-/fietspad <img src='./assets/themes/cycle_infra/Belgian_road_sign_D10.svg' style='width: 3em'>"
+                    },
+                    "4": {
+                        "then": "Geen verkeersbord aanwezig"
+                    }
+                }
+            },
+            "11": {
+                "question": "Heeft het verkeersbord D7 (<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 1.5em'>) een onderbord?",
+                "mappings": {
+                    "0": {
+                        "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M6.svg' style='width: 3em'>"
+                    },
+                    "1": {
+                        "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M13.svg' style='width: 3em'>"
+                    },
+                    "2": {
+                        "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M14.svg' style='width: 3em'>"
+                    },
+                    "3": {
+                        "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M7.svg' style='width: 3em'>"
+                    },
+                    "4": {
+                        "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M15.svg' style='width: 3em'>"
+                    },
+                    "5": {
+                        "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M16.svg' style='width: 3em'>"
+                    },
+                    "6": {
+                        "then": "Geen onderbord aanwezig"
+                    }
+                }
+            },
+            "12": {
+                "question": "Heeft het verkeersbord D7 (<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 1.5em'>) een onderbord?",
+                "mappings": {
+                    "0": {
+                        "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M6.svg' style='width: 3em'>"
+                    },
+                    "1": {
+                        "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M13.svg' style='width: 3em'>"
+                    },
+                    "2": {
+                        "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M14.svg' style='width: 3em'>"
+                    },
+                    "3": {
+                        "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M7.svg' style='width: 3em'>"
+                    },
+                    "4": {
+                        "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M15.svg' style='width: 3em'>"
+                    },
+                    "5": {
+                        "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M16.svg' style='width: 3em'>"
+                    },
+                    "6": {
+                        "then": "Geen onderbord aanwezig"
+                    }
+                }
+            },
+            "13": {
+                "render": "De schrikafstand van dit fietspad is {cycleway:buffer} m",
+                "question": "Hoe breed is de ruimte tussen het fietspad en de weg?"
+            },
+            "14": {
+                "question": "Hoe is dit fietspad gescheiden van de weg?",
+                "mappings": {
+                    "0": {
+                        "then": "Dit fietspad is gescheiden van de weg met een onderbroken streep"
+                    },
+                    "1": {
+                        "then": "Dit fietspad is gescheiden van de weg met een doorgetrokken streep"
+                    },
+                    "2": {
+                        "then": "Dit fietspad is gescheiden van de weg met parkeervakken"
+                    },
+                    "3": {
+                        "then": "Dit fietspad is gescheiden van de weg met een stoeprand"
+                    }
+                }
+            },
+            "15": {
+                "question": "Hoe is dit fietspad gescheiden van de weg?",
+                "mappings": {
+                    "0": {
+                        "then": "Dit fietspad is gescheiden van de weg met een onderbroken streep"
+                    },
+                    "1": {
+                        "then": "Dit fietspad is gescheiden van de weg met een doorgetrokken streep"
+                    },
+                    "2": {
+                        "then": "Dit fietspad is gescheiden van de weg met parkeervakken"
+                    },
+                    "3": {
+                        "then": "Dit fietspad is gescheiden van de weg met een stoeprand"
+                    }
+                }
+            }
+        }
+    },
     "defibrillator": {
         "name": "Defibrillatoren",
         "title": {
diff --git a/langs/themes/en.json b/langs/themes/en.json
index 010889dd5..c9bb17d6a 100644
--- a/langs/themes/en.json
+++ b/langs/themes/en.json
@@ -695,445 +695,7 @@
     "cycle_infra": {
         "title": "Bicycle infrastructure",
         "shortDescription": "A map where you can view and edit things related to the bicycle infrastructure.",
-        "description": "A map where you can view and edit things related to the bicycle infrastructure. Made during #osoc21.",
-        "layers": {
-            "0": {
-                "name": "Cycleways",
-                "title": {
-                    "render": "Cycleways",
-                    "mappings": {
-                        "0": {
-                            "then": "Cycleway"
-                        },
-                        "1": {
-                            "then": "Shared lane"
-                        },
-                        "2": {
-                            "then": "Bike lane"
-                        },
-                        "3": {
-                            "then": "Cycleway next to the road"
-                        },
-                        "4": {
-                            "then": "Cyclestreet"
-                        }
-                    }
-                },
-                "tagRenderings": {
-                    "0": {
-                        "question": "What kind of cycleway is there?",
-                        "mappings": {
-                            "0": {
-                                "then": "There is a shared lane"
-                            },
-                            "1": {
-                                "then": "There is a lane next to the road (seperated with paint)"
-                            },
-                            "2": {
-                                "then": "There is a track, but no cycleway drawn seperately from this road on the map."
-                            },
-                            "3": {
-                                "then": "There is a seperately drawn cycleway"
-                            },
-                            "4": {
-                                "then": "There is no cycleway"
-                            },
-                            "5": {
-                                "then": "There is no cycleway"
-                            }
-                        }
-                    },
-                    "1": {
-                        "question": "Is this street lit?",
-                        "mappings": {
-                            "0": {
-                                "then": "This street is lit"
-                            },
-                            "1": {
-                                "then": "This road is not lit"
-                            },
-                            "2": {
-                                "then": "This road is lit at night"
-                            },
-                            "3": {
-                                "then": "This road is lit 24/7"
-                            }
-                        }
-                    },
-                    "2": {
-                        "question": "Is this a cyclestreet?",
-                        "mappings": {
-                            "0": {
-                                "then": "This is a cyclestreet, and a 30km/h zone."
-                            },
-                            "1": {
-                                "then": "This is a cyclestreet"
-                            },
-                            "2": {
-                                "then": "This is not a cyclestreet."
-                            }
-                        }
-                    },
-                    "3": {
-                        "render": "The maximum speed on this road is {maxspeed} km/h",
-                        "mappings": {
-                            "0": {
-                                "then": "The maximum speed is 20 km/h"
-                            },
-                            "1": {
-                                "then": "The maximum speed is 30 km/h"
-                            },
-                            "2": {
-                                "then": "The maximum speed is 50 km/h"
-                            },
-                            "3": {
-                                "then": "The maximum speed is 70 km/h"
-                            },
-                            "4": {
-                                "then": "The maximum speed is 90 km/h"
-                            }
-                        },
-                        "question": "What is the maximum speed in this street?"
-                    },
-                    "4": {
-                        "render": "This cyleway is made of {cycleway:surface}",
-                        "mappings": {
-                            "0": {
-                                "then": "This cycleway is unhardened"
-                            },
-                            "1": {
-                                "then": "This cycleway is paved"
-                            },
-                            "2": {
-                                "then": "This cycleway is made of asphalt"
-                            },
-                            "3": {
-                                "then": "This cycleway is made of smooth paving stones"
-                            },
-                            "4": {
-                                "then": "This cycleway is made of concrete"
-                            },
-                            "5": {
-                                "then": "This cycleway is made of cobblestone (unhewn or sett)"
-                            },
-                            "6": {
-                                "then": "This cycleway is made of raw, natural cobblestone"
-                            },
-                            "7": {
-                                "then": "This cycleway is made of flat, square cobblestone"
-                            },
-                            "8": {
-                                "then": "This cycleway is made of wood"
-                            },
-                            "9": {
-                                "then": "This cycleway is made of gravel"
-                            },
-                            "10": {
-                                "then": "This cycleway is made of fine gravel"
-                            },
-                            "11": {
-                                "then": "This cycleway is made of pebblestone"
-                            },
-                            "12": {
-                                "then": "This cycleway is made from raw ground"
-                            }
-                        },
-                        "question": "What is the surface of the cycleway made from?"
-                    },
-                    "5": {
-                        "question": "What is the smoothness of this cycleway?",
-                        "mappings": {
-                            "0": {
-                                "then": "Usable for thin rollers: rollerblade, skateboard"
-                            },
-                            "1": {
-                                "then": "Usable for thin wheels: racing bike"
-                            },
-                            "2": {
-                                "then": "Usable for normal wheels: city bike, wheelchair, scooter"
-                            },
-                            "3": {
-                                "then": "Usable for robust wheels: trekking bike, car, rickshaw"
-                            },
-                            "4": {
-                                "then": "Usable for vehicles with high clearance: light duty off-road vehicle"
-                            },
-                            "5": {
-                                "then": "Usable for off-road vehicles: heavy duty off-road vehicle"
-                            },
-                            "6": {
-                                "then": "Usable for specialized off-road vehicles: tractor, ATV"
-                            },
-                            "7": {
-                                "then": "Impassable / No wheeled vehicle"
-                            }
-                        }
-                    },
-                    "6": {
-                        "render": "This road is made of {surface}",
-                        "mappings": {
-                            "0": {
-                                "then": "This cycleway is unhardened"
-                            },
-                            "1": {
-                                "then": "This cycleway is paved"
-                            },
-                            "2": {
-                                "then": "This cycleway is made of asphalt"
-                            },
-                            "3": {
-                                "then": "This cycleway is made of smooth paving stones"
-                            },
-                            "4": {
-                                "then": "This cycleway is made of concrete"
-                            },
-                            "5": {
-                                "then": "This cycleway is made of cobblestone (unhewn or sett)"
-                            },
-                            "6": {
-                                "then": "This cycleway is made of raw, natural cobblestone"
-                            },
-                            "7": {
-                                "then": "This cycleway is made of flat, square cobblestone"
-                            },
-                            "8": {
-                                "then": "This cycleway is made of wood"
-                            },
-                            "9": {
-                                "then": "This cycleway is made of gravel"
-                            },
-                            "10": {
-                                "then": "This cycleway is made of fine gravel"
-                            },
-                            "11": {
-                                "then": "This cycleway is made of pebblestone"
-                            },
-                            "12": {
-                                "then": "This cycleway is made from raw ground"
-                            }
-                        },
-                        "question": "What is the surface of the street made from?"
-                    },
-                    "7": {
-                        "question": "What is the smoothness of this street?",
-                        "mappings": {
-                            "0": {
-                                "then": "Usable for thin rollers: rollerblade, skateboard"
-                            },
-                            "1": {
-                                "then": "Usable for thin wheels: racing bike"
-                            },
-                            "2": {
-                                "then": "Usable for normal wheels: city bike, wheelchair, scooter"
-                            },
-                            "3": {
-                                "then": "Usable for robust wheels: trekking bike, car, rickshaw"
-                            },
-                            "4": {
-                                "then": "Usable for vehicles with high clearance: light duty off-road vehicle"
-                            },
-                            "5": {
-                                "then": "Usable for off-road vehicles: heavy duty off-road vehicle"
-                            },
-                            "6": {
-                                "then": "Usable for specialized off-road vehicles: tractor, ATV"
-                            },
-                            "7": {
-                                "then": "Impassable / No wheeled vehicle"
-                            }
-                        }
-                    },
-                    "8": {
-                        "render": "The carriage width of this road is <strong>{width:carriageway}m</strong>",
-                        "question": "What is the carriage width of this road (in meters)?"
-                    },
-                    "9": {
-                        "question": "What traffic sign does this cycleway have?",
-                        "mappings": {
-                            "0": {
-                                "then": "Compulsory cycleway <img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 3em'>"
-                            },
-                            "1": {
-                                "then": "Compulsory cycleway (with supplementary sign)<br><img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 3em'> "
-                            },
-                            "2": {
-                                "then": "Segregated foot/cycleway <img src='./assets/themes/cycle_infra/Belgian_road_sign_D09.svg' style='width: 3em'>"
-                            },
-                            "3": {
-                                "then": "Unsegregated foot/cycleway <img src='./assets/themes/cycle_infra/Belgian_road_sign_D10.svg' style='width: 3em'>"
-                            },
-                            "4": {
-                                "then": "No traffic sign present"
-                            }
-                        }
-                    },
-                    "10": {
-                        "question": "What traffic sign does this cycleway have?",
-                        "mappings": {
-                            "0": {
-                                "then": "Compulsory cycleway <img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 3em'>"
-                            },
-                            "1": {
-                                "then": "Compulsory cycleway (with supplementary sign)<br><img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 3em'> "
-                            },
-                            "2": {
-                                "then": "Segregated foot/cycleway <img src='./assets/themes/cycle_infra/Belgian_road_sign_D09.svg' style='width: 3em'>"
-                            },
-                            "3": {
-                                "then": "Unsegregated foot/cycleway <img src='./assets/themes/cycle_infra/Belgian_road_sign_D10.svg' style='width: 3em'>"
-                            },
-                            "4": {
-                                "then": "No traffic sign present"
-                            }
-                        }
-                    },
-                    "11": {
-                        "question": "Does the traffic sign D7 (<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 1.5em'>) have a supplementary sign?",
-                        "mappings": {
-                            "0": {
-                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M6.svg' style='width: 3em'>"
-                            },
-                            "1": {
-                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M13.svg' style='width: 3em'>"
-                            },
-                            "2": {
-                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M14.svg' style='width: 3em'>"
-                            },
-                            "3": {
-                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M7.svg' style='width: 3em'>"
-                            },
-                            "4": {
-                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M15.svg' style='width: 3em'>"
-                            },
-                            "5": {
-                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M16.svg' style='width: 3em'>"
-                            },
-                            "6": {
-                                "then": "No supplementary traffic sign present"
-                            }
-                        }
-                    },
-                    "12": {
-                        "question": "Does the traffic sign D7 (<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 1.5em'>) have a supplementary sign?",
-                        "mappings": {
-                            "0": {
-                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M6.svg' style='width: 3em'>"
-                            },
-                            "1": {
-                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M13.svg' style='width: 3em'>"
-                            },
-                            "2": {
-                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M14.svg' style='width: 3em'>"
-                            },
-                            "3": {
-                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M7.svg' style='width: 3em'>"
-                            },
-                            "4": {
-                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M15.svg' style='width: 3em'>"
-                            },
-                            "5": {
-                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M16.svg' style='width: 3em'>"
-                            },
-                            "6": {
-                                "then": "No supplementary traffic sign present"
-                            }
-                        }
-                    },
-                    "13": {
-                        "render": "The buffer besides this cycleway is {cycleway:buffer} m",
-                        "question": "How wide is the gap between the cycleway and the road?"
-                    },
-                    "14": {
-                        "question": "How is this cycleway seperated from the road?",
-                        "mappings": {
-                            "0": {
-                                "then": "This cycleway is seperated by a dashed line"
-                            },
-                            "1": {
-                                "then": "This cycleway is seperated by a solid line"
-                            },
-                            "2": {
-                                "then": "This cycleway is seperated by a parking lane"
-                            },
-                            "3": {
-                                "then": "This cycleway is seperated by a kerb"
-                            }
-                        }
-                    },
-                    "15": {
-                        "question": "How is this cycleway seperated from the road?",
-                        "mappings": {
-                            "0": {
-                                "then": "This cycleway is seperated by a dashed line"
-                            },
-                            "1": {
-                                "then": "This cycleway is seperated by a solid line"
-                            },
-                            "2": {
-                                "then": "This cycleway is seperated by a parking lane"
-                            },
-                            "3": {
-                                "then": "This cycleway is seperated by a kerb"
-                            }
-                        }
-                    }
-                }
-            },
-            "1": {
-                "name": "All streets",
-                "description": "Layer to mark new cycleways",
-                "title": {
-                    "render": "Street"
-                },
-                "tagRenderings": {
-                    "0": {
-                        "question": "Is there a cycleway?",
-                        "mappings": {
-                            "0": {
-                                "then": "There is a shared lane"
-                            },
-                            "1": {
-                                "then": "There is a lane next to the road (seperated with paint)"
-                            },
-                            "2": {
-                                "then": "There is a track, but no cycleway drawn seperately from this road on the map."
-                            },
-                            "3": {
-                                "then": "There is a seperately drawn cycleway"
-                            },
-                            "4": {
-                                "then": "There is no cycleway known here"
-                            },
-                            "5": {
-                                "then": "There is no cycleway"
-                            },
-                            "6": {
-                                "then": "There is no cycleway"
-                            }
-                        },
-                        "render": "Unknown cycleway situation"
-                    },
-                    "1": {
-                        "question": "Is this a cyclestreet?",
-                        "mappings": {
-                            "0": {
-                                "then": "This is a cyclestreet, and a 30km/h zone."
-                            },
-                            "1": {
-                                "then": "This is a cyclestreet"
-                            },
-                            "2": {
-                                "then": "This is not a cyclestreet."
-                            }
-                        }
-                    },
-                    "2": {
-                        "render": "The carriage width of this road is <strong>{width:carriageway}m</strong>",
-                        "question": "What is the carriage width of this road (in meters)?<br/><span class='subtle'>This is measured from kerb to kerb, including parking lanes</span>"
-                    }
-                }
-            }
-        }
+        "description": "A map where you can view and edit things related to the bicycle infrastructure. Made during #osoc21."
     },
     "cyclestreets": {
         "title": "Cyclestreets",
diff --git a/langs/themes/nl.json b/langs/themes/nl.json
index ecfac3185..87150ecb7 100644
--- a/langs/themes/nl.json
+++ b/langs/themes/nl.json
@@ -583,419 +583,7 @@
     "cycle_infra": {
         "title": "Fietsinfrastructuur",
         "shortDescription": "Een kaart waar je info over de fietsinfrastructuur kan bekijken en bewerken.",
-        "description": "Een kaart waar je info over de fietsinfrastructuur kan bekijken en bewerken. Gemaakt tijdens #osoc21.",
-        "layers": {
-            "0": {
-                "name": "Fietspaden",
-                "title": {
-                    "render": "Fietspaden",
-                    "mappings": {
-                        "0": {
-                            "then": "Fietsweg"
-                        },
-                        "1": {
-                            "then": "Fietssuggestiestrook"
-                        },
-                        "2": {
-                            "then": "Fietsstrook"
-                        },
-                        "3": {
-                            "then": "Fietsweg naast de weg"
-                        },
-                        "4": {
-                            "then": "Fietsstraat"
-                        }
-                    }
-                },
-                "tagRenderings": {
-                    "0": {
-                        "question": "Wat voor fietspad is hier?",
-                        "mappings": {
-                            "0": {
-                                "then": "Er is een fietssuggestiestrook"
-                            },
-                            "1": {
-                                "then": "Er is een fietspad aangrenzend aan de weg (gescheiden met verf)"
-                            },
-                            "2": {
-                                "then": "Er is een fietspad (los van de weg), maar geen fietspad afzonderlijk getekend naast deze weg."
-                            },
-                            "3": {
-                                "then": "Er is een apart getekend fietspad."
-                            },
-                            "4": {
-                                "then": "Er is geen fietspad aanwezig"
-                            },
-                            "5": {
-                                "then": "Er is geen fietspad aanwezig"
-                            }
-                        }
-                    },
-                    "1": {
-                        "question": "Is deze weg verlicht?",
-                        "mappings": {
-                            "0": {
-                                "then": "Deze weg is verlicht"
-                            },
-                            "1": {
-                                "then": "Deze weg is niet verlicht"
-                            },
-                            "2": {
-                                "then": "Deze weg is 's nachts verlicht"
-                            },
-                            "3": {
-                                "then": "Deze weg is 24/7 verlicht"
-                            }
-                        }
-                    },
-                    "2": {
-                        "question": "Is dit een fietsstraat?",
-                        "mappings": {
-                            "0": {
-                                "then": "Dit is een fietsstraat, en dus een 30km/h zone"
-                            },
-                            "1": {
-                                "then": "Dit is een fietsstraat"
-                            },
-                            "2": {
-                                "then": "Dit is geen fietsstraat"
-                            }
-                        }
-                    },
-                    "3": {
-                        "render": "De maximumsnelheid op deze weg is {maxspeed} km/u",
-                        "mappings": {
-                            "0": {
-                                "then": "De maximumsnelheid is 20 km/u"
-                            },
-                            "1": {
-                                "then": "De maximumsnelheid is 30 km/u"
-                            },
-                            "2": {
-                                "then": "De maximumsnelheid is 50 km/u"
-                            },
-                            "3": {
-                                "then": "De maximumsnelheid is 70 km/u"
-                            },
-                            "4": {
-                                "then": "De maximumsnelheid is 90 km/u"
-                            }
-                        },
-                        "question": "Wat is de maximumsnelheid in deze straat?"
-                    },
-                    "4": {
-                        "render": "Dit fietspad is gemaakt van {cycleway:surface}",
-                        "mappings": {
-                            "0": {
-                                "then": "Dit fietspad is onverhard"
-                            },
-                            "1": {
-                                "then": "Dit fietspad is geplaveid"
-                            },
-                            "2": {
-                                "then": "Dit fietspad is gemaakt van asfalt"
-                            },
-                            "3": {
-                                "then": "Dit fietspad is gemaakt van straatstenen"
-                            },
-                            "4": {
-                                "then": "Dit fietspad is gemaakt van beton"
-                            },
-                            "5": {
-                                "then": "Dit fietspad is gemaakt van kasseien (natuurlijk of verwerkt)"
-                            },
-                            "6": {
-                                "then": "Dit fietspad is gemaakt van ruwe, natuurlijke kasseien"
-                            },
-                            "7": {
-                                "then": "Dit fietspad is gemaakt van vlakke, rechthoekige kasseien"
-                            },
-                            "8": {
-                                "then": "Dit fietspad is gemaakt van hout"
-                            },
-                            "9": {
-                                "then": "Dit fietspad is gemaakt van grind"
-                            },
-                            "10": {
-                                "then": "Dit fietspad is gemaakt van fijn grind"
-                            },
-                            "11": {
-                                "then": "Dit fietspad is gemaakt van kiezelsteentjes"
-                            },
-                            "12": {
-                                "then": "Dit fietspad is gemaakt van aarde"
-                            }
-                        },
-                        "question": "Waaruit is het oppervlak van het fietspad van gemaakt?"
-                    },
-                    "5": {
-                        "question": "Wat is de kwaliteit van dit fietspad?",
-                        "mappings": {
-                            "0": {
-                                "then": "Geschikt voor fijne rollers: rollerblade, skateboard"
-                            },
-                            "1": {
-                                "then": "Geschikt voor fijne wielen: racefiets"
-                            },
-                            "2": {
-                                "then": "Geschikt voor normale wielen: stadsfiets, rolstoel, scooter"
-                            },
-                            "3": {
-                                "then": "Geschikt voor brede wielen: trekfiets, auto, rickshaw"
-                            },
-                            "4": {
-                                "then": "Geschikt voor voertuigen met hoge banden: lichte terreinwagen"
-                            },
-                            "5": {
-                                "then": "Geschikt voor terreinwagens: zware terreinwagen"
-                            },
-                            "6": {
-                                "then": "Geschikt voor gespecialiseerde terreinwagens: tractor, alleterreinwagen"
-                            },
-                            "7": {
-                                "then": "Niet geschikt voor voertuigen met wielen"
-                            }
-                        }
-                    },
-                    "6": {
-                        "render": "Deze weg is gemaakt van {surface}",
-                        "mappings": {
-                            "0": {
-                                "then": "Dit fietspad is onverhard"
-                            },
-                            "1": {
-                                "then": "Dit fietspad is geplaveid"
-                            },
-                            "2": {
-                                "then": "Dit fietspad is gemaakt van asfalt"
-                            },
-                            "3": {
-                                "then": "Dit fietspad is gemaakt van straatstenen"
-                            },
-                            "4": {
-                                "then": "Dit fietspad is gemaakt van beton"
-                            },
-                            "5": {
-                                "then": "Dit fietspad is gemaakt van kasseien (natuurlijk of verwerkt)"
-                            },
-                            "6": {
-                                "then": "Dit fietspad is gemaakt van ruwe, natuurlijke kasseien"
-                            },
-                            "7": {
-                                "then": "Dit fietspad is gemaakt van vlakke, rechthoekige kasseien"
-                            },
-                            "8": {
-                                "then": "Dit fietspad is gemaakt van hout"
-                            },
-                            "9": {
-                                "then": "Dit fietspad is gemaakt van grind"
-                            },
-                            "10": {
-                                "then": "Dit fietspad is gemaakt van fijn grind"
-                            },
-                            "11": {
-                                "then": "Dit fietspad is gemaakt van kiezelsteentjes"
-                            },
-                            "12": {
-                                "then": "Dit fietspad is gemaakt van aarde"
-                            }
-                        },
-                        "question": "Waaruit is het oppervlak van de straat gemaakt?"
-                    },
-                    "7": {
-                        "question": "Wat is de kwaliteit van deze straat?"
-                    },
-                    "8": {
-                        "render": "De breedte van deze rijbaan in deze straat is <strong>{width:carriageway}m</strong>",
-                        "question": "Hoe breed is de rijbaan in deze straat (in meters)?"
-                    },
-                    "9": {
-                        "question": "Welk verkeersbord heeft dit fietspad?",
-                        "mappings": {
-                            "0": {
-                                "then": "Verplicht fietspad <img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 3em'>"
-                            },
-                            "1": {
-                                "then": "Verplicht fietspad (met onderbord)<br><img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 3em'>"
-                            },
-                            "2": {
-                                "then": "Afgescheiden voet-/fietspad <img src='./assets/themes/cycle_infra/Belgian_road_sign_D09.svg' style='width: 3em'>"
-                            },
-                            "3": {
-                                "then": "Gedeeld voet-/fietspad <img src='./assets/themes/cycle_infra/Belgian_road_sign_D10.svg' style='width: 3em'>"
-                            },
-                            "4": {
-                                "then": "Geen verkeersbord aanwezig"
-                            }
-                        }
-                    },
-                    "10": {
-                        "question": "Welk verkeersbord heeft dit fietspad?",
-                        "mappings": {
-                            "0": {
-                                "then": "Verplicht fietspad <img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 3em'>"
-                            },
-                            "1": {
-                                "then": "Verplicht fietspad (met onderbord)<br><img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 3em'>"
-                            },
-                            "2": {
-                                "then": "Afgescheiden voet-/fietspad <img src='./assets/themes/cycle_infra/Belgian_road_sign_D09.svg' style='width: 3em'>"
-                            },
-                            "3": {
-                                "then": "Gedeeld voet-/fietspad <img src='./assets/themes/cycle_infra/Belgian_road_sign_D10.svg' style='width: 3em'>"
-                            },
-                            "4": {
-                                "then": "Geen verkeersbord aanwezig"
-                            }
-                        }
-                    },
-                    "11": {
-                        "question": "Heeft het verkeersbord D7 (<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 1.5em'>) een onderbord?",
-                        "mappings": {
-                            "0": {
-                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M6.svg' style='width: 3em'>"
-                            },
-                            "1": {
-                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M13.svg' style='width: 3em'>"
-                            },
-                            "2": {
-                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M14.svg' style='width: 3em'>"
-                            },
-                            "3": {
-                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M7.svg' style='width: 3em'>"
-                            },
-                            "4": {
-                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M15.svg' style='width: 3em'>"
-                            },
-                            "5": {
-                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M16.svg' style='width: 3em'>"
-                            },
-                            "6": {
-                                "then": "Geen onderbord aanwezig"
-                            }
-                        }
-                    },
-                    "12": {
-                        "question": "Heeft het verkeersbord D7 (<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 1.5em'>) een onderbord?",
-                        "mappings": {
-                            "0": {
-                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M6.svg' style='width: 3em'>"
-                            },
-                            "1": {
-                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M13.svg' style='width: 3em'>"
-                            },
-                            "2": {
-                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M14.svg' style='width: 3em'>"
-                            },
-                            "3": {
-                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M7.svg' style='width: 3em'>"
-                            },
-                            "4": {
-                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M15.svg' style='width: 3em'>"
-                            },
-                            "5": {
-                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M16.svg' style='width: 3em'>"
-                            },
-                            "6": {
-                                "then": "Geen onderbord aanwezig"
-                            }
-                        }
-                    },
-                    "13": {
-                        "render": "De schrikafstand van dit fietspad is {cycleway:buffer} m",
-                        "question": "Hoe breed is de ruimte tussen het fietspad en de weg?"
-                    },
-                    "14": {
-                        "question": "Hoe is dit fietspad gescheiden van de weg?",
-                        "mappings": {
-                            "0": {
-                                "then": "Dit fietspad is gescheiden van de weg met een onderbroken streep"
-                            },
-                            "1": {
-                                "then": "Dit fietspad is gescheiden van de weg met een doorgetrokken streep"
-                            },
-                            "2": {
-                                "then": "Dit fietspad is gescheiden van de weg met parkeervakken"
-                            },
-                            "3": {
-                                "then": "Dit fietspad is gescheiden van de weg met een stoeprand"
-                            }
-                        }
-                    },
-                    "15": {
-                        "question": "Hoe is dit fietspad gescheiden van de weg?",
-                        "mappings": {
-                            "0": {
-                                "then": "Dit fietspad is gescheiden van de weg met een onderbroken streep"
-                            },
-                            "1": {
-                                "then": "Dit fietspad is gescheiden van de weg met een doorgetrokken streep"
-                            },
-                            "2": {
-                                "then": "Dit fietspad is gescheiden van de weg met parkeervakken"
-                            },
-                            "3": {
-                                "then": "Dit fietspad is gescheiden van de weg met een stoeprand"
-                            }
-                        }
-                    }
-                }
-            },
-            "1": {
-                "name": "Alle straten",
-                "description": "Laag waar je nieuwe fietspaden kan aanduiden",
-                "title": {
-                    "render": "Straat"
-                },
-                "tagRenderings": {
-                    "0": {
-                        "question": "Is er een fietspad?",
-                        "mappings": {
-                            "0": {
-                                "then": "Er is een fietssugestiestrook"
-                            },
-                            "1": {
-                                "then": "Er is een fietspad aangrenzend aan de weg (gescheiden met verf)"
-                            },
-                            "2": {
-                                "then": "Er is een fietspad (los van de weg), maar geen fietspad afzonderlijk getekend naast deze weg."
-                            },
-                            "3": {
-                                "then": "Er is een apart getekend fietspad."
-                            },
-                            "4": {
-                                "then": "Er is geen fietspad bekend hier"
-                            },
-                            "5": {
-                                "then": "Er is geen fietspad aanwezig"
-                            },
-                            "6": {
-                                "then": "Er is geen fietspad aanwezig"
-                            }
-                        },
-                        "render": "Onbekende fietspad situatie"
-                    },
-                    "1": {
-                        "question": "Is dit een fietsstraat?",
-                        "mappings": {
-                            "0": {
-                                "then": "Dit is een fietsstraat, en dus een 30km/h zone"
-                            },
-                            "1": {
-                                "then": "Dit is een fietsstraat"
-                            },
-                            "2": {
-                                "then": "Dit is geen fietsstraat"
-                            }
-                        }
-                    },
-                    "2": {
-                        "render": "De breedte van deze rijbaan in deze straat is <strong>{width:carriageway}m</strong>",
-                        "question": "Hoe breed is de rijbaan in deze straat (in meters)?<br/><span class='subtle'>Gemeten van stoepsteen tot stoepsten, inclusief parkeerstroken</span>"
-                    }
-                }
-            }
-        }
+        "description": "Een kaart waar je info over de fietsinfrastructuur kan bekijken en bewerken. Gemaakt tijdens #osoc21."
     },
     "cyclestreets": {
         "title": "Fietsstraten",
diff --git a/package.json b/package.json
index 7baf0d056..50e6d0949 100644
--- a/package.json
+++ b/package.json
@@ -17,12 +17,14 @@
     "generate:polygon-features": "cd assets/ && wget https://raw.githubusercontent.com/tyrasd/osm-polygon-features/master/polygon-features.json --output-document=polygon-features.json",
     "generate:images": "ts-node scripts/generateIncludedImages.ts",
     "generate:translations": "ts-node scripts/generateTranslations.ts",
+    "reset:translations": "ts-node scripts/generateTranslations.ts --ignore-weblate",
     "generate:layouts": "ts-node scripts/generateLayouts.ts",
     "generate:docs": "ts-node scripts/generateDocs.ts && ts-node scripts/generateTaginfoProjectFiles.ts",
     "generate:cache:speelplekken": "npm run generate:layeroverview && ts-node scripts/generateCache.ts speelplekken 14 ../pietervdvn.github.io/speelplekken_cache/ 51.20 4.35 51.09 4.56",
     "generate:cache:natuurpunt": "npm run generate:layeroverview && ts-node scripts/generateCache.ts natuurpunt 12 ../pietervdvn.github.io/natuurpunt_cache/ 50.40 2.1 51.54 6.4 --generate-point-overview nature_reserve,visitor_information_centre",
     "generate:layeroverview": "npm run generate:licenses && echo {\\\"layers\\\":[], \\\"themes\\\":[]} > ./assets/generated/known_layers_and_themes.json && ts-node scripts/generateLayerOverview.ts --no-fail",
     "generate:licenses": "ts-node scripts/generateLicenseInfo.ts --no-fail",
+    "query:licenses": "ts-node scripts/generateLicenseInfo.ts --query",
     "generate:report": "cd Docs/Tools && ./compileStats.sh && git commit . -m 'New statistics ands graphs' && git push",
     "generate:contributor-list": "git log --pretty='%aN' | sort | uniq -c | sort -hr | sed 's/ *\\([0-9]*\\) \\(.*\\)$/{\"contributor\":\"\\2\", \"commits\":\\1}/' | tr '\\n' ',' | sed 's/^/{\"contributors\":[/' | sed 's/,$/]}/' > assets/contributors.json",
     "validate:layeroverview": "ts-node scripts/generateLayerOverview.ts --report",