diff --git a/langs/layers/en.json b/langs/layers/en.json
index bd38ea4ae..1affa8aef 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -417,6 +417,94 @@
             "render": "Bicycle library"
         }
     },
+    "bicycle_rental": {
+        "description": "Bicycle rental stations",
+        "name": "Bicycle rental",
+        "tagRenderings": {
+            "8": {
+                "renderings": {
+                    "0": {
+                        "question": "How much type_plural can be rented here? ",
+                        "render": "{capacity:bicycle_type} type_plural can be rented here"
+                    }
+                },
+                "rewrite": {
+                    "into": {
+                        "0": {
+                            "1": "city bikes"
+                        },
+                        "1": {
+                            "1": "electrical bikes"
+                        },
+                        "2": {
+                            "1": "bikes for children"
+                        },
+                        "3": {
+                            "1": "BMX bikes"
+                        },
+                        "4": {
+                            "1": "mountainbike"
+                        },
+                        "5": {
+                            "1": "bicycle panniers"
+                        }
+                    }
+                }
+            },
+            "bicycle-types": {
+                "mappings": {
+                    "0": {
+                        "then": "Normal city bikes can be rented here"
+                    },
+                    "1": {
+                        "then": "Electrical bikes can be rented here"
+                    },
+                    "2": {
+                        "then": "BMX bikes can be rented here"
+                    },
+                    "3": {
+                        "then": "Mountainbikes can be rented here"
+                    },
+                    "4": {
+                        "then": "Bikes for childs can be rented here"
+                    }
+                },
+                "question": "What kind of bicycles and accessories are rented here?",
+                "render": "{rental} is rented here"
+            },
+            "bicycle_rental_type": {
+                "mappings": {
+                    "0": {
+                        "then": "This is a shop whose main focus is bicycle rental"
+                    },
+                    "1": {
+                        "then": "This is a rental buisiness which rents out various objects and/or vehicles. It rents out bicycles too, but this is not the main focus"
+                    },
+                    "2": {
+                        "then": "This is a shop which sells or repairs bicycles, but also rents out bicycles"
+                    },
+                    "3": {
+                        "then": "This is an automated docking station, where a bicycle is mechanically locked into a structure"
+                    },
+                    "4": {
+                        "then": "A machine is present which dispenses and accepts keys, eventually after authentication and/or payment. The bicycles are parked nearby"
+                    },
+                    "5": {
+                        "then": "This is a dropoff point: a designated bicycle parking for this cycle rental"
+                    }
+                },
+                "question": "What kind of bicycle rental is this?"
+            }
+        },
+        "title": {
+            "mappings": {
+                "0": {
+                    "then": "{name}"
+                }
+            },
+            "render": "Bicycle rental"
+        }
+    },
     "bicycle_tube_vending_machine": {
         "description": "A layer showing vending machines for bicycle tubes (either purpose-built bicycle tube vending machines or classical vending machines with bicycle tubes and optionally additional bicycle related objects such as lights, gloves, locks, ...)",
         "name": "Bicycle tube vending machine",
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index ab8b2b96a..29d4a9d95 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -363,6 +363,94 @@
             "render": "Fietsbibliotheek"
         }
     },
+    "bicycle_rental": {
+        "description": "Fietsverhuustations",
+        "name": "Fietsverhuur",
+        "tagRenderings": {
+            "8": {
+                "renderings": {
+                    "0": {
+                        "question": "Hoeveel type_plural kunnen hier uitgeleend worden?",
+                        "render": "{capacity:bicycle_type} type_plural kunnen hier uitgeleend worden"
+                    }
+                },
+                "rewrite": {
+                    "into": {
+                        "0": {
+                            "1": "Stadsfietsen"
+                        },
+                        "1": {
+                            "1": "elektrische fietsen"
+                        },
+                        "2": {
+                            "1": "Kinderfietsen"
+                        },
+                        "3": {
+                            "1": "BMX-fietsen"
+                        },
+                        "4": {
+                            "1": "mountainbike"
+                        },
+                        "5": {
+                            "1": "Fietstassen"
+                        }
+                    }
+                }
+            },
+            "bicycle-types": {
+                "mappings": {
+                    "0": {
+                        "then": "Gewone stadsfietsen kunnen hier gehuurd worden"
+                    },
+                    "1": {
+                        "then": "Elektrische fietsen kunnen hier gehuurd worden"
+                    },
+                    "2": {
+                        "then": "BMX-fietsen kunnen hier gehuurd worden"
+                    },
+                    "3": {
+                        "then": "Mountainbikes kunnen hier gehuurd worden"
+                    },
+                    "4": {
+                        "then": "Kinderfietsen kunnen hier gehuurd worden"
+                    }
+                },
+                "question": "Wat voor soort fietsen en fietstoebehren worden hier verhuurd?",
+                "render": "{rental} wordt hier uitgeleend"
+            },
+            "bicycle_rental_type": {
+                "mappings": {
+                    "0": {
+                        "then": "Dit is een zaak die focust op fietsverhuur"
+                    },
+                    "1": {
+                        "then": "Dit is een zaak die verschillende voorwerpen en/of voertuigen verhuurt, waaronder ook fietsen; al zijn fietsen niet de hoofdfocus"
+                    },
+                    "2": {
+                        "then": "Dit is een fietsenmaker of fietswinkel die ook fietsen veruurt"
+                    },
+                    "3": {
+                        "then": "Dit is een docking station waar de fietsen mechanisch in een grotere structuur worden vastgemaakt"
+                    },
+                    "4": {
+                        "then": "Hier is een machine die fietssleutels verdeelt en terugneemt, eventueel na aanmelden of betaling. De fietsen staan in de buurt geparkeerd"
+                    },
+                    "5": {
+                        "then": "Dit is een afzetpunt: een parking met duidelijke signalisatie waar (enkel) fietsen van deze fietsverhuur gezet worden"
+                    }
+                },
+                "question": "Wat voor fietsverhuur is dit?"
+            }
+        },
+        "title": {
+            "mappings": {
+                "0": {
+                    "then": "{name}"
+                }
+            },
+            "render": "Fietsverhuur"
+        }
+    },
     "bicycle_tube_vending_machine": {
         "name": "Fietsbanden-verkoopsautomaat",
         "presets": {
diff --git a/langs/themes/en.json b/langs/themes/en.json
index 8627d37c1..322d5816a 100644
--- a/langs/themes/en.json
+++ b/langs/themes/en.json
@@ -14,96 +14,6 @@
     },
     "bicycle_rental": {
         "description": "On this map, you'll find the many biycle rental stations as they are known by OpenStreetMap",
-        "layers": {
-            "0": {
-                "description": "Bicycle rental stations",
-                "name": "Bicycle rental",
-                "tagRenderings": {
-                    "8": {
-                        "renderings": {
-                            "0": {
-                                "question": "How much type_plural can be rented here? ",
-                                "render": "{capacity:bicycle_type} type_plural can be rented here"
-                            }
-                        },
-                        "rewrite": {
-                            "into": {
-                                "0": {
-                                    "1": "city bikes"
-                                },
-                                "1": {
-                                    "1": "electrical bikes"
-                                },
-                                "2": {
-                                    "1": "bikes for children"
-                                },
-                                "3": {
-                                    "1": "BMX bikes"
-                                },
-                                "4": {
-                                    "1": "mountainbike"
-                                },
-                                "5": {
-                                    "1": "bicycle panniers"
-                                }
-                            }
-                        }
-                    },
-                    "bicycle-types": {
-                        "mappings": {
-                            "0": {
-                                "then": "Normal city bikes can be rented here"
-                            },
-                            "1": {
-                                "then": "Electrical bikes can be rented here"
-                            },
-                            "2": {
-                                "then": "BMX bikes can be rented here"
-                            },
-                            "3": {
-                                "then": "Mountainbikes can be rented here"
-                            },
-                            "4": {
-                                "then": "Bikes for childs can be rented here"
-                            }
-                        },
-                        "question": "What kind of bicycles and accessories are rented here?",
-                        "render": "{rental} is rented here"
-                    },
-                    "bicycle_rental_type": {
-                        "mappings": {
-                            "0": {
-                                "then": "This is a shop whose main focus is bicycle rental"
-                            },
-                            "1": {
-                                "then": "This is a rental buisiness which rents out various objects and/or vehicles. It rents out bicycles too, but this is not the main focus"
-                            },
-                            "2": {
-                                "then": "This is a shop which sells or repairs bicycles, but also rents out bicycles"
-                            },
-                            "3": {
-                                "then": "This is an automated docking station, where a bicycle is mechanically locked into a structure"
-                            },
-                            "4": {
-                                "then": "A machine is present which dispenses and accepts keys, eventually after authentication and/or payment. The bicycles are parked nearby"
-                            },
-                            "5": {
-                                "then": "This is a dropoff point: a designated bicycle parking for this cycle rental"
-                            }
-                        },
-                        "question": "What kind of bicycle rental is this?"
-                    }
-                },
-                "title": {
-                    "mappings": {
-                        "0": {
-                            "then": "{name}"
-                        }
-                    },
-                    "render": "Bicycle rental"
-                }
-            }
-        },
         "shortDescription": "A map with biyccle rental stations and bicycle rental shops",
         "title": "Bicycle rental"
     },
diff --git a/langs/themes/nl.json b/langs/themes/nl.json
index b5b3de28b..4c3758fd7 100644
--- a/langs/themes/nl.json
+++ b/langs/themes/nl.json
@@ -18,95 +18,6 @@
     },
     "bicycle_rental": {
         "description": "Op deze kaart vind je verschillende fietsverhuurpunten en fietsverhuurzaken",
-        "layers": {
-            "0": {
-                "description": "Fietsverhuustations",
-                "name": "Fietsverhuur",
-                "tagRenderings": {
-                    "8": {
-                        "renderings": {
-                            "0": {
-                                "question": "Hoeveel type_plural kunnen hier uitgeleend worden?",
-                                "render": "{capacity:bicycle_type} type_plural kunnen hier uitgeleend worden"
-                            }
-                        },
-                        "rewrite": {
-                            "into": {
-                                "0": {
-                                    "1": "Stadsfietsen"
-                                },
-                                "1": {
-                                    "1": "elektrische fietsen"
-                                },
-                                "2": {
-                                    "1": "Kinderfietsen"
-                                },
-                                "3": {
-                                    "1": "BMX-fietsen"
-                                },
-                                "4": {
-                                    "1": "mountainbike"
-                                },
-                                "5": {
-                                    "1": "Fietstassen"
-                                }
-                            }
-                        }
-                    },
-                    "bicycle-types": {
-                        "mappings": {
-                            "0": {
-                                "then": "Gewone stadsfietsen kunnen hier gehuurd worden"
-                            },
-                            "1": {
-                                "then": "Elektrische fietsen kunnen hier gehuurd worden"
-                            },
-                            "2": {
-                                "then": "BMX-fietsen kunnen hier gehuurd worden"
-                            },
-                            "3": {
-                                "then": "Mountainbikes kunnen hier gehuurd worden"
-                            },
-                            "4": {
-                                "then": "Kinderfietsen kunnen hier gehuurd worden"
-                            }
-                        },
-                        "question": "Wat voor soort fietsen en fietstoebehren worden hier verhuurd?"
-                    },
-                    "bicycle_rental_type": {
-                        "mappings": {
-                            "0": {
-                                "then": "Dit is een zaak die focust op fietsverhuur"
-                            },
-                            "1": {
-                                "then": "Dit is een zaak die verschillende voorwerpen en/of voertuigen verhuurt, waaronder ook fietsen; al zijn fietsen niet de hoofdfocus"
-                            },
-                            "2": {
-                                "then": "Dit is een fietsenmaker of fietswinkel die ook fietsen veruurt"
-                            },
-                            "3": {
-                                "then": "Dit is een docking station waar de fietsen mechanisch in een grotere structuur worden vastgemaakt"
-                            },
-                            "4": {
-                                "then": "Hier is een machine die fietssleutels verdeelt en terugneemt, eventueel na aanmelden of betaling. De fietsen staan in de buurt geparkeerd"
-                            },
-                            "5": {
-                                "then": "Dit is een afzetpunt: een parking met duidelijke signalisatie waar (enkel) fietsen van deze fietsverhuur gezet worden"
-                            }
-                        },
-                        "question": "Wat voor fietsverhuur is dit?"
-                    }
-                },
-                "title": {
-                    "mappings": {
-                        "0": {
-                            "then": "{name}"
-                        }
-                    },
-                    "render": "Fietsverhuur"
-                }
-            }
-        },
         "shortDescription": "Een kaart met fietsverhuurpunten en fietsverhuurzaken",
         "title": "Fietsverhuur"
     },