diff --git a/assets/layers/barrier/barrier.json b/assets/layers/barrier/barrier.json
new file mode 100644
index 000000000..ef50bda8d
--- /dev/null
+++ b/assets/layers/barrier/barrier.json
@@ -0,0 +1,271 @@
+{
+  "id": "barrier",
+  "name": {
+    "en": "Barriers",
+    "nl": "Barrières"
+  },
+  "description": {
+    "en": "Obstacles while cycling, such as bollards and cycle barriers",
+    "nl": "Hindernissen tijdens het fietsen, zoals paaltjes en fietshekjes"
+  },
+  "source": {
+    "osmTags": {
+      "or": [
+        "barrier=bollard",
+        "barrier=cycle_barrier"
+      ]
+    }
+  },
+  "minzoom": 17,
+  "title": {
+    "render": {
+      "en": "Barrier",
+      "nl": "Barrière"
+    },
+    "mappings": [
+      {
+        "if": "barrier=bollard",
+        "then": {
+          "en": "Bollard",
+          "nl": "Paaltje"
+        }
+      },
+      {
+        "if": "barrier=cycle_barrier",
+        "then": {
+          "en": "Cycling Barrier",
+          "nl": "Fietshekjes"
+        }
+      }
+    ]
+  },
+  "icon": "./assets/svg/barrier.svg",
+  "width": "5",
+  "presets": [
+    {
+      "title": {
+        "en": "Bollard",
+        "nl": "Paaltje"
+      },
+      "tags": [
+        "barrier=bollard"
+      ],
+      "description": {
+        "en": "A bollard in the road",
+        "nl": "Een paaltje in de weg"
+      }
+    },
+    {
+      "title": {
+        "en": "Cycle barrier",
+        "nl": "Fietshekjes"
+      },
+      "tags": [
+        "barrier=bollard"
+      ],
+      "description": {
+        "en": "Cycle barrier, slowing down cyclists",
+        "nl": "Fietshekjes, voor het afremmen van fietsers"
+      }
+    }
+  ],
+  "tagRenderings": [
+    {
+      "#": "bicycle=yes/no",
+      "question": {
+        "en": "Can a bicycle go past this barrier?",
+        "nl": "Kan een fietser langs deze barrière?"
+      },
+      "mappings": [
+        {
+          "if": "bicycle=yes",
+          "then": {
+            "en": "A cyclist can go past this.",
+            "nl": "Een fietser kan hier langs."
+          }
+        },
+        {
+          "if": "bicycle=no",
+          "then": {
+            "en": "A cyclist can not go past this.",
+            "nl": "Een fietser kan hier niet langs."
+          }
+        }
+      ]
+    },
+    {
+      "#": "Bollard type",
+      "question": {
+        "en": "What kind of bollard is this?",
+        "nl": "Wat voor soort paal is dit?"
+      },
+      "condition": "barrier=bollard",
+      "mappings": [
+        {
+          "if": "bollard=removable",
+          "then": {
+            "en": "Removable bollard",
+            "nl": "Verwijderbare paal"
+          }
+        },
+        {
+          "if": "bollard=fixed",
+          "then": {
+            "en": "Fixed bollard",
+            "nl": "Vaste paal"
+          }
+        },
+        {
+          "if": "bollard=foldable",
+          "then": {
+            "en": "Bollard that can be folded down",
+            "nl": "Paal die platgevouwen kan worden"
+          }
+        },
+        {
+          "if": "bollard=flexible",
+          "then": {
+            "en": "Flexible bollard, usually plastic",
+            "nl": "Flexibele paal, meestal plastic"
+          }
+        },
+        {
+          "if": "bollard=rising",
+          "then": {
+            "en": "Rising bollard",
+            "nl": "Verzonken poller"
+          }
+        }
+      ]
+    },
+    {
+      "#": "Cycle barrier type",
+      "question": {
+        "en": "What kind of cycling barrier is this?",
+        "nl": "Wat voor fietshekjes zijn dit?"
+      },
+      "condition": "barrier=cycle_barrier",
+      "mappings": [
+        {
+          "if": "cycle_barrier:type=single",
+          "then": {
+            "en": "Single, just two barriers with a space inbetween <img src='./assets/themes/cycle_infra/Cycle_barrier_single.png' style='width:8em'>",
+            "nl": "Enkelvoudig, slechts twee hekjes met ruimte ertussen <img src='./assets/themes/cycle_infra/Cycle_barrier_single.png' style='width:8em'>"
+          }
+        },
+        {
+          "if": "cycle_barrier:type=double",
+          "then": {
+            "en": "Double, two barriers behind each other <img src='./assets/themes/cycle_infra/Cycle_barrier_double.png' style='width:8em'>",
+            "nl": "Dubbel, twee hekjes achter elkaar <img src='./assets/themes/cycle_infra/Cycle_barrier_double.png' style='width:8em'>"
+          }
+        },
+        {
+          "if": "cycle_barrier:type=triple",
+          "then": {
+            "en": "Triple, three barriers behind each other <img src='./assets/themes/cycle_infra/Cycle_barrier_triple.png' style='width:8em'>",
+            "nl": "Drievoudig, drie hekjes achter elkaar <img src='./assets/themes/cycle_infra/Cycle_barrier_triple.png' style='width:8em'>"
+          }
+        },
+        {
+          "if": "cycle_barrier:type=squeeze",
+          "then": {
+            "en": "Squeeze gate, gap is smaller at top, than at the bottom <img src='./assets/themes/cycle_infra/Cycle_barrier_squeeze.png' style='width:8em'>",
+            "nl": "Knijppoort, ruimte is smaller aan de top, dan aan de bodem <img src='./assets/themes/cycle_infra/Cycle_barrier_squeeze.png' style='width:8em'>"
+          }
+        }
+      ]
+    },
+    {
+      "#": "MaxWidth",
+      "render": {
+        "en": "Maximum width: {maxwidth:physical} m",
+        "nl": "Maximumbreedte: {maxwidth:physical} m"
+      },
+      "question": {
+        "en": "How wide is the gap left over besides the barrier?",
+        "nl": "Hoe breed is de ruimte naast de barrière?"
+      },
+      "condition": {
+        "and": [
+          "cycle_barrier:type!=double",
+          "cycle_barrier:type!=triple"
+        ]
+      },
+      "freeform": {
+        "key": "maxwidth:physical",
+        "type": "length",
+        "helperArgs": [
+          "20",
+          "map"
+        ]
+      }
+    },
+    {
+      "#": "Space between barrier (cyclebarrier)",
+      "render": {
+        "en": "Space between barriers (along the length of the road): {width:seperation} m",
+        "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)?"
+      },
+      "condition": {
+        "or": [
+          "cycle_barrier:type=double",
+          "cycle_barrier:type=triple"
+        ]
+      },
+      "freeform": {
+        "key": "width:seperation",
+        "type": "length",
+        "helperArgs": [
+          "20",
+          "map"
+        ]
+      }
+    },
+    {
+      "#": "Width of opening (cyclebarrier)",
+      "render": {
+        "en": "Width of opening: {width:opening} m",
+        "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?"
+      },
+      "condition": {
+        "or": [
+          "cycle_barrier:type=double",
+          "cycle_barrier:type=triple"
+        ]
+      },
+      "freeform": {
+        "key": "width:opening",
+        "type": "pfloat"
+      }
+    },
+    {
+      "#": "Overlap (cyclebarrier)",
+      "render": {
+        "en": "Overlap: {overlap} m"
+      },
+      "question": {
+        "en": "How much overlap do the barriers have?",
+        "nl": "Hoeveel overlappen de barrières?"
+      },
+      "condition": {
+        "or": [
+          "cycle_barrier:type=double",
+          "cycle_barrier:type=triple"
+        ]
+      },
+      "freeform": {
+        "key": "overlap",
+        "type": "pfloat"
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/assets/themes/cycle_infra/cycle_infra.json b/assets/themes/cycle_infra/cycle_infra.json
index e711fdc7c..dda6b5836 100644
--- a/assets/themes/cycle_infra/cycle_infra.json
+++ b/assets/themes/cycle_infra/cycle_infra.json
@@ -1374,270 +1374,7 @@
         }
       ]
     },
-    {
-      "id": "barriers",
-      "name": {
-        "en": "Barriers",
-        "nl": "Barrières"
-      },
-      "description": {
-        "en": "Obstacles while cycling, such as bollards and cycle barriers",
-        "nl": "Hindernissen tijdens het fietsen, zoals paaltjes en fietshekjes"
-      },
-      "source": {
-        "osmTags": {
-          "or": [
-            "barrier=bollard",
-            "barrier=cycle_barrier"
-          ]
-        }
-      },
-      "minzoom": 17,
-      "title": {
-        "render": {
-          "en": "Barrier",
-          "nl": "Barrière"
-        },
-        "mappings": [
-          {
-            "if": "barrier=bollard",
-            "then": {
-              "en": "Bollard",
-              "nl": "Paaltje"
-            }
-          },
-          {
-            "if": "barrier=cycle_barrier",
-            "then": {
-              "en": "Cycling Barrier",
-              "nl": "Fietshekjes"
-            }
-          }
-        ]
-      },
-      "icon": "./assets/svg/barrier.svg",
-      "width": "5",
-      "presets": [
-        {
-          "title": {
-            "en": "Bollard",
-            "nl": "Paaltje"
-          },
-          "tags": [
-            "barrier=bollard"
-          ],
-          "description": {
-            "en": "A bollard in the road",
-            "nl": "Een paaltje in de weg"
-          }
-        },
-        {
-          "title": {
-            "en": "Cycle barrier",
-            "nl": "Fietshekjes"
-          },
-          "tags": [
-            "barrier=bollard"
-          ],
-          "description": {
-            "en": "Cycle barrier, slowing down cyclists",
-            "nl": "Fietshekjes, voor het afremmen van fietsers"
-          }
-        }
-      ],
-      "tagRenderings": [
-        {
-          "question": {
-            "en": "Can a bicycle go past this barrier?",
-            "nl": "Kan een fietser langs deze barrière?"
-          },
-          "mappings": [
-            {
-              "if": "bicycle=yes",
-              "then": {
-                "en": "A cyclist can go past this.",
-                "nl": "Een fietser kan hier langs."
-              }
-            },
-            {
-              "if": "bicycle=no",
-              "then": {
-                "en": "A cyclist can not go past this.",
-                "nl": "Een fietser kan hier niet langs."
-              }
-            }
-          ]
-        },
-        {
-          "question": {
-            "en": "What kind of bollard is this?",
-            "nl": "Wat voor soort paal is dit?"
-          },
-          "condition": "barrier=bollard",
-          "mappings": [
-            {
-              "if": "bollard=removable",
-              "then": {
-                "en": "Removable bollard",
-                "nl": "Verwijderbare paal"
-              }
-            },
-            {
-              "if": "bollard=fixed",
-              "then": {
-                "en": "Fixed bollard",
-                "nl": "Vaste paal"
-              }
-            },
-            {
-              "if": "bollard=foldable",
-              "then": {
-                "en": "Bollard that can be folded down",
-                "nl": "Paal die platgevouwen kan worden"
-              }
-            },
-            {
-              "if": "bollard=flexible",
-              "then": {
-                "en": "Flexible bollard, usually plastic",
-                "nl": "Flexibele paal, meestal plastic"
-              }
-            },
-            {
-              "if": "bollard=rising",
-              "then": {
-                "en": "Rising bollard",
-                "nl": "Verzonken poller"
-              }
-            }
-          ]
-        },
-        {
-          "question": {
-            "en": "What kind of cycling barrier is this?",
-            "nl": "Wat voor fietshekjes zijn dit?"
-          },
-          "condition": "barrier=cycle_barrier",
-          "mappings": [
-            {
-              "if": "cycle_barrier:type=single",
-              "then": {
-                "en": "Single, just two barriers with a space inbetween <img src='./assets/themes/cycle_infra/Cycle_barrier_single.png' style='width:8em'>",
-                "nl": "Enkelvoudig, slechts twee hekjes met ruimte ertussen <img src='./assets/themes/cycle_infra/Cycle_barrier_single.png' style='width:8em'>"
-              }
-            },
-            {
-              "if": "cycle_barrier:type=double",
-              "then": {
-                "en": "Double, two barriers behind each other <img src='./assets/themes/cycle_infra/Cycle_barrier_double.png' style='width:8em'>",
-                "nl": "Dubbel, twee hekjes achter elkaar <img src='./assets/themes/cycle_infra/Cycle_barrier_double.png' style='width:8em'>"
-              }
-            },
-            {
-              "if": "cycle_barrier:type=triple",
-              "then": {
-                "en": "Triple, three barriers behind each other <img src='./assets/themes/cycle_infra/Cycle_barrier_triple.png' style='width:8em'>",
-                "nl": "Drievoudig, drie hekjes achter elkaar <img src='./assets/themes/cycle_infra/Cycle_barrier_triple.png' style='width:8em'>"
-              }
-            },
-            {
-              "if": "cycle_barrier:type=squeeze",
-              "then": {
-                "en": "Squeeze gate, gap is smaller at top, than at the bottom <img src='./assets/themes/cycle_infra/Cycle_barrier_squeeze.png' style='width:8em'>",
-                "nl": "Knijppoort, ruimte is smaller aan de top, dan aan de bodem <img src='./assets/themes/cycle_infra/Cycle_barrier_squeeze.png' style='width:8em'>"
-              }
-            }
-          ]
-        },
-        {
-          "render": {
-            "en": "Maximum width: {maxwidth:physical} m",
-            "nl": "Maximumbreedte: {maxwidth:physical} m"
-          },
-          "question": {
-            "en": "How wide is the gap left over besides the barrier?",
-            "nl": "Hoe breed is de ruimte naast de barrière?"
-          },
-          "condition": {
-            "and": [
-              "cycle_barrier:type!=double",
-              "cycle_barrier:type!=triple"
-            ]
-          },
-          "freeform": {
-            "key": "maxwidth:physical",
-            "type": "length",
-            "helperArgs": [
-              "20",
-              "map"
-            ]
-          }
-        },
-        {
-          "render": {
-            "en": "Space between barriers (along the length of the road): {width:seperation} m",
-            "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)?"
-          },
-          "condition": {
-            "or": [
-              "cycle_barrier:type=double",
-              "cycle_barrier:type=triple"
-            ]
-          },
-          "freeform": {
-            "key": "width:seperation",
-            "type": "length",
-            "helperArgs": [
-              "20",
-              "map"
-            ]
-          }
-        },
-        {
-          "render": {
-            "en": "Width of opening: {width:opening} m",
-            "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?"
-          },
-          "condition": {
-            "or": [
-              "cycle_barrier:type=double",
-              "cycle_barrier:type=triple"
-            ]
-          },
-          "freeform": {
-            "key": "width:opening",
-            "type": "pfloat"
-          }
-        },
-        {
-          "render": {
-            "en": "Overlap: {overlap} m"
-          },
-          "question": {
-            "en": "How much overlap do the barriers have?",
-            "nl": "Hoeveel overlappen de barrières?"
-          },
-          "condition": {
-            "or": [
-              "cycle_barrier:type=double",
-              "cycle_barrier:type=triple"
-            ]
-          },
-          "freeform": {
-            "key": "overlap",
-            "type": "pfloat"
-          }
-        }
-      ]
-    },
+ "barrier",
     "crossings"
   ]
 }
\ No newline at end of file
diff --git a/langs/layers/en.json b/langs/layers/en.json
index afbf4f210..eedf2dbdb 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -1,4 +1,95 @@
 {
+    "barrier": {
+        "name": "Barriers",
+        "description": "Obstacles while cycling, such as bollards and cycle barriers",
+        "title": {
+            "render": "Barrier",
+            "mappings": {
+                "0": {
+                    "then": "Bollard"
+                },
+                "1": {
+                    "then": "Cycling Barrier"
+                }
+            }
+        },
+        "presets": {
+            "0": {
+                "title": "Bollard",
+                "description": "A bollard in the road"
+            },
+            "1": {
+                "title": "Cycle barrier",
+                "description": "Cycle barrier, slowing down cyclists"
+            }
+        },
+        "tagRenderings": {
+            "0": {
+                "question": "Can a bicycle go past this barrier?",
+                "mappings": {
+                    "0": {
+                        "then": "A cyclist can go past this."
+                    },
+                    "1": {
+                        "then": "A cyclist can not go past this."
+                    }
+                }
+            },
+            "1": {
+                "question": "What kind of bollard is this?",
+                "mappings": {
+                    "0": {
+                        "then": "Removable bollard"
+                    },
+                    "1": {
+                        "then": "Fixed bollard"
+                    },
+                    "2": {
+                        "then": "Bollard that can be folded down"
+                    },
+                    "3": {
+                        "then": "Flexible bollard, usually plastic"
+                    },
+                    "4": {
+                        "then": "Rising bollard"
+                    }
+                }
+            },
+            "2": {
+                "question": "What kind of cycling barrier is this?",
+                "mappings": {
+                    "0": {
+                        "then": "Single, just two barriers with a space inbetween <img src='./assets/themes/cycle_infra/Cycle_barrier_single.png' style='width:8em'>"
+                    },
+                    "1": {
+                        "then": "Double, two barriers behind each other <img src='./assets/themes/cycle_infra/Cycle_barrier_double.png' style='width:8em'>"
+                    },
+                    "2": {
+                        "then": "Triple, three barriers behind each other <img src='./assets/themes/cycle_infra/Cycle_barrier_triple.png' style='width:8em'>"
+                    },
+                    "3": {
+                        "then": "Squeeze gate, gap is smaller at top, than at the bottom <img src='./assets/themes/cycle_infra/Cycle_barrier_squeeze.png' style='width:8em'>"
+                    }
+                }
+            },
+            "3": {
+                "render": "Maximum width: {maxwidth:physical} m",
+                "question": "How wide is the gap left over besides the barrier?"
+            },
+            "4": {
+                "render": "Space between barriers (along the length of the road): {width:seperation} m",
+                "question": "How much space is there between the barriers (along the length of the road)?"
+            },
+            "5": {
+                "render": "Width of opening: {width:opening} m",
+                "question": "How wide is the smallest opening next to the barriers?"
+            },
+            "6": {
+                "render": "Overlap: {overlap} m",
+                "question": "How much overlap do the barriers have?"
+            }
+        }
+    },
     "bench": {
         "name": "Benches",
         "title": {
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index 24f9088ce..d106d87b4 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -1,4 +1,94 @@
 {
+    "barrier": {
+        "name": "Barrières",
+        "description": "Hindernissen tijdens het fietsen, zoals paaltjes en fietshekjes",
+        "title": {
+            "render": "Barrière",
+            "mappings": {
+                "0": {
+                    "then": "Paaltje"
+                },
+                "1": {
+                    "then": "Fietshekjes"
+                }
+            }
+        },
+        "presets": {
+            "0": {
+                "title": "Paaltje",
+                "description": "Een paaltje in de weg"
+            },
+            "1": {
+                "title": "Fietshekjes",
+                "description": "Fietshekjes, voor het afremmen van fietsers"
+            }
+        },
+        "tagRenderings": {
+            "0": {
+                "question": "Kan een fietser langs deze barrière?",
+                "mappings": {
+                    "0": {
+                        "then": "Een fietser kan hier langs."
+                    },
+                    "1": {
+                        "then": "Een fietser kan hier niet langs."
+                    }
+                }
+            },
+            "1": {
+                "question": "Wat voor soort paal is dit?",
+                "mappings": {
+                    "0": {
+                        "then": "Verwijderbare paal"
+                    },
+                    "1": {
+                        "then": "Vaste paal"
+                    },
+                    "2": {
+                        "then": "Paal die platgevouwen kan worden"
+                    },
+                    "3": {
+                        "then": "Flexibele paal, meestal plastic"
+                    },
+                    "4": {
+                        "then": "Verzonken poller"
+                    }
+                }
+            },
+            "2": {
+                "question": "Wat voor fietshekjes zijn dit?",
+                "mappings": {
+                    "0": {
+                        "then": "Enkelvoudig, slechts twee hekjes met ruimte ertussen <img src='./assets/themes/cycle_infra/Cycle_barrier_single.png' style='width:8em'>"
+                    },
+                    "1": {
+                        "then": "Dubbel, twee hekjes achter elkaar <img src='./assets/themes/cycle_infra/Cycle_barrier_double.png' style='width:8em'>"
+                    },
+                    "2": {
+                        "then": "Drievoudig, drie hekjes achter elkaar <img src='./assets/themes/cycle_infra/Cycle_barrier_triple.png' style='width:8em'>"
+                    },
+                    "3": {
+                        "then": "Knijppoort, ruimte is smaller aan de top, dan aan de bodem <img src='./assets/themes/cycle_infra/Cycle_barrier_squeeze.png' style='width:8em'>"
+                    }
+                }
+            },
+            "3": {
+                "render": "Maximumbreedte: {maxwidth:physical} m",
+                "question": "Hoe breed is de ruimte naast de barrière?"
+            },
+            "4": {
+                "render": "Ruimte tussen barrières (langs de lengte van de weg): {width:seperation} m",
+                "question": "Hoeveel ruimte is er tussen de barrières (langs de lengte van de weg)?"
+            },
+            "5": {
+                "render": "Breedte van de opening: {width:opening} m",
+                "question": "Hoe breed is de smalste opening naast de barrières?"
+            },
+            "6": {
+                "question": "Hoeveel overlappen de barrières?"
+            }
+        }
+    },
     "bench": {
         "name": "Zitbanken",
         "title": {
diff --git a/langs/themes/en.json b/langs/themes/en.json
index a7984caf5..010889dd5 100644
--- a/langs/themes/en.json
+++ b/langs/themes/en.json
@@ -1132,97 +1132,6 @@
                         "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>"
                     }
                 }
-            },
-            "2": {
-                "name": "Barriers",
-                "description": "Obstacles while cycling, such as bollards and cycle barriers",
-                "title": {
-                    "render": "Barrier",
-                    "mappings": {
-                        "0": {
-                            "then": "Bollard"
-                        },
-                        "1": {
-                            "then": "Cycling Barrier"
-                        }
-                    }
-                },
-                "presets": {
-                    "0": {
-                        "title": "Bollard",
-                        "description": "A bollard in the road"
-                    },
-                    "1": {
-                        "title": "Cycle barrier",
-                        "description": "Cycle barrier, slowing down cyclists"
-                    }
-                },
-                "tagRenderings": {
-                    "0": {
-                        "question": "Can a bicycle go past this barrier?",
-                        "mappings": {
-                            "0": {
-                                "then": "A cyclist can go past this."
-                            },
-                            "1": {
-                                "then": "A cyclist can not go past this."
-                            }
-                        }
-                    },
-                    "1": {
-                        "question": "What kind of bollard is this?",
-                        "mappings": {
-                            "0": {
-                                "then": "Removable bollard"
-                            },
-                            "1": {
-                                "then": "Fixed bollard"
-                            },
-                            "2": {
-                                "then": "Bollard that can be folded down"
-                            },
-                            "3": {
-                                "then": "Flexible bollard, usually plastic"
-                            },
-                            "4": {
-                                "then": "Rising bollard"
-                            }
-                        }
-                    },
-                    "2": {
-                        "question": "What kind of cycling barrier is this?",
-                        "mappings": {
-                            "0": {
-                                "then": "Single, just two barriers with a space inbetween <img src='./assets/themes/cycle_infra/Cycle_barrier_single.png' style='width:8em'>"
-                            },
-                            "1": {
-                                "then": "Double, two barriers behind each other <img src='./assets/themes/cycle_infra/Cycle_barrier_double.png' style='width:8em'>"
-                            },
-                            "2": {
-                                "then": "Triple, three barriers behind each other <img src='./assets/themes/cycle_infra/Cycle_barrier_triple.png' style='width:8em'>"
-                            },
-                            "3": {
-                                "then": "Squeeze gate, gap is smaller at top, than at the bottom <img src='./assets/themes/cycle_infra/Cycle_barrier_squeeze.png' style='width:8em'>"
-                            }
-                        }
-                    },
-                    "3": {
-                        "render": "Maximum width: {maxwidth:physical} m",
-                        "question": "How wide is the gap left over besides the barrier?"
-                    },
-                    "4": {
-                        "render": "Space between barriers (along the length of the road): {width:seperation} m",
-                        "question": "How much space is there between the barriers (along the length of the road)?"
-                    },
-                    "5": {
-                        "render": "Width of opening: {width:opening} m",
-                        "question": "How wide is the smallest opening next to the barriers?"
-                    },
-                    "6": {
-                        "render": "Overlap: {overlap} m",
-                        "question": "How much overlap do the barriers have?"
-                    }
-                }
             }
         }
     },
diff --git a/langs/themes/nl.json b/langs/themes/nl.json
index 9af8bb8aa..ecfac3185 100644
--- a/langs/themes/nl.json
+++ b/langs/themes/nl.json
@@ -994,96 +994,6 @@
                         "question": "Hoe breed is de rijbaan in deze straat (in meters)?<br/><span class='subtle'>Gemeten van stoepsteen tot stoepsten, inclusief parkeerstroken</span>"
                     }
                 }
-            },
-            "2": {
-                "name": "Barrières",
-                "description": "Hindernissen tijdens het fietsen, zoals paaltjes en fietshekjes",
-                "title": {
-                    "render": "Barrière",
-                    "mappings": {
-                        "0": {
-                            "then": "Paaltje"
-                        },
-                        "1": {
-                            "then": "Fietshekjes"
-                        }
-                    }
-                },
-                "presets": {
-                    "0": {
-                        "title": "Paaltje",
-                        "description": "Een paaltje in de weg"
-                    },
-                    "1": {
-                        "title": "Fietshekjes",
-                        "description": "Fietshekjes, voor het afremmen van fietsers"
-                    }
-                },
-                "tagRenderings": {
-                    "0": {
-                        "question": "Kan een fietser langs deze barrière?",
-                        "mappings": {
-                            "0": {
-                                "then": "Een fietser kan hier langs."
-                            },
-                            "1": {
-                                "then": "Een fietser kan hier niet langs."
-                            }
-                        }
-                    },
-                    "1": {
-                        "question": "Wat voor soort paal is dit?",
-                        "mappings": {
-                            "0": {
-                                "then": "Verwijderbare paal"
-                            },
-                            "1": {
-                                "then": "Vaste paal"
-                            },
-                            "2": {
-                                "then": "Paal die platgevouwen kan worden"
-                            },
-                            "3": {
-                                "then": "Flexibele paal, meestal plastic"
-                            },
-                            "4": {
-                                "then": "Verzonken poller"
-                            }
-                        }
-                    },
-                    "2": {
-                        "question": "Wat voor fietshekjes zijn dit?",
-                        "mappings": {
-                            "0": {
-                                "then": "Enkelvoudig, slechts twee hekjes met ruimte ertussen <img src='./assets/themes/cycle_infra/Cycle_barrier_single.png' style='width:8em'>"
-                            },
-                            "1": {
-                                "then": "Dubbel, twee hekjes achter elkaar <img src='./assets/themes/cycle_infra/Cycle_barrier_double.png' style='width:8em'>"
-                            },
-                            "2": {
-                                "then": "Drievoudig, drie hekjes achter elkaar <img src='./assets/themes/cycle_infra/Cycle_barrier_triple.png' style='width:8em'>"
-                            },
-                            "3": {
-                                "then": "Knijppoort, ruimte is smaller aan de top, dan aan de bodem <img src='./assets/themes/cycle_infra/Cycle_barrier_squeeze.png' style='width:8em'>"
-                            }
-                        }
-                    },
-                    "3": {
-                        "render": "Maximumbreedte: {maxwidth:physical} m",
-                        "question": "Hoe breed is de ruimte naast de barrière?"
-                    },
-                    "4": {
-                        "render": "Ruimte tussen barrières (langs de lengte van de weg): {width:seperation} m",
-                        "question": "Hoeveel ruimte is er tussen de barrières (langs de lengte van de weg)?"
-                    },
-                    "5": {
-                        "render": "Breedte van de opening: {width:opening} m",
-                        "question": "Hoe breed is de smalste opening naast de barrières?"
-                    },
-                    "6": {
-                        "question": "Hoeveel overlappen de barrières?"
-                    }
-                }
             }
         }
     },