diff --git a/Logic/UIEventSource.ts b/Logic/UIEventSource.ts
index acbf23f27..ebf4400c2 100644
--- a/Logic/UIEventSource.ts
+++ b/Logic/UIEventSource.ts
@@ -11,6 +11,10 @@ export class UIEventSource<T> {
     constructor(data: T, tag: string = "") {
         this.tag = tag;
         this.data = data;
+        if(tag === undefined || tag === ""){
+            const callstack = new Error().stack.split("\n")
+            this.tag = callstack[1]
+        }
         UIEventSource.allSources.push(this);
     }
 
@@ -278,9 +282,11 @@ export class UIEventSource<T> {
                   g: ((j: J, t: T) => T) = undefined): UIEventSource<J> {
         const self = this;
 
+        const stack = new Error().stack.split("\n");
+        const callee = stack[1]
         const newSource = new UIEventSource<J>(
             f(this.data),
-            "map(" + this.tag + ")"
+            "map(" + this.tag + ")@"+callee
         );
 
         const update = function () {
diff --git a/UI/BigComponents/BackgroundMapSwitch.ts b/UI/BigComponents/BackgroundMapSwitch.ts
index 16fd17bb3..268fde159 100644
--- a/UI/BigComponents/BackgroundMapSwitch.ts
+++ b/UI/BigComponents/BackgroundMapSwitch.ts
@@ -197,6 +197,7 @@ export default class BackgroundMapSwitch extends Combine {
 
         super(buttons)
         this.SetClass("flex")
+        currentBackground.addCallbackAndRun(bg => console.trace("Current background is", bg.id))
     }
 
 }
\ No newline at end of file
diff --git a/UI/BigComponents/SimpleAddUI.ts b/UI/BigComponents/SimpleAddUI.ts
index 04a3aa314..6e1bdb4f4 100644
--- a/UI/BigComponents/SimpleAddUI.ts
+++ b/UI/BigComponents/SimpleAddUI.ts
@@ -22,6 +22,7 @@ import {Changes} from "../../Logic/Osm/Changes";
 import FeaturePipeline from "../../Logic/FeatureSource/FeaturePipeline";
 import {ElementStorage} from "../../Logic/ElementStorage";
 import ConfirmLocationOfPoint from "../NewPoint/ConfirmLocationOfPoint";
+import BaseLayer from "../../Models/BaseLayer";
 
 /*
 * The SimpleAddUI is a single panel, which can have multiple states:
@@ -52,6 +53,7 @@ export default class SimpleAddUI extends Toggle {
                     locationControl: UIEventSource<Loc>,
                     filteredLayers: UIEventSource<FilteredLayer[]>,
                     featureSwitchFilter: UIEventSource<boolean>,
+                    backgroundLayer: UIEventSource<BaseLayer>
                 }) {
         const loginButton = new SubtleButton(Svg.osm_logo_ui(), Translations.t.general.add.pleaseLogin.Clone())
             .onClick(() => state.osmConnection.AttemptLogin());
diff --git a/UI/NewPoint/ConfirmLocationOfPoint.ts b/UI/NewPoint/ConfirmLocationOfPoint.ts
index 68e380997..baabd0334 100644
--- a/UI/NewPoint/ConfirmLocationOfPoint.ts
+++ b/UI/NewPoint/ConfirmLocationOfPoint.ts
@@ -12,6 +12,7 @@ import Translations from "../i18n/Translations";
 import Svg from "../../Svg";
 import Toggle from "../Input/Toggle";
 import SimpleAddUI, {PresetInfo} from "../BigComponents/SimpleAddUI";
+import BaseLayer from "../../Models/BaseLayer";
 
 export default class ConfirmLocationOfPoint extends Combine {
 
@@ -19,7 +20,8 @@ export default class ConfirmLocationOfPoint extends Combine {
     constructor(
         state: {
             osmConnection: OsmConnection,
-            featurePipeline: FeaturePipeline
+            featurePipeline: FeaturePipeline,
+            backgroundLayer?: UIEventSource<BaseLayer>
         },
         filterViewIsOpened: UIEventSource<boolean>,
         preset: PresetInfo,
@@ -35,9 +37,11 @@ export default class ConfirmLocationOfPoint extends Combine {
             const zloc = {...loc, zoom: 19}
             const locationSrc = new UIEventSource(zloc);
 
-            let backgroundLayer = undefined;
+            let backgroundLayer = new UIEventSource(state?.backgroundLayer?.data ?? AvailableBaseLayers.osmCarto);
             if (preset.preciseInput.preferredBackground) {
-                backgroundLayer = AvailableBaseLayers.SelectBestLayerAccordingTo(locationSrc, new UIEventSource<string | string[]>(preset.preciseInput.preferredBackground))
+                const defaultBackground = AvailableBaseLayers.SelectBestLayerAccordingTo(locationSrc, new UIEventSource<string | string[]>(preset.preciseInput.preferredBackground));
+                // Note that we _break the link_ here, as the minimap will take care of the switching!
+                backgroundLayer.setData(defaultBackground.data)
             }
 
             let snapToFeatures: UIEventSource<{ feature: any }[]> = undefined
diff --git a/assets/layers/ambulancestation/ambulancestation.json b/assets/layers/ambulancestation/ambulancestation.json
new file mode 100644
index 000000000..94b23a87b
--- /dev/null
+++ b/assets/layers/ambulancestation/ambulancestation.json
@@ -0,0 +1,234 @@
+{
+  "id": "ambulancestation",
+  "name": {
+    "en": "Map of ambulance stations",
+    "ja": "救急ステーションの地図",
+    "ru": "Карта станций скорой помощи",
+    "fr": "Couche des ambulances",
+    "de": "Karte der Rettungswachen",
+    "it": "Carta delle stazioni delle ambulanze"
+  },
+  "minzoom": 12,
+  "source": {
+    "osmTags": {
+      "and": [
+        "emergency=ambulance_station"
+      ]
+    }
+  },
+  "title": {
+    "render": {
+      "en": "Ambulance Station",
+      "ru": "Станция скорой помощи",
+      "ja": "救急ステーション",
+      "fr": "Station d’ambulances",
+      "de": "Rettungswache",
+      "it": "Stazione delle ambulanze"
+    }
+  },
+  "description": {
+    "en": "An ambulance station is an area for storage of ambulance vehicles, medical equipment, personal protective equipment, and other medical supplies.",
+    "ja": "救急ステーションは、救急車、医療機器、個人用保護具、およびその他の医療用品を保管する場所です。",
+    "fr": "Une station d’ambulance est un lieu où sont stockés les véhicules d’urgence ainsi que de l’équipement médical.",
+    "de": "Eine Rettungswache ist ein Ort, an dem Rettungsfahrzeuge, medizinische Ausrüstung, persönliche Schutzausrüstung und anderes medizinisches Material untergebracht sind.",
+    "it": "La stazione delle ambulanze è un’area per lo stoccaggio delle ambulanze, dell’equipaggiamento medico, dei dispositivi di protezione individuale e di altre forniture medicali."
+  },
+  "tagRenderings": [
+    {
+      "id": "ambulance-name",
+      "freeform": {
+        "key": "name"
+      },
+      "question": {
+        "en": "What is the name of this ambulance station?",
+        "ja": "この救急ステーションの名前は何ですか?",
+        "ru": "Как называется эта станция скорой помощи?",
+        "fr": "Quel est le nom de cette station ?",
+        "it": "Qual è il nome di questa stazione delle ambulanze?"
+      },
+      "render": {
+        "en": "This station is called {name}.",
+        "ja": "このステーションの名前は{name}です。",
+        "ru": "Эта станция называется {name}.",
+        "fr": "Cette station s’appelle {name}.",
+        "it": "Questa stazione è chiamata {name}."
+      }
+    },
+    {
+      "id": "ambulance-street",
+      "freeform": {
+        "key": "addr:street"
+      },
+      "question": {
+        "en": " What is the street name where the station located?",
+        "ja": " 救急ステーションの所在地はどこですか?",
+        "ru": " По какому адресу расположена эта станция?",
+        "fr": " Quel est le nom de la rue où la station se situe ?",
+        "it": " Come si chiama la strada in cui si trova questa stazione?"
+      },
+      "render": {
+        "en": "This station is along a highway called {addr:street}.",
+        "ja": "{addr:street} 沿いにあります。",
+        "ru": "Эта станция расположена вдоль шоссе {addr:street}.",
+        "fr": "La station fait partie de {addr:street}.",
+        "it": "Questa stazione si trova in {addr:street}."
+      }
+    },
+    {
+      "id": "ambulance-place",
+      "question": {
+        "en": "Where is the station located? (e.g. name of neighborhood, villlage, or town)",
+        "ja": "このステーションの住所は?(例: 地区、村、または町の名称)",
+        "ru": "Где расположена станция? (напр., название населённого пункта)",
+        "fr": "Dans quelle localité la station est-elle située ?",
+        "it": "Dove si trova la stazione? (ad es. quartiere, paese o città)"
+      },
+      "freeform": {
+        "key": "addr:place"
+      },
+      "render": {
+        "en": "This station is found within {addr:place}.",
+        "ja": "このステーションは{addr:place}にあります。",
+        "fr": "La station fait partie de {addr:place}.",
+        "it": "La stazione si trova a {addr:place}."
+      }
+    },
+    {
+      "id": "ambulance-agency",
+      "question": {
+        "en": "What agency operates this station?",
+        "ja": "このステーションを運営しているのはどこですか?",
+        "fr": "Quel est l’exploitant de la station ?",
+        "it": "Quale agenzia gestisce questa stazione?"
+      },
+      "render": {
+        "en": "This station is operated by {operator}.",
+        "ja": "このステーションは{operator}によって運営されています。",
+        "fr": "Cette station est opérée par {operator}.",
+        "it": "Questa stazione è gestita da {operator}."
+      },
+      "freeform": {
+        "key": "operator"
+      },
+      "mappings": []
+    },
+    {
+      "id": "ambulance-operator-type",
+      "question": {
+        "en": "How is the station operator classified?",
+        "ja": "ステーションの運営の分類は?",
+        "fr": "Quel est le type d’exploitant ?",
+        "it": "Com’è classificato il gestore della stazione?"
+      },
+      "render": {
+        "en": "The operator is a(n) {operator:type} entity.",
+        "ja": "運営者は、{operator:type} です。",
+        "fr": "L’exploitant est de type {operator:type}.",
+        "it": "L’operatore è un ente {operator:type}."
+      },
+      "freeform": {
+        "key": "operator:type"
+      },
+      "mappings": [
+        {
+          "if": {
+            "and": [
+              "operator:type=government"
+            ]
+          },
+          "then": {
+            "en": "The station is operated by the government.",
+            "ja": "ステーションは自治体が運営する。",
+            "fr": "La station est opérée par le gouvernement.",
+            "it": "La stazione è gestita dal governo."
+          }
+        },
+        {
+          "if": {
+            "and": [
+              "operator:type=community"
+            ]
+          },
+          "then": {
+            "en": "The station is operated by a community-based, or informal organization.",
+            "ja": "任意団体やコミュニティが運営しているステーションである。",
+            "fr": "La station est opérée par une organisation informelle.",
+            "it": "La stazione è gestita dalla comunità o un’organizzazione non ufficiale."
+          }
+        },
+        {
+          "if": {
+            "and": [
+              "operator:type=ngo"
+            ]
+          },
+          "then": {
+            "en": "The station is operated by a formal group of volunteers.",
+            "ja": "公益団体が運営しているステーションである。",
+            "fr": "La station est opérée par un groupe officiel de bénévoles.",
+            "it": "La stazione è gestita da un gruppo ufficiale di volontari."
+          }
+        },
+        {
+          "if": {
+            "and": [
+              "operator:type=private"
+            ]
+          },
+          "then": {
+            "en": "The station is privately operated.",
+            "ja": "個人が運営しているステーションである。",
+            "fr": "La station est opérée par un groupe privé.",
+            "it": "La stazione è gestita da un privato."
+          }
+        }
+      ]
+    },
+    "images"
+  ],
+  "presets": [
+    {
+      "tags": [
+        "emergency=ambulance_station"
+      ],
+      "title": {
+        "en": "Ambulance station",
+        "ru": "Станция скорой помощи",
+        "ja": "救急ステーション(消防署)",
+        "fr": "Station d’ambulances",
+        "de": "Rettungswache",
+        "it": "Stazione delle ambulanze"
+      },
+      "description": {
+        "en": "Add an ambulance station to the map",
+        "ja": "救急ステーション(消防署)をマップに追加する",
+        "ru": "Добавить станцию скорой помощи на карту",
+        "fr": "Ajouter une station d’ambulances à la carte",
+        "de": "Eine Rettungsstation der Karte hinzufügen",
+        "it": "Aggiungi una stazione delle ambulanza alla mappa"
+      }
+    }
+  ],
+  "mapRendering": [
+    {
+      "icon": {
+        "render": "./assets/themes/hailhydrant/Twemoji_1f691.svg"
+      },
+      "iconSize": {
+        "render": "35,35,center"
+      },
+      "location": [
+        "point",
+        "centroid"
+      ]
+    },
+    {
+      "color": {
+        "render": "#00f"
+      },
+      "width": {
+        "render": "1"
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json
index 044126f36..270751147 100644
--- a/assets/layers/charging_station/charging_station.json
+++ b/assets/layers/charging_station/charging_station.json
@@ -41,7 +41,7 @@
           "if": "bicycle=yes",
           "ifnot": "bicycle=no",
           "then": {
-            "en": "<b>Bcycles</b> can be charged here",
+            "en": "<b>Bicycles</b> can be charged here",
             "nl": "<b>Fietsen</b> kunnen hier opgeladen worden"
           }
         },
@@ -3500,20 +3500,6 @@
         "preferredBackground": "map"
       }
     },
-    {
-      "tags": [
-        "amenity=charging_station",
-        "motorcar=no",
-        "bicycle=yes"
-      ],
-      "title": {
-        "en": "charging station for e-bikes",
-        "nl": "oplaadpunt voor elektrische fietsen"
-      },
-      "preciseInput": {
-        "preferredBackground": "map"
-      }
-    },
     {
       "tags": [
         "amenity=charging_station",
@@ -3527,18 +3513,6 @@
       "preciseInput": {
         "preferredBackground": "map"
       }
-    },
-    {
-      "tags": [
-        "amenity=charging_station"
-      ],
-      "title": {
-        "en": "charging station",
-        "nl": "oplaadstation"
-      },
-      "preciseInput": {
-        "preferredBackground": "map"
-      }
     }
   ],
   "filter": [
@@ -3609,7 +3583,8 @@
         {
           "question": {
             "en": "Has a <div style='display: inline-block'><b><b>Schuko wall plug</b> without ground pin (CEE7/4 type F)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/CEE7_4F.svg'/></div> connector",
-            "nl": "Heeft een <div style='display: inline-block'><b><b>Schuko stekker</b> zonder aardingspin (CEE7/4 type F)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/CEE7_4F.svg'/></div>"
+            "nl": "Heeft een <div style='display: inline-block'><b><b>Schuko stekker</b> zonder aardingspin (CEE7/4 type F)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/CEE7_4F.svg'/></div>",
+            "de": "Verfügt über einen <div style='display: inline-block'><b><b>Schuko-Stecker</b> ohne Erdungsstift (CEE7/4 Typ F)</b><img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/CEE7_4F.svg'/></div>"
           },
           "osmTags": "socket:schuko~*"
         },
diff --git a/assets/layers/charging_station/charging_station.protojson b/assets/layers/charging_station/charging_station.protojson
index 53e8ab56d..693c2d1b8 100644
--- a/assets/layers/charging_station/charging_station.protojson
+++ b/assets/layers/charging_station/charging_station.protojson
@@ -40,7 +40,7 @@
           "if": "bicycle=yes",
           "ifnot": "bicycle=no",
           "then": {
-            "en": "<b>Bcycles</b> can be charged here",
+            "en": "<b>Bicycles</b> can be charged here",
             "nl": "<b>Fietsen</b> kunnen hier opgeladen worden"
           }
         },
@@ -789,20 +789,6 @@
         "preferredBackground": "map"
       }
     },
-    {
-      "tags": [
-        "amenity=charging_station",
-        "motorcar=no",
-        "bicycle=yes"
-      ],
-      "title": {
-        "en": "charging station for e-bikes",
-        "nl": "oplaadpunt voor elektrische fietsen"
-      },
-      "preciseInput": {
-        "preferredBackground": "map"
-      }
-    },
     {
       "tags": [
         "amenity=charging_station",
@@ -816,18 +802,6 @@
       "preciseInput": {
         "preferredBackground": "map"
       }
-    },
-    {
-      "tags": [
-        "amenity=charging_station"
-      ],
-      "title": {
-        "en": "charging station",
-        "nl": "oplaadstation"
-      },
-      "preciseInput": {
-        "preferredBackground": "map"
-      }
     }
   ],
   "filter": [
diff --git a/assets/layers/crossings/crossings.json b/assets/layers/crossings/crossings.json
index 984545be6..0de0f52f3 100644
--- a/assets/layers/crossings/crossings.json
+++ b/assets/layers/crossings/crossings.json
@@ -273,7 +273,7 @@
           "then": {
             "en": "This traffic light does not have a button to request green light",
             "nl": "Dit verkeerlicht heeft geen knop voor groen licht",
-            "de": "Diese Ampel hat keine Taste, um ein grünes Signal anzufordern."
+            "de": "Diese Ampel hat keine Taste, um ein grünes Signal anzufordern"
           }
         }
       ]
diff --git a/assets/layers/drinking_water/drinking_water.json b/assets/layers/drinking_water/drinking_water.json
index 4e960226f..acceedb4f 100644
--- a/assets/layers/drinking_water/drinking_water.json
+++ b/assets/layers/drinking_water/drinking_water.json
@@ -69,7 +69,7 @@
         "nl": "Deze waterkraan-status is <i>{operational_status}</i>",
         "it": "Lo stato operativo è <i>{operational_status}</i>",
         "fr": "L'état opérationnel est <i>{operational_status}</i>",
-        "de": "Der Betriebsstatus ist <i>{operational_status}/i>"
+        "de": "Der Betriebsstatus ist <i>{operational_status}</i>"
       },
       "freeform": {
         "key": "operational_status"
diff --git a/assets/layers/extinguisher/extinguisher.json b/assets/layers/extinguisher/extinguisher.json
new file mode 100644
index 000000000..61a010cc3
--- /dev/null
+++ b/assets/layers/extinguisher/extinguisher.json
@@ -0,0 +1,137 @@
+{
+  "id": "extinguisher",
+  "name": {
+    "en": "Map of fire extinguishers.",
+    "ja": "消火器の地図です。",
+    "nb_NO": "Kart over brannhydranter",
+    "ru": "Карта огнетушителей.",
+    "fr": "Couche des extincteurs.",
+    "de": "Karte mit Feuerlöschern.",
+    "it": "Cartina degli estintori."
+  },
+  "minzoom": 14,
+  "source": {
+    "osmTags": {
+      "and": [
+        "emergency=fire_extinguisher"
+      ]
+    }
+  },
+  "title": {
+    "render": {
+      "en": "Extinguishers",
+      "ru": "Огнетушители",
+      "ja": "消火器",
+      "nb_NO": "Brannslokkere",
+      "fr": "Exctincteurs",
+      "de": "Feuerlöscher",
+      "it": "Estintori"
+    }
+  },
+  "description": {
+    "en": "Map layer to show fire hydrants.",
+    "ja": "消火栓を表示するマップレイヤ。",
+    "zh_Hant": "顯示消防栓的地圖圖層。",
+    "nb_NO": "Kartlag for å vise brannslokkere.",
+    "ru": "Слой карты, отображающий огнетушители.",
+    "fr": "Couche des lances à incendie.",
+    "de": "Kartenebene zur Anzeige von Hydranten.",
+    "it": "Livello della mappa che mostra gli idranti antincendio."
+  },
+  "tagRenderings": [
+    {
+      "id": "extinguisher-location",
+      "render": {
+        "en": "Location: {location}",
+        "ja": "場所:{location}",
+        "ru": "Местоположение: {location}",
+        "fr": "Emplacement : {location}",
+        "de": "Standort: {location}",
+        "eo": "Loko: {location}",
+        "it": "Posizione: {location}"
+      },
+      "question": {
+        "en": "Where is it positioned?",
+        "ja": "どこにあるんですか?",
+        "ru": "Где это расположено?",
+        "fr": "Où est-elle positionnée ?",
+        "de": "Wo befindet er sich?",
+        "it": "Dove è posizionato?"
+      },
+      "mappings": [
+        {
+          "if": {
+            "and": [
+              "location=indoor"
+            ]
+          },
+          "then": {
+            "en": "Found indoors.",
+            "ja": "屋内にある。",
+            "ru": "Внутри.",
+            "fr": "Intérieur.",
+            "de": "Im Innenraum vorhanden.",
+            "it": "Si trova all’interno."
+          }
+        },
+        {
+          "if": {
+            "and": [
+              "location=outdoor"
+            ]
+          },
+          "then": {
+            "en": "Found outdoors.",
+            "ja": "屋外にある。",
+            "ru": "Снаружи.",
+            "fr": "Extérieur.",
+            "de": "Im Außenraum vorhanden.",
+            "it": "Si trova all’esterno."
+          }
+        }
+      ],
+      "freeform": {
+        "key": "location"
+      }
+    },
+    "images"
+  ],
+  "presets": [
+    {
+      "tags": [
+        "emergency=fire_extinguisher"
+      ],
+      "title": {
+        "en": "Fire extinguisher",
+        "ja": "消火器",
+        "nb_NO": "Brannslukker",
+        "ru": "Огнетушитель",
+        "fr": "Extincteur",
+        "de": "Feuerlöscher",
+        "it": "Estintore"
+      },
+      "description": {
+        "en": "A fire extinguisher is a small, portable device used to stop a fire",
+        "ja": "消火器は、火災を止めるために使用される小型で携帯可能な装置である",
+        "ru": "Огнетушитель - небольшое переносное устройство для тушения огня",
+        "fr": "Un extincteur est un appareil portatif servant à éteindre un feu",
+        "de": "Ein Feuerlöscher ist ein kleines, tragbares Gerät, das dazu dient, ein Feuer zu löschen",
+        "it": "Un estintore è un dispositivo portatile di piccole dimensioni usato per spegnere un incendio"
+      }
+    }
+  ],
+  "mapRendering": [
+    {
+      "icon": {
+        "render": "./assets/themes/hailhydrant/Twemoji12_1f9ef.svg"
+      },
+      "iconSize": {
+        "render": "20,20,center"
+      },
+      "location": [
+        "point",
+        "centroid"
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/assets/layers/fire_station/fire_station.json b/assets/layers/fire_station/fire_station.json
new file mode 100644
index 000000000..66c850e31
--- /dev/null
+++ b/assets/layers/fire_station/fire_station.json
@@ -0,0 +1,257 @@
+{
+  "id": "fire_station",
+  "name": {
+    "en": "Map of fire stations",
+    "ja": "消防署の地図",
+    "nb_NO": "Kart over brannstasjoner",
+    "it": "Mappa delle caserme dei vigili del fuoco",
+    "ru": "Карта пожарных частей",
+    "fr": "Couche des stations de pompiers",
+    "de": "Karte der Feuerwachen"
+  },
+  "minzoom": 12,
+  "source": {
+    "osmTags": {
+      "and": [
+        "amenity=fire_station"
+      ]
+    }
+  },
+  "title": {
+    "render": {
+      "en": "Fire Station",
+      "ja": "消防署",
+      "ru": "Пожарная часть",
+      "nb_NO": "Brannstasjon",
+      "it": "Caserma dei vigili del fuoco",
+      "fr": "Station de pompiers",
+      "de": "Feuerwache"
+    }
+  },
+  "description": {
+    "en": "Map layer to show fire stations.",
+    "ja": "消防署を表示するためのマップレイヤ。",
+    "it": "Livello che mostra le caserme dei vigili del fuoco.",
+    "ru": "Слой карты, отображающий пожарные части.",
+    "fr": "Couche des stations de pompiers.",
+    "de": "Kartenebene zur Darstellung von Feuerwachen."
+  },
+  "tagRenderings": [
+    {
+      "id": "station-name",
+      "freeform": {
+        "key": "name"
+      },
+      "question": {
+        "en": "What is the name of this fire station?",
+        "ja": "この消防署の名前は何ですか?",
+        "ru": "Как называется эта пожарная часть?",
+        "it": "Come si chiama questa caserma dei vigili del fuoco?",
+        "fr": "Quel est le nom de la station ?",
+        "de": "Wie lautet der Name dieser Feuerwache?"
+      },
+      "render": {
+        "en": "This station is called {name}.",
+        "ja": "このステーションの名前は{name}です。",
+        "it": "Questa caserma si chiama {name}.",
+        "ru": "Эта часть называется {name}.",
+        "fr": "Cette station s’appelle {name}.",
+        "nb_NO": "Denne stasjonen heter {name}."
+      }
+    },
+    {
+      "id": "station-street",
+      "freeform": {
+        "key": "addr:street"
+      },
+      "question": {
+        "en": " What is the street name where the station located?",
+        "ja": " 救急ステーションの所在地はどこですか?",
+        "it": " Qual è il nome della via in cui si trova la caserma?",
+        "ru": " По какому адресу расположена эта часть?",
+        "fr": " Quel est le nom de la rue dans lequel elle se situe ?"
+      },
+      "render": {
+        "en": "This station is along a highway called {addr:street}.",
+        "ja": "{addr:street} 沿いにあります。",
+        "ru": "Часть расположена вдоль шоссе {addr:street}.",
+        "fr": "La station fait partie de la {addr:street}.",
+        "it": "La stazione si trova in una strada chiamata {addr:street}."
+      }
+    },
+    {
+      "id": "station-place",
+      "question": {
+        "en": "Where is the station located? (e.g. name of neighborhood, villlage, or town)",
+        "ja": "このステーションの住所は?(例: 地区、村、または町の名称)",
+        "ru": "Где расположена часть? (напр., название населённого пункта)",
+        "fr": "Dans quelle localité la station est-elle située ?",
+        "it": "In che località si trova la stazione? (ad es. quartiere, paese o città)"
+      },
+      "freeform": {
+        "key": "addr:place"
+      },
+      "render": {
+        "en": "This station is found within {addr:place}.",
+        "ja": "このステーションは{addr:place}にあります。",
+        "ru": "Эта часть расположена в {addr:place}.",
+        "fr": "La station fait partie de {addr:place}.",
+        "it": "La stazione si trova a {addr:place}."
+      }
+    },
+    {
+      "id": "station-agency",
+      "question": {
+        "en": "What agency operates this station?",
+        "ja": "このステーションを運営しているのはどこですか?",
+        "fr": "Quel est l’exploitant de la station ?",
+        "it": "Quale agenzia gestisce questa stazione?"
+      },
+      "render": {
+        "en": "This station is operated by {operator}.",
+        "ja": "このステーションは{operator}によって運営されています。",
+        "fr": "Cette station est opérée par {operator}.",
+        "it": "Questa stazione è gestita da {operator}."
+      },
+      "freeform": {
+        "key": "operator"
+      },
+      "mappings": [
+        {
+          "if": {
+            "and": [
+              "operator=Bureau of Fire Protection",
+              "operator:type=government"
+            ]
+          },
+          "then": {
+            "en": "Bureau of Fire Protection",
+            "ja": "消防局(消防庁)",
+            "fr": "Brigade de Protection du Feu",
+            "de": "Brandschutzbehörde",
+            "it": "Servizio antincendio governativo"
+          }
+        }
+      ]
+    },
+    {
+      "id": "station-operator",
+      "question": {
+        "en": "How is the station operator classified?",
+        "ja": "ステーションの運営の分類は?",
+        "fr": "Quel est le type d’exploitant ?",
+        "it": "Com’è classificato il gestore di questa stazione?"
+      },
+      "render": {
+        "en": "The operator is a(n) {operator:type} entity.",
+        "ja": "運営者は、{operator:type} です。",
+        "fr": "L’exploitant est de type {operator:type}.",
+        "it": "Il gestore è un ente {operator:type}."
+      },
+      "freeform": {
+        "key": "operator:type"
+      },
+      "mappings": [
+        {
+          "if": {
+            "and": [
+              "operator:type=government"
+            ]
+          },
+          "then": {
+            "en": "The station is operated by the government.",
+            "ja": "ステーションは自治体が運営する。",
+            "fr": "La station est opérée par le gouvernement.",
+            "it": "Questa stazione è gestita dal governo.",
+            "nb_NO": "Stasjonen drives av myndighetene."
+          }
+        },
+        {
+          "if": {
+            "and": [
+              "operator:type=community"
+            ]
+          },
+          "then": {
+            "en": "The station is operated by a community-based, or informal organization.",
+            "ja": "任意団体やコミュニティが運営しているステーションである。",
+            "fr": "La station est opérée par une organisation informelle.",
+            "it": "Questa stazione è gestita dalla comunità oppure un’associazione informale."
+          }
+        },
+        {
+          "if": {
+            "and": [
+              "operator:type=ngo"
+            ]
+          },
+          "then": {
+            "en": "The station is operated by a formal group of volunteers.",
+            "ja": "公益団体が運営しているステーションである。",
+            "fr": "La station est opérée par un groupe officiel de bénévoles.",
+            "it": "Questa stazione è gestita da un gruppo di volontari ufficiale."
+          }
+        },
+        {
+          "if": {
+            "and": [
+              "operator:type=private"
+            ]
+          },
+          "then": {
+            "en": "The station is privately operated.",
+            "ja": "個人が運営しているステーションである。",
+            "fr": "La station est opérée par un groupe privé.",
+            "it": "Questa stazione è gestita da privati."
+          }
+        }
+      ]
+    },
+    "images"
+  ],
+  "presets": [
+    {
+      "tags": [
+        "amenity=fire_station"
+      ],
+      "title": {
+        "en": "Fire station",
+        "ja": "消防署",
+        "ru": "Пожарная часть",
+        "fr": "Caserne de pompiers",
+        "de": "Feuerwache",
+        "it": "Caserma dei vigili del fuoco",
+        "nb_NO": "Brannstasjon"
+      },
+      "description": {
+        "en": "A fire station is a place where the fire trucks and firefighters are located when not in operation.",
+        "ja": "消防署は、運転していないときに消防車や消防士がいる場所です。",
+        "fr": "Une caserne de pompiers est un lieu où les pompiers et leur équipements sont situés en dehors des missions.",
+        "de": "Eine Feuerwache ist ein Ort, an dem die Feuerwehrfahrzeuge und die Feuerwehrleute untergebracht sind, wenn sie nicht im Einsatz sind.",
+        "it": "Una caserma dei pompieri è un luogo dove si trovano i mezzi antincendio e i pompieri tra una missione e l’altra."
+      }
+    }
+  ],
+  "mapRendering": [
+    {
+      "icon": {
+        "render": "./assets/themes/hailhydrant/Twemoji12_1f692.svg"
+      },
+      "iconSize": {
+        "render": "35,35,center"
+      },
+      "location": [
+        "point",
+        "centroid"
+      ]
+    },
+    {
+      "color": {
+        "render": "#c22"
+      },
+      "width": {
+        "render": "1"
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/assets/layers/hydrant/hydrant.json b/assets/layers/hydrant/hydrant.json
new file mode 100644
index 000000000..c9c64804b
--- /dev/null
+++ b/assets/layers/hydrant/hydrant.json
@@ -0,0 +1,318 @@
+{
+  "id": "hydrant",
+  "name": {
+    "en": "Map of hydrants",
+    "ja": "消火栓の地図",
+    "zh_Hant": "消防栓地圖",
+    "nb_NO": "Kart over brannhydranter",
+    "ru": "Карта пожарных гидрантов",
+    "fr": "Carte des bornes incendie",
+    "de": "Karte der Hydranten",
+    "it": "Mappa degli idranti"
+  },
+  "minzoom": 14,
+  "source": {
+    "osmTags": {
+      "and": [
+        "emergency=fire_hydrant"
+      ]
+    }
+  },
+  "title": {
+    "render": {
+      "en": "Hydrant",
+      "ru": "Гидрант",
+      "ja": "消火栓",
+      "nb_NO": "Brannhydrant",
+      "fr": "Bornes incendie",
+      "de": "Hydrant",
+      "it": "Idrante"
+    }
+  },
+  "description": {
+    "en": "Map layer to show fire hydrants.",
+    "ja": "消火栓を表示するマップレイヤ。",
+    "zh_Hant": "顯示消防栓的地圖圖層。",
+    "nb_NO": "Kartlag for å vise brannhydranter.",
+    "ru": "Слой карты, отображающий пожарные гидранты.",
+    "fr": "Couche des bornes incendie.",
+    "de": "Kartenebene zur Anzeige von Hydranten.",
+    "it": "Livello della mappa che mostra gli idranti antincendio."
+  },
+  "tagRenderings": [
+    {
+      "id": "hydrant-color",
+      "question": {
+        "en": "What color is the hydrant?",
+        "ja": "消火栓の色は何色ですか?",
+        "nb_NO": "Hvilken farge har brannhydranten?",
+        "ru": "Какого цвета гидрант?",
+        "fr": "Quelle est la couleur de la borne ?",
+        "de": "Welche Farbe hat der Hydrant?",
+        "it": "Qual è il colore dell’idrante?"
+      },
+      "render": {
+        "en": "The hydrant color is {colour}",
+        "ja": "消火栓の色は{colour}です",
+        "nb_NO": "Brannhydranter er {colour}",
+        "ru": "Цвет гидранта {colour}",
+        "fr": "La borne est {colour}",
+        "de": "Der Hydrant hat die Farbe {colour}",
+        "it": "Il colore dell’idrante è {colour}"
+      },
+      "freeform": {
+        "key": "colour"
+      },
+      "mappings": [
+        {
+          "if": {
+            "and": [
+              "colour="
+            ]
+          },
+          "then": {
+            "en": "The hydrant color is unknown.",
+            "ja": "消火栓の色は不明です。",
+            "ru": "Цвет гидранта не определён.",
+            "fr": "La borne est de couleur inconnue.",
+            "de": "Die Farbe des Hydranten ist unbekannt.",
+            "it": "Il colore dell’idrante è sconosciuto."
+          },
+          "hideInAnswer": true
+        },
+        {
+          "if": {
+            "and": [
+              "colour=yellow"
+            ]
+          },
+          "then": {
+            "en": "The hydrant color is yellow.",
+            "ja": "消火栓の色は黄色です。",
+            "ru": "Гидрант жёлтого цвета.",
+            "fr": "La borne est jaune.",
+            "de": "Die Farbe des Hydranten ist gelb.",
+            "it": "Il colore dell’idrante è giallo."
+          }
+        },
+        {
+          "if": {
+            "and": [
+              "colour=red"
+            ]
+          },
+          "then": {
+            "en": "The hydrant color is red.",
+            "ja": "消火栓の色は赤です。",
+            "it": "L'idrante è rosso.",
+            "ru": "Гидрант красного цвета.",
+            "fr": "La borne est rouge.",
+            "de": "Die Farbe des Hydranten ist rot."
+          }
+        }
+      ]
+    },
+    {
+      "id": "hydrant-type",
+      "question": {
+        "en": "What type of hydrant is it?",
+        "ja": "どんな消火栓なんですか?",
+        "it": "Di che tipo è questo idrante?",
+        "ru": "К какому типу относится этот гидрант?",
+        "fr": "De quel type de borne s’agit-il ?",
+        "de": "Um welche Art von Hydrant handelt es sich?"
+      },
+      "freeform": {
+        "key": "fire_hydrant:type"
+      },
+      "render": {
+        "en": " Hydrant type: {fire_hydrant:type}",
+        "ru": " Тип гидранта: {fire_hydrant:type}",
+        "ja": " 消火栓のタイプ:{fire_hydrant:type}",
+        "it": " Tipo di idrante: {fire_hydrant:type}",
+        "fr": " Type de borne : {fire_hydrant:type}",
+        "de": " Hydranten-Typ: {fire_hydrant:type}"
+      },
+      "mappings": [
+        {
+          "if": {
+            "and": [
+              "fire_hydrant:type="
+            ]
+          },
+          "then": {
+            "en": "The hydrant type is unknown.",
+            "ja": "消火栓の種類は不明です。",
+            "it": "Il tipo di idrante è sconosciuto.",
+            "ru": "Тип гидранта не определён.",
+            "fr": "La borne est de type inconnu.",
+            "de": "Der Typ des Hydranten ist unbekannt."
+          },
+          "hideInAnswer": true
+        },
+        {
+          "if": {
+            "and": [
+              "fire_hydrant:type=pillar"
+            ]
+          },
+          "then": {
+            "en": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_pillar.svg\" /> Pillar type.",
+            "ja": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_pillar.svg\" /> ピラー型。",
+            "fr": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_pillar.svg\" /> Pilier.",
+            "de": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_pillar.svg\" /> Säulenart.",
+            "it": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_pillar.svg\" /> Soprasuolo."
+          }
+        },
+        {
+          "if": {
+            "and": [
+              "fire_hydrant:type=pipe"
+            ]
+          },
+          "then": {
+            "en": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> Pipe type.",
+            "ja": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> パイプ型。",
+            "fr": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> Tuyau.",
+            "de": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> Rohrtyp.",
+            "it": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> Tubo."
+          }
+        },
+        {
+          "if": {
+            "and": [
+              "fire_hydrant:type=wall"
+            ]
+          },
+          "then": {
+            "en": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> Wall type.",
+            "id": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> Jenis dinding.",
+            "ru": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> Тип стены.",
+            "ja": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> 壁型。",
+            "fr": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> Mural.",
+            "de": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> Wandtyp.",
+            "it": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> A muro."
+          }
+        },
+        {
+          "if": {
+            "and": [
+              "fire_hydrant:type=underground"
+            ]
+          },
+          "then": {
+            "en": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_underground.svg\" /> Underground type.",
+            "ja": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_underground.svg\" />地下式。",
+            "fr": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_underground.svg\" /> Enterré.",
+            "de": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_underground.svg\" /> Untergrundtyp.",
+            "it": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_underground.svg\" /> Sottosuolo."
+          }
+        }
+      ]
+    },
+    {
+      "id": "hydrant-state",
+      "question": {
+        "en": "Is this hydrant still working?",
+        "ja": "消火栓のライフサイクルステータスを更新します。",
+        "fr": "Mettre à jour l’état de la borne.",
+        "de": "Aktualisieren Sie den Lebenszyklusstatus des Hydranten.",
+        "it": "Aggiorna lo stato di funzionamento dell’idrante."
+      },
+      "mappings": [
+        {
+          "if": {
+            "and": [
+              "emergency=fire_hydrant"
+            ]
+          },
+          "then": {
+            "en": "The hydrant is (fully or partially) working",
+            "ja": "消火栓は(完全にまたは部分的に)機能しています。",
+            "ru": "Гидрант (полностью или частично) в рабочем состоянии",
+            "fr": "La borne est en état, ou partiellement en état, de fonctionner.",
+            "de": "Der Hydrant ist (ganz oder teilweise) in Betrieb.",
+            "it": "L’idrante è (parzialmente o completamente) funzionante."
+          }
+        },
+        {
+          "if": {
+            "and": [
+              "disused:emergency=fire_hydrant",
+              "emergency="
+            ]
+          },
+          "then": {
+            "en": "The hydrant is unavailable",
+            "ja": "消火栓は使用できません。",
+            "fr": "La borne est hors-service.",
+            "de": "Der Hydrant ist nicht verfügbar.",
+            "it": "L’idrante è fuori servizio."
+          }
+        },
+        {
+          "if": {
+            "and": [
+              "removed:emergency=fire_hydrant",
+              "emergency="
+            ]
+          },
+          "then": {
+            "en": "The hydrant has been removed",
+            "ja": "消火栓が撤去されました。",
+            "ru": "Гидрант демонтирован",
+            "fr": "La borne a été retirée.",
+            "de": "Der Hydrant wurde entfernt.",
+            "it": "L’idrante è stato rimosso."
+          }
+        }
+      ]
+    },
+    "images"
+  ],
+  "presets": [
+    {
+      "tags": [
+        "emergency=fire_hydrant"
+      ],
+      "title": {
+        "en": "Fire hydrant",
+        "ru": "Пожарный гидрант",
+        "ja": "消火栓",
+        "nb_NO": "Brannhydrant",
+        "fr": "Borne incendie",
+        "de": "Löschwasser-Hydrant",
+        "it": "Idrante antincendio"
+      },
+      "description": {
+        "en": "A hydrant is a connection point where firefighters can tap water. It might be located underground.",
+        "ja": "消火栓は消防士が水を汲み上げることができる接続点です。地下にあるかもしれません。",
+        "fr": "Une borne incendie est un point où les pompiers peuvent s’alimenter en eau. Elle peut être enterrée.",
+        "de": "Ein Hydrant ist ein Anschlusspunkt, an dem die Feuerwehr Wasser zapfen kann. Er kann sich unterirdisch befinden.",
+        "it": "Un idrante è un punto di collegamento dove i pompieri possono estrarre acqua. Potrebbe trovarsi sottoterra."
+      }
+    }
+  ],
+  "mapRendering": [
+    {
+      "icon": {
+        "render": "./assets/themes/hailhydrant/hydrant.svg"
+      },
+      "iconSize": {
+        "render": "20,20,center"
+      },
+      "location": [
+        "point",
+        "centroid"
+      ]
+    },
+    {
+      "color": {
+        "render": "#00f"
+      },
+      "width": {
+        "render": "8"
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/assets/themes/climbing/climbing.json b/assets/themes/climbing/climbing.json
index 3ed4f37c3..187733ce1 100644
--- a/assets/themes/climbing/climbing.json
+++ b/assets/themes/climbing/climbing.json
@@ -535,7 +535,8 @@
           "render": {
             "en": "The rock type is {_embedding_features_with_rock:rock} as stated <a href='#{_embedding_features_with_rock:id}'>on the surrounding crag</a>",
             "fr": "Le type de roche est {_embedding_features_with_rock:rock} selon <a href='#{_embedding_features_with_rock:id}'>le mur</a>",
-            "it": "Il tipo di roccia è {_embedding_features_with_rock:rock} come dichiarato sul <a href='#{_embedding_features_with_rock:id}'>muro circostante</a>"
+            "it": "Il tipo di roccia è {_embedding_features_with_rock:rock} come dichiarato sul <a href='#{_embedding_features_with_rock:id}'>muro circostante</a>",
+            "de": "Der Gesteinstyp ist {_embedding_features_with_rock:rock}, wie <a href='#{_embedding_features_with_rock:id}'>auf dem umgebenden Felsen angegeben</a>"
           },
           "freeform": {
             "key": "_embedding_features_with_rock:rock"
@@ -620,7 +621,8 @@
             "then": {
               "en": "Climbing crag <b>{name}</b>",
               "fr": "Mur d’escalade <b>{name}</b>",
-              "it": "Muro da arrampicata <b>{name}</b>"
+              "it": "Muro da arrampicata <b>{name}</b>",
+              "de": "Klettergarten <b>{name}</b>"
             }
           },
           {
@@ -710,7 +712,8 @@
           "render": {
             "en": "<h3>Contains {_contained_climbing_routes_count} routes</h3> <ul>{_contained_climbing_routes}</ul>",
             "fr": "<h3>Contient {_contained_climbing_routes_count} voies</h3> <ul>{_contained_climbing_routes}</ul>",
-            "it": "<h3>Contiene {_contained_climbing_routes_count} vie</h3> <ul>{_contained_climbing_routes}</ul>"
+            "it": "<h3>Contiene {_contained_climbing_routes_count} vie</h3> <ul>{_contained_climbing_routes}</ul>",
+            "de": "<h3> Enthält {_contained_climbing_routes_count} Routen</h3> <ul>{_contained_climbing_routes}</ul>"
           },
           "condition": "_contained_climbing_routes~*",
           "id": "Contained_climbing_routes"
@@ -775,7 +778,8 @@
               "then": {
                 "en": "A climbing crag - a single rock or cliff with at least a few climbing routes",
                 "fr": "Mur d’escalade, rocher avec plusieurs voies d’escalades",
-                "it": "Un muro da arrampicata (un singolo masso o falesia con almeno qualche via per arrampicata)"
+                "it": "Un muro da arrampicata (un singolo masso o falesia con almeno qualche via per arrampicata)",
+                "de": "Ein Kletterfelsen - ein einzelner Fels oder eine Klippe mit mindestens einigen Kletterrouten"
               }
             },
             {
diff --git a/assets/themes/cyclenodes/cyclenodes.json b/assets/themes/cyclenodes/cyclenodes.json
index e5cc511bf..f08c74612 100644
--- a/assets/themes/cyclenodes/cyclenodes.json
+++ b/assets/themes/cyclenodes/cyclenodes.json
@@ -122,7 +122,7 @@
       "title": {
         "render": {
           "en": "cycle node <strong>{rcn_ref}</strong>",
-          "de": "Knotenpunkt"
+          "de": "Knotenpunkt <strong>{rcn_ref}</strong>"
         }
       },
       "presets": [
diff --git a/assets/themes/cyclestreets/cyclestreets.json b/assets/themes/cyclestreets/cyclestreets.json
index 9a91dbdda..a4122b4d6 100644
--- a/assets/themes/cyclestreets/cyclestreets.json
+++ b/assets/themes/cyclestreets/cyclestreets.json
@@ -251,7 +251,7 @@
           "en": "Is the street <b>{name}</b> a cyclestreet?",
           "ja": "この通りはcyclestreetですか?",
           "nb_NO": "Er denne gaten en sykkelvei?",
-          "de": "Ist diese Straße eine Fahrradstraße?",
+          "de": "Ist die Straße <b>{Name}</b> eine Fahrradstraße?",
           "it": "È una strada ciclabile?"
         },
         "mappings": [
diff --git a/assets/themes/cyclofix/cyclofix.json b/assets/themes/cyclofix/cyclofix.json
index e6983ceeb..23a2adb32 100644
--- a/assets/themes/cyclofix/cyclofix.json
+++ b/assets/themes/cyclofix/cyclofix.json
@@ -5,7 +5,7 @@
     "nl": "Cyclofix - een open kaart voor fietsers",
     "fr": "Cyclofix - Une carte ouverte pour les cyclistes",
     "gl": "Cyclofix - Un mapa aberto para os ciclistas",
-    "de": "Cyclofix — eine freie Karte für Radfahrer",
+    "de": "Cyclofix - die freie Karte für Radler",
     "ru": "Cyclofix - открытая карта для велосипедистов",
     "ja": "Cyclofix - サイクリストのためのオープンマップ",
     "zh_Hant": "單車修正 - 單車騎士的開放地圖",
diff --git a/assets/themes/hailhydrant/hailhydrant.json b/assets/themes/hailhydrant/hailhydrant.json
index 13bd89ac0..548b5ad13 100644
--- a/assets/themes/hailhydrant/hailhydrant.json
+++ b/assets/themes/hailhydrant/hailhydrant.json
@@ -23,7 +23,7 @@
     "ja": "このマップでは、お気に入りの近隣にある消火栓、消防署、救急ステーション、消火器を検索して更新できます。\n\n正確な位置を追跡し(モバイルのみ)、左下コーナーで関連するレイヤを選択できます。このツールを使用して、マップにピン(注視点)を追加または編集したり、利用可能な質問に答えることによって追加の詳細を提供することもできます。\n\nすべての変更は自動的にOpenStreetMapのグローバルデータベースに保存され、他のユーザが自由に再利用できます。",
     "zh_Hant": "在這份地圖上面你可以在你喜愛的社區尋找與更新消防栓、消防隊、急救站與滅火器。\n\n你可以追蹤確切位置 (只有行動版) 以及在左下角選擇與你相關的圖層。你也可以使用這工具新增或編輯地圖上的釘子 (興趣點)，以及透過回答一些問題提供額外的資訊。\n\n所有你做出的變動都會自動存到開放街圖這個全球資料庫，而且能自由讓其他人取用。",
     "fr": "Sur cette carte on trouve et met à jour les bornes incendies, extincteurs, casernes de pompiers et ambulanciers dans son quartier.<br/>Les options en haut à gauche permettent de localiser sa position (sur téléphone) et de filtrer les éléments. Il est possible d’utiliser cet outil pour ajouter et éditer les points d’intérêt de la carte et d’y ajouter des détails en répondant aux questions.<br/>Toutes les modifications sont automatiquement enregistrées dans la base de données OpenStreetMap et peuvent êtres librement réutilisées par d’autres.",
-    "de": "Auf dieser Karte können Sie Hydranten, Feuerwachen, Krankenwagen und Feuerlöscher in Ihren bevorzugten Stadtvierteln finden und aktualisieren.  \n\nSie können Ihren genauen Standort verfolgen (nur mobil) und in der unteren linken Ecke die für Sie relevanten Ebenen auswählen. Sie können mit diesem Tool auch Pins (Points of Interest) zur Karte hinzufügen oder bearbeiten und durch die Beantwortung verfügbarer Fragen zusätzliche Angaben machen.  \n\nAlle von Ihnen vorgenommenen Änderungen werden automatisch in der globalen Datenbank von OpenStreetMap gespeichert und können von anderen frei weiterverwendet werden.",
+    "de": "Auf dieser Karte können Sie Hydranten, Feuerwachen, Krankenwagen und Feuerlöscher in Ihren bevorzugten Stadtvierteln finden und aktualisieren.\n\nSie können Ihren genauen Standort verfolgen (nur mobil) und in der unteren linken Ecke die für Sie relevanten Ebenen auswählen. Sie können mit diesem Tool auch Pins (Points of Interest) zur Karte hinzufügen oder bearbeiten und durch die Beantwortung verfügbarer Fragen zusätzliche Angaben machen.\n\nAlle von Ihnen vorgenommenen Änderungen werden automatisch in der globalen Datenbank von OpenStreetMap gespeichert und können von anderen frei weiterverwendet werden.",
     "it": "In questa cartina puoi vedere e aggiornare idranti, stazioni dei pompieri, stazioni delle ambulanze ed estintori del tuo quartiere preferito.\n\nPuoi seguire la tua posizione precisa (solo su cellulare) e selezionare i livelli che ti interessano nell’angolo in basso a sinistra. Puoi anche usare questo strumento per aggiungere o modificare i PDI sulla mappa e fornire ulteriori dettagli rispondendo alle domande.\n\nTutte le modifiche che farai verranno automaticamente salvate nel database globale di OpenStreetMap e potranno essere riutilizzate liberamente da tutti."
   },
   "language": [
@@ -47,952 +47,10 @@
   "widenFactor": 3,
   "socialImage": "",
   "layers": [
-    {
-      "id": "hydrants",
-      "name": {
-        "en": "Map of hydrants",
-        "ja": "消火栓の地図",
-        "zh_Hant": "消防栓地圖",
-        "nb_NO": "Kart over brannhydranter",
-        "ru": "Карта пожарных гидрантов",
-        "fr": "Carte des bornes incendie",
-        "de": "Karte der Hydranten",
-        "it": "Mappa degli idranti"
-      },
-      "minzoom": 14,
-      "source": {
-        "osmTags": {
-          "and": [
-            "emergency=fire_hydrant"
-          ]
-        }
-      },
-      "title": {
-        "render": {
-          "en": "Hydrant",
-          "ru": "Гидрант",
-          "ja": "消火栓",
-          "nb_NO": "Brannhydrant",
-          "fr": "Bornes incendie",
-          "de": "Hydrant",
-          "it": "Idrante"
-        }
-      },
-      "description": {
-        "en": "Map layer to show fire hydrants.",
-        "ja": "消火栓を表示するマップレイヤ。",
-        "zh_Hant": "顯示消防栓的地圖圖層。",
-        "nb_NO": "Kartlag for å vise brannhydranter.",
-        "ru": "Слой карты, отображающий пожарные гидранты.",
-        "fr": "Couche des bornes incendie.",
-        "de": "Kartenebene zur Anzeige von Hydranten.",
-        "it": "Livello della mappa che mostra gli idranti antincendio."
-      },
-      "tagRenderings": [
-        {
-          "id": "hydrant-color",
-          "question": {
-            "en": "What color is the hydrant?",
-            "ja": "消火栓の色は何色ですか?",
-            "nb_NO": "Hvilken farge har brannhydranten?",
-            "ru": "Какого цвета гидрант?",
-            "fr": "Quelle est la couleur de la borne ?",
-            "de": "Welche Farbe hat der Hydrant?",
-            "it": "Qual è il colore dell’idrante?"
-          },
-          "render": {
-            "en": "The hydrant color is {colour}",
-            "ja": "消火栓の色は{colour}です",
-            "nb_NO": "Brannhydranter er {colour}",
-            "ru": "Цвет гидранта {colour}",
-            "fr": "La borne est {colour}",
-            "de": "Der Hydrant hat die Farbe {colour}",
-            "it": "Il colore dell’idrante è {colour}"
-          },
-          "freeform": {
-            "key": "colour"
-          },
-          "mappings": [
-            {
-              "if": {
-                "and": [
-                  "colour="
-                ]
-              },
-              "then": {
-                "en": "The hydrant color is unknown.",
-                "ja": "消火栓の色は不明です。",
-                "ru": "Цвет гидранта не определён.",
-                "fr": "La borne est de couleur inconnue.",
-                "de": "Die Farbe des Hydranten ist unbekannt.",
-                "it": "Il colore dell’idrante è sconosciuto."
-              },
-              "hideInAnswer": true
-            },
-            {
-              "if": {
-                "and": [
-                  "colour=yellow"
-                ]
-              },
-              "then": {
-                "en": "The hydrant color is yellow.",
-                "ja": "消火栓の色は黄色です。",
-                "ru": "Гидрант жёлтого цвета.",
-                "fr": "La borne est jaune.",
-                "de": "Die Farbe des Hydranten ist gelb.",
-                "it": "Il colore dell’idrante è giallo."
-              }
-            },
-            {
-              "if": {
-                "and": [
-                  "colour=red"
-                ]
-              },
-              "then": {
-                "en": "The hydrant color is red.",
-                "ja": "消火栓の色は赤です。",
-                "it": "L'idrante è rosso.",
-                "ru": "Гидрант красного цвета.",
-                "fr": "La borne est rouge.",
-                "de": "Die Farbe des Hydranten ist rot."
-              }
-            }
-          ]
-        },
-        {
-          "id": "hydrant-type",
-          "question": {
-            "en": "What type of hydrant is it?",
-            "ja": "どんな消火栓なんですか?",
-            "it": "Di che tipo è questo idrante?",
-            "ru": "К какому типу относится этот гидрант?",
-            "fr": "De quel type de borne s’agit-il ?",
-            "de": "Um welche Art von Hydrant handelt es sich?"
-          },
-          "freeform": {
-            "key": "fire_hydrant:type"
-          },
-          "render": {
-            "en": " Hydrant type: {fire_hydrant:type}",
-            "ru": " Тип гидранта: {fire_hydrant:type}",
-            "ja": " 消火栓のタイプ:{fire_hydrant:type}",
-            "it": " Tipo di idrante: {fire_hydrant:type}",
-            "fr": " Type de borne : {fire_hydrant:type}",
-            "de": " Hydranten-Typ: {fire_hydrant:type}"
-          },
-          "mappings": [
-            {
-              "if": {
-                "and": [
-                  "fire_hydrant:type="
-                ]
-              },
-              "then": {
-                "en": "The hydrant type is unknown.",
-                "ja": "消火栓の種類は不明です。",
-                "it": "Il tipo di idrante è sconosciuto.",
-                "ru": "Тип гидранта не определён.",
-                "fr": "La borne est de type inconnu.",
-                "de": "Der Typ des Hydranten ist unbekannt."
-              },
-              "hideInAnswer": true
-            },
-            {
-              "if": {
-                "and": [
-                  "fire_hydrant:type=pillar"
-                ]
-              },
-              "then": {
-                "en": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_pillar.svg\" /> Pillar type.",
-                "ja": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_pillar.svg\" /> ピラー型。",
-                "fr": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_pillar.svg\" /> Pilier.",
-                "de": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_pillar.svg\" /> Säulenart.",
-                "it": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_pillar.svg\" /> Soprasuolo."
-              }
-            },
-            {
-              "if": {
-                "and": [
-                  "fire_hydrant:type=pipe"
-                ]
-              },
-              "then": {
-                "en": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> Pipe type.",
-                "ja": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> パイプ型。",
-                "fr": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> Tuyau.",
-                "de": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> Rohrtyp.",
-                "it": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> Tubo."
-              }
-            },
-            {
-              "if": {
-                "and": [
-                  "fire_hydrant:type=wall"
-                ]
-              },
-              "then": {
-                "en": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> Wall type.",
-                "id": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> Jenis dinding.",
-                "ru": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> Тип стены.",
-                "ja": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> 壁型。",
-                "fr": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> Mural.",
-                "de": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> Wandtyp.",
-                "it": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> A muro."
-              }
-            },
-            {
-              "if": {
-                "and": [
-                  "fire_hydrant:type=underground"
-                ]
-              },
-              "then": {
-                "en": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_underground.svg\" /> Underground type.",
-                "ja": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_underground.svg\" />地下式。",
-                "fr": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_underground.svg\" /> Enterré.",
-                "de": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_underground.svg\" /> Untergrundtyp.",
-                "it": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_underground.svg\" /> Sottosuolo."
-              }
-            }
-          ]
-        },
-        {
-          "id": "hydrant-state",
-          "question": {
-            "en": "Is this hydrant still working?",
-            "ja": "消火栓のライフサイクルステータスを更新します。",
-            "fr": "Mettre à jour l’état de la borne.",
-            "de": "Aktualisieren Sie den Lebenszyklusstatus des Hydranten.",
-            "it": "Aggiorna lo stato di funzionamento dell’idrante."
-          },
-          "mappings": [
-            {
-              "if": {
-                "and": [
-                  "emergency=fire_hydrant"
-                ]
-              },
-              "then": {
-                "en": "The hydrant is (fully or partially) working",
-                "ja": "消火栓は(完全にまたは部分的に)機能しています。",
-                "ru": "Гидрант (полностью или частично) в рабочем состоянии",
-                "fr": "La borne est en état, ou partiellement en état, de fonctionner.",
-                "de": "Der Hydrant ist (ganz oder teilweise) in Betrieb.",
-                "it": "L’idrante è (parzialmente o completamente) funzionante."
-              }
-            },
-            {
-              "if": {
-                "and": [
-                  "disused:emergency=fire_hydrant",
-                  "emergency="
-                ]
-              },
-              "then": {
-                "en": "The hydrant is unavailable",
-                "ja": "消火栓は使用できません。",
-                "fr": "La borne est hors-service.",
-                "de": "Der Hydrant ist nicht verfügbar.",
-                "it": "L’idrante è fuori servizio."
-              }
-            },
-            {
-              "if": {
-                "and": [
-                  "removed:emergency=fire_hydrant",
-                  "emergency="
-                ]
-              },
-              "then": {
-                "en": "The hydrant has been removed",
-                "ja": "消火栓が撤去されました。",
-                "ru": "Гидрант демонтирован",
-                "fr": "La borne a été retirée.",
-                "de": "Der Hydrant wurde entfernt.",
-                "it": "L’idrante è stato rimosso."
-              }
-            }
-          ]
-        },
-        "images"
-      ],
-      "presets": [
-        {
-          "tags": [
-            "emergency=fire_hydrant"
-          ],
-          "title": {
-            "en": "Fire hydrant",
-            "ru": "Пожарный гидрант",
-            "ja": "消火栓",
-            "nb_NO": "Brannhydrant",
-            "fr": "Borne incendie",
-            "de": "Löschwasser-Hydrant",
-            "it": "Idrante antincendio"
-          },
-          "description": {
-            "en": "A hydrant is a connection point where firefighters can tap water. It might be located underground.",
-            "ja": "消火栓は消防士が水を汲み上げることができる接続点です。地下にあるかもしれません。",
-            "fr": "Une borne incendie est un point où les pompiers peuvent s’alimenter en eau. Elle peut être enterrée.",
-            "de": "Ein Hydrant ist ein Anschlusspunkt, an dem die Feuerwehr Wasser zapfen kann. Er kann sich unterirdisch befinden.",
-            "it": "Un idrante è un punto di collegamento dove i pompieri possono estrarre acqua. Potrebbe trovarsi sottoterra."
-          }
-        }
-      ],
-      "mapRendering": [
-        {
-          "icon": {
-            "render": "./assets/themes/hailhydrant/hydrant.svg"
-          },
-          "iconSize": {
-            "render": "20,20,center"
-          },
-          "location": [
-            "point",
-            "centroid"
-          ]
-        },
-        {
-          "color": {
-            "render": "#00f"
-          },
-          "width": {
-            "render": "8"
-          }
-        }
-      ]
-    },
-    {
-      "id": "extinguisher",
-      "name": {
-        "en": "Map of fire extinguishers.",
-        "ja": "消火器の地図です。",
-        "nb_NO": "Kart over brannhydranter",
-        "ru": "Карта огнетушителей.",
-        "fr": "Couche des extincteurs.",
-        "de": "Karte mit Feuerlöschern.",
-        "it": "Cartina degli estintori."
-      },
-      "minzoom": 14,
-      "source": {
-        "osmTags": {
-          "and": [
-            "emergency=fire_extinguisher"
-          ]
-        }
-      },
-      "title": {
-        "render": {
-          "en": "Extinguishers",
-          "ru": "Огнетушители",
-          "ja": "消火器",
-          "nb_NO": "Brannslokkere",
-          "fr": "Exctincteurs",
-          "de": "Feuerlöscher",
-          "it": "Estintori"
-        }
-      },
-      "description": {
-        "en": "Map layer to show fire hydrants.",
-        "ja": "消火栓を表示するマップレイヤ。",
-        "zh_Hant": "顯示消防栓的地圖圖層。",
-        "nb_NO": "Kartlag for å vise brannslokkere.",
-        "ru": "Слой карты, отображающий огнетушители.",
-        "fr": "Couche des lances à incendie.",
-        "de": "Kartenebene zur Anzeige von Hydranten.",
-        "it": "Livello della mappa che mostra gli idranti antincendio."
-      },
-      "tagRenderings": [
-        {
-          "id": "extinguisher-location",
-          "render": {
-            "en": "Location: {location}",
-            "ja": "場所:{location}",
-            "ru": "Местоположение: {location}",
-            "fr": "Emplacement : {location}",
-            "de": "Standort: {location}",
-            "eo": "Loko: {location}",
-            "it": "Posizione: {location}"
-          },
-          "question": {
-            "en": "Where is it positioned?",
-            "ja": "どこにあるんですか?",
-            "ru": "Где это расположено?",
-            "fr": "Où est-elle positionnée ?",
-            "de": "Wo befindet er sich?",
-            "it": "Dove è posizionato?"
-          },
-          "mappings": [
-            {
-              "if": {
-                "and": [
-                  "location=indoor"
-                ]
-              },
-              "then": {
-                "en": "Found indoors.",
-                "ja": "屋内にある。",
-                "ru": "Внутри.",
-                "fr": "Intérieur.",
-                "de": "Im Innenraum vorhanden.",
-                "it": "Si trova all’interno."
-              }
-            },
-            {
-              "if": {
-                "and": [
-                  "location=outdoor"
-                ]
-              },
-              "then": {
-                "en": "Found outdoors.",
-                "ja": "屋外にある。",
-                "ru": "Снаружи.",
-                "fr": "Extérieur.",
-                "de": "Im Außenraum vorhanden.",
-                "it": "Si trova all’esterno."
-              }
-            }
-          ],
-          "freeform": {
-            "key": "location"
-          }
-        },
-        "images"
-      ],
-      "presets": [
-        {
-          "tags": [
-            "emergency=fire_extinguisher"
-          ],
-          "title": {
-            "en": "Fire extinguisher",
-            "ja": "消火器",
-            "nb_NO": "Brannslukker",
-            "ru": "Огнетушитель",
-            "fr": "Extincteur",
-            "de": "Feuerlöscher",
-            "it": "Estintore"
-          },
-          "description": {
-            "en": "A fire extinguisher is a small, portable device used to stop a fire",
-            "ja": "消火器は、火災を止めるために使用される小型で携帯可能な装置である",
-            "ru": "Огнетушитель - небольшое переносное устройство для тушения огня",
-            "fr": "Un extincteur est un appareil portatif servant à éteindre un feu",
-            "de": "Ein Feuerlöscher ist ein kleines, tragbares Gerät, das dazu dient, ein Feuer zu löschen",
-            "it": "Un estintore è un dispositivo portatile di piccole dimensioni usato per spegnere un incendio"
-          }
-        }
-      ],
-      "mapRendering": [
-        {
-          "icon": {
-            "render": "./assets/themes/hailhydrant/Twemoji12_1f9ef.svg"
-          },
-          "iconSize": {
-            "render": "20,20,center"
-          },
-          "location": [
-            "point",
-            "centroid"
-          ]
-        }
-      ]
-    },
-    {
-      "id": "fire_stations",
-      "name": {
-        "en": "Map of fire stations",
-        "ja": "消防署の地図",
-        "nb_NO": "Kart over brannstasjoner",
-        "it": "Mappa delle caserme dei vigili del fuoco",
-        "ru": "Карта пожарных частей",
-        "fr": "Couche des stations de pompiers",
-        "de": "Karte der Feuerwachen"
-      },
-      "minzoom": 12,
-      "source": {
-        "osmTags": {
-          "and": [
-            "amenity=fire_station"
-          ]
-        }
-      },
-      "title": {
-        "render": {
-          "en": "Fire Station",
-          "ja": "消防署",
-          "ru": "Пожарная часть",
-          "nb_NO": "Brannstasjon",
-          "it": "Caserma dei vigili del fuoco",
-          "fr": "Station de pompiers",
-          "de": "Feuerwache"
-        }
-      },
-      "description": {
-        "en": "Map layer to show fire stations.",
-        "ja": "消防署を表示するためのマップレイヤ。",
-        "it": "Livello che mostra le caserme dei vigili del fuoco.",
-        "ru": "Слой карты, отображающий пожарные части.",
-        "fr": "Couche des stations de pompiers.",
-        "de": "Kartenebene zur Darstellung von Feuerwachen."
-      },
-      "tagRenderings": [
-        {
-          "id": "station-name",
-          "freeform": {
-            "key": "name"
-          },
-          "question": {
-            "en": "What is the name of this fire station?",
-            "ja": "この消防署の名前は何ですか?",
-            "ru": "Как называется эта пожарная часть?",
-            "it": "Come si chiama questa caserma dei vigili del fuoco?",
-            "fr": "Quel est le nom de la station ?",
-            "de": "Wie lautet der Name dieser Feuerwache?"
-          },
-          "render": {
-            "en": "This station is called {name}.",
-            "ja": "このステーションの名前は{name}です。",
-            "it": "Questa caserma si chiama {name}.",
-            "ru": "Эта часть называется {name}.",
-            "fr": "Cette station s’appelle {name}.",
-            "nb_NO": "Denne stasjonen heter {name}."
-          }
-        },
-        {
-          "id": "station-street",
-          "freeform": {
-            "key": "addr:street"
-          },
-          "question": {
-            "en": " What is the street name where the station located?",
-            "ja": " 救急ステーションの所在地はどこですか?",
-            "it": " Qual è il nome della via in cui si trova la caserma?",
-            "ru": " По какому адресу расположена эта часть?",
-            "fr": " Quel est le nom de la rue dans lequel elle se situe ?"
-          },
-          "render": {
-            "en": "This station is along a highway called {addr:street}.",
-            "ja": "{addr:street} 沿いにあります。",
-            "ru": "Часть расположена вдоль шоссе {addr:street}.",
-            "fr": "La station fait partie de la {addr:street}.",
-            "it": "La stazione si trova in una strada chiamata {addr:street}."
-          }
-        },
-        {
-          "id": "station-place",
-          "question": {
-            "en": "Where is the station located? (e.g. name of neighborhood, villlage, or town)",
-            "ja": "このステーションの住所は?(例: 地区、村、または町の名称)",
-            "ru": "Где расположена часть? (напр., название населённого пункта)",
-            "fr": "Dans quelle localité la station est-elle située ?",
-            "it": "In che località si trova la stazione? (ad es. quartiere, paese o città)"
-          },
-          "freeform": {
-            "key": "addr:place"
-          },
-          "render": {
-            "en": "This station is found within {addr:place}.",
-            "ja": "このステーションは{addr:place}にあります。",
-            "ru": "Эта часть расположена в {addr:place}.",
-            "fr": "La station fait partie de {addr:place}.",
-            "it": "La stazione si trova a {addr:place}."
-          }
-        },
-        {
-          "id": "station-agency",
-          "question": {
-            "en": "What agency operates this station?",
-            "ja": "このステーションを運営しているのはどこですか?",
-            "fr": "Quel est l’exploitant de la station ?",
-            "it": "Quale agenzia gestisce questa stazione?"
-          },
-          "render": {
-            "en": "This station is operated by {operator}.",
-            "ja": "このステーションは{operator}によって運営されています。",
-            "fr": "Cette station est opérée par {operator}.",
-            "it": "Questa stazione è gestita da {operator}."
-          },
-          "freeform": {
-            "key": "operator"
-          },
-          "mappings": [
-            {
-              "if": {
-                "and": [
-                  "operator=Bureau of Fire Protection",
-                  "operator:type=government"
-                ]
-              },
-              "then": {
-                "en": "Bureau of Fire Protection",
-                "ja": "消防局(消防庁)",
-                "fr": "Brigade de Protection du Feu",
-                "de": "Brandschutzbehörde",
-                "it": "Servizio antincendio governativo"
-              }
-            }
-          ]
-        },
-        {
-          "id": "station-operator",
-          "question": {
-            "en": "How is the station operator classified?",
-            "ja": "ステーションの運営の分類は?",
-            "fr": "Quel est le type d’exploitant ?",
-            "it": "Com’è classificato il gestore di questa stazione?"
-          },
-          "render": {
-            "en": "The operator is a(n) {operator:type} entity.",
-            "ja": "運営者は、{operator:type} です。",
-            "fr": "L’exploitant est de type {operator:type}.",
-            "it": "Il gestore è un ente {operator:type}."
-          },
-          "freeform": {
-            "key": "operator:type"
-          },
-          "mappings": [
-            {
-              "if": {
-                "and": [
-                  "operator:type=government"
-                ]
-              },
-              "then": {
-                "en": "The station is operated by the government.",
-                "ja": "ステーションは自治体が運営する。",
-                "fr": "La station est opérée par le gouvernement.",
-                "it": "Questa stazione è gestita dal governo.",
-                "nb_NO": "Stasjonen drives av myndighetene."
-              }
-            },
-            {
-              "if": {
-                "and": [
-                  "operator:type=community"
-                ]
-              },
-              "then": {
-                "en": "The station is operated by a community-based, or informal organization.",
-                "ja": "任意団体やコミュニティが運営しているステーションである。",
-                "fr": "La station est opérée par une organisation informelle.",
-                "it": "Questa stazione è gestita dalla comunità oppure un’associazione informale."
-              }
-            },
-            {
-              "if": {
-                "and": [
-                  "operator:type=ngo"
-                ]
-              },
-              "then": {
-                "en": "The station is operated by a formal group of volunteers.",
-                "ja": "公益団体が運営しているステーションである。",
-                "fr": "La station est opérée par un groupe officiel de bénévoles.",
-                "it": "Questa stazione è gestita da un gruppo di volontari ufficiale."
-              }
-            },
-            {
-              "if": {
-                "and": [
-                  "operator:type=private"
-                ]
-              },
-              "then": {
-                "en": "The station is privately operated.",
-                "ja": "個人が運営しているステーションである。",
-                "fr": "La station est opérée par un groupe privé.",
-                "it": "Questa stazione è gestita da privati."
-              }
-            }
-          ]
-        },
-        "images"
-      ],
-      "presets": [
-        {
-          "tags": [
-            "amenity=fire_station"
-          ],
-          "title": {
-            "en": "Fire station",
-            "ja": "消防署",
-            "ru": "Пожарная часть",
-            "fr": "Caserne de pompiers",
-            "de": "Feuerwache",
-            "it": "Caserma dei vigili del fuoco",
-            "nb_NO": "Brannstasjon"
-          },
-          "description": {
-            "en": "A fire station is a place where the fire trucks and firefighters are located when not in operation.",
-            "ja": "消防署は、運転していないときに消防車や消防士がいる場所です。",
-            "fr": "Une caserne de pompiers est un lieu où les pompiers et leur équipements sont situés en dehors des missions.",
-            "de": "Eine Feuerwache ist ein Ort, an dem die Feuerwehrfahrzeuge und die Feuerwehrleute untergebracht sind, wenn sie nicht im Einsatz sind.",
-            "it": "Una caserma dei pompieri è un luogo dove si trovano i mezzi antincendio e i pompieri tra una missione e l’altra."
-          }
-        }
-      ],
-      "mapRendering": [
-        {
-          "icon": {
-            "render": "./assets/themes/hailhydrant/Twemoji12_1f692.svg"
-          },
-          "iconSize": {
-            "render": "35,35,center"
-          },
-          "location": [
-            "point",
-            "centroid"
-          ]
-        },
-        {
-          "color": {
-            "render": "#c22"
-          },
-          "width": {
-            "render": "1"
-          }
-        }
-      ]
-    },
-    {
-      "id": "ambulancestation",
-      "name": {
-        "en": "Map of ambulance stations",
-        "ja": "救急ステーションの地図",
-        "ru": "Карта станций скорой помощи",
-        "fr": "Couche des ambulances",
-        "de": "Karte der Rettungswachen",
-        "it": "Carta delle stazioni delle ambulanze"
-      },
-      "minzoom": 12,
-      "source": {
-        "osmTags": {
-          "and": [
-            "emergency=ambulance_station"
-          ]
-        }
-      },
-      "title": {
-        "render": {
-          "en": "Ambulance Station",
-          "ru": "Станция скорой помощи",
-          "ja": "救急ステーション",
-          "fr": "Station d’ambulances",
-          "de": "Rettungswache",
-          "it": "Stazione delle ambulanze"
-        }
-      },
-      "description": {
-        "en": "An ambulance station is an area for storage of ambulance vehicles, medical equipment, personal protective equipment, and other medical supplies.",
-        "ja": "救急ステーションは、救急車、医療機器、個人用保護具、およびその他の医療用品を保管する場所です。",
-        "fr": "Une station d’ambulance est un lieu où sont stockés les véhicules d’urgence ainsi que de l’équipement médical.",
-        "de": "Eine Rettungswache ist ein Ort, an dem Rettungsfahrzeuge, medizinische Ausrüstung, persönliche Schutzausrüstung und anderes medizinisches Material untergebracht sind.",
-        "it": "La stazione delle ambulanze è un’area per lo stoccaggio delle ambulanze, dell’equipaggiamento medico, dei dispositivi di protezione individuale e di altre forniture medicali."
-      },
-      "tagRenderings": [
-        {
-          "id": "ambulance-name",
-          "freeform": {
-            "key": "name"
-          },
-          "question": {
-            "en": "What is the name of this ambulance station?",
-            "ja": "この救急ステーションの名前は何ですか?",
-            "ru": "Как называется эта станция скорой помощи?",
-            "fr": "Quel est le nom de cette station ?",
-            "it": "Qual è il nome di questa stazione delle ambulanze?"
-          },
-          "render": {
-            "en": "This station is called {name}.",
-            "ja": "このステーションの名前は{name}です。",
-            "ru": "Эта станция называется {name}.",
-            "fr": "Cette station s’appelle {name}.",
-            "it": "Questa stazione è chiamata {name}."
-          }
-        },
-        {
-          "id": "ambulance-street",
-          "freeform": {
-            "key": "addr:street"
-          },
-          "question": {
-            "en": " What is the street name where the station located?",
-            "ja": " 救急ステーションの所在地はどこですか?",
-            "ru": " По какому адресу расположена эта станция?",
-            "fr": " Quel est le nom de la rue où la station se situe ?",
-            "it": " Come si chiama la strada in cui si trova questa stazione?"
-          },
-          "render": {
-            "en": "This station is along a highway called {addr:street}.",
-            "ja": "{addr:street} 沿いにあります。",
-            "ru": "Эта станция расположена вдоль шоссе {addr:street}.",
-            "fr": "La station fait partie de {addr:street}.",
-            "it": "Questa stazione si trova in {addr:street}."
-          }
-        },
-        {
-          "id": "ambulance-place",
-          "question": {
-            "en": "Where is the station located? (e.g. name of neighborhood, villlage, or town)",
-            "ja": "このステーションの住所は?(例: 地区、村、または町の名称)",
-            "ru": "Где расположена станция? (напр., название населённого пункта)",
-            "fr": "Dans quelle localité la station est-elle située ?",
-            "it": "Dove si trova la stazione? (ad es. quartiere, paese o città)"
-          },
-          "freeform": {
-            "key": "addr:place"
-          },
-          "render": {
-            "en": "This station is found within {addr:place}.",
-            "ja": "このステーションは{addr:place}にあります。",
-            "fr": "La station fait partie de {addr:place}.",
-            "it": "La stazione si trova a {addr:place}."
-          }
-        },
-        {
-          "id": "ambulance-agency",
-          "question": {
-            "en": "What agency operates this station?",
-            "ja": "このステーションを運営しているのはどこですか?",
-            "fr": "Quel est l’exploitant de la station ?",
-            "it": "Quale agenzia gestisce questa stazione?"
-          },
-          "render": {
-            "en": "This station is operated by {operator}.",
-            "ja": "このステーションは{operator}によって運営されています。",
-            "fr": "Cette station est opérée par {operator}.",
-            "it": "Questa stazione è gestita da {operator}."
-          },
-          "freeform": {
-            "key": "operator"
-          },
-          "mappings": []
-        },
-        {
-          "id": "ambulance-operator-type",
-          "question": {
-            "en": "How is the station operator classified?",
-            "ja": "ステーションの運営の分類は?",
-            "fr": "Quel est le type d’exploitant ?",
-            "it": "Com’è classificato il gestore della stazione?"
-          },
-          "render": {
-            "en": "The operator is a(n) {operator:type} entity.",
-            "ja": "運営者は、{operator:type} です。",
-            "fr": "L’exploitant est de type {operator:type}.",
-            "it": "L’operatore è un ente {operator:type}."
-          },
-          "freeform": {
-            "key": "operator:type"
-          },
-          "mappings": [
-            {
-              "if": {
-                "and": [
-                  "operator:type=government"
-                ]
-              },
-              "then": {
-                "en": "The station is operated by the government.",
-                "ja": "ステーションは自治体が運営する。",
-                "fr": "La station est opérée par le gouvernement.",
-                "it": "La stazione è gestita dal governo."
-              }
-            },
-            {
-              "if": {
-                "and": [
-                  "operator:type=community"
-                ]
-              },
-              "then": {
-                "en": "The station is operated by a community-based, or informal organization.",
-                "ja": "任意団体やコミュニティが運営しているステーションである。",
-                "fr": "La station est opérée par une organisation informelle.",
-                "it": "La stazione è gestita dalla comunità o un’organizzazione non ufficiale."
-              }
-            },
-            {
-              "if": {
-                "and": [
-                  "operator:type=ngo"
-                ]
-              },
-              "then": {
-                "en": "The station is operated by a formal group of volunteers.",
-                "ja": "公益団体が運営しているステーションである。",
-                "fr": "La station est opérée par un groupe officiel de bénévoles.",
-                "it": "La stazione è gestita da un gruppo ufficiale di volontari."
-              }
-            },
-            {
-              "if": {
-                "and": [
-                  "operator:type=private"
-                ]
-              },
-              "then": {
-                "en": "The station is privately operated.",
-                "ja": "個人が運営しているステーションである。",
-                "fr": "La station est opérée par un groupe privé.",
-                "it": "La stazione è gestita da un privato."
-              }
-            }
-          ]
-        },
-        "images"
-      ],
-      "presets": [
-        {
-          "tags": [
-            "emergency=ambulance_station"
-          ],
-          "title": {
-            "en": "Ambulance station",
-            "ru": "Станция скорой помощи",
-            "ja": "救急ステーション(消防署)",
-            "fr": "Station d’ambulances",
-            "de": "Rettungswache",
-            "it": "Stazione delle ambulanze"
-          },
-          "description": {
-            "en": "Add an ambulance station to the map",
-            "ja": "救急ステーション(消防署)をマップに追加する",
-            "ru": "Добавить станцию скорой помощи на карту",
-            "fr": "Ajouter une station d’ambulances à la carte",
-            "de": "Eine Rettungsstation der Karte hinzufügen",
-            "it": "Aggiungi una stazione delle ambulanza alla mappa"
-          }
-        }
-      ],
-      "mapRendering": [
-        {
-          "icon": {
-            "render": "./assets/themes/hailhydrant/Twemoji_1f691.svg"
-          },
-          "iconSize": {
-            "render": "35,35,center"
-          },
-          "location": [
-            "point",
-            "centroid"
-          ]
-        },
-        {
-          "color": {
-            "render": "#00f"
-          },
-          "width": {
-            "render": "1"
-          }
-        }
-      ]
-    }
+    "hydrant",
+    "extinguisher",
+    "fire_station",
+    "ambulancestation"
   ],
   "defaultBackgroundId": "HDM_HOT"
 }
\ No newline at end of file
diff --git a/assets/themes/natuurpunt/natuurpunt.json b/assets/themes/natuurpunt/natuurpunt.json
index db51c5613..802f67469 100644
--- a/assets/themes/natuurpunt/natuurpunt.json
+++ b/assets/themes/natuurpunt/natuurpunt.json
@@ -4,7 +4,7 @@
   "title": {
     "nl": "De Natuurpunt-kaart",
     "en": "The map of Natuurpunt",
-    "de": "Naturschutzgebiete",
+    "de": "Die Karte von Natuurpunt",
     "nb_NO": "Naturreservater",
     "it": "Riserve naturali"
   },
diff --git a/assets/themes/openwindpowermap/openwindpowermap.json b/assets/themes/openwindpowermap/openwindpowermap.json
index c254e09ca..8008355b9 100644
--- a/assets/themes/openwindpowermap/openwindpowermap.json
+++ b/assets/themes/openwindpowermap/openwindpowermap.json
@@ -3,7 +3,7 @@
   "title": {
     "en": "OpenWindPowerMap",
     "fr": "OpenWindPowerMap",
-    "de": "OpenWindPowerMap",
+    "de": "Freie Windenergie-Karte",
     "it": "OpenWindPowerMap",
     "ru": "Открытая карта ветроэнергетики"
   },
diff --git a/assets/themes/personal/personal.json b/assets/themes/personal/personal.json
index 6baa3880a..c39039d70 100644
--- a/assets/themes/personal/personal.json
+++ b/assets/themes/personal/personal.json
@@ -20,7 +20,7 @@
     "ca": "Crea una interfície basada en totes les capes disponibles de totes les interfícies",
     "gl": "Crea un tema baseado en todas as capas dispoñíbeis de todos os temas",
     "fr": "Crée un thème personnalisé basé sur toutes les couches disponibles de tous les thèmes",
-    "de": "Erstellen Sie ein persönliches Thema auf der Grundlage aller verfügbaren Ebenen aller Themen",
+    "de": "Erstellen Sie ein persönliches Thema, das auf allen verfügbaren Ebenen aller Themen basiert. Um einige Daten anzuzeigen, öffnen Sie die <a href='#filter'>Ebenenauswahl</a>",
     "ja": "すべてのテーマの使用可能なすべてのレイヤーに基づいて個人用テーマを作成する",
     "zh_Hant": "從所有可用的主題圖層創建個人化主題",
     "ru": "Создать персональную тему на основе доступных слоёв тем. Чтобы отобразить некоторые данные, откройте <a href='#filter'>выбор слоя</a>",
diff --git a/langs/layers/de.json b/langs/layers/de.json
index 5753890c6..6a8517c64 100644
--- a/langs/layers/de.json
+++ b/langs/layers/de.json
@@ -1,4 +1,17 @@
 {
+    "ambulancestation": {
+        "description": "Eine Rettungswache ist ein Ort, an dem Rettungsfahrzeuge, medizinische Ausrüstung, persönliche Schutzausrüstung und anderes medizinisches Material untergebracht sind.",
+        "name": "Karte der Rettungswachen",
+        "presets": {
+            "0": {
+                "description": "Eine Rettungsstation der Karte hinzufügen",
+                "title": "Rettungswache"
+            }
+        },
+        "title": {
+            "render": "Rettungswache"
+        }
+    },
     "artwork": {
         "description": "Verschiedene Kunstwerke",
         "name": "Kunstwerke",
@@ -992,6 +1005,9 @@
                 "options": {
                     "0": {
                         "question": "Alle Anschlüsse"
+                    },
+                    "1": {
+                        "question": "Verfügt über einen <div style='display: inline-block'><b><b>Schuko-Stecker</b> ohne Erdungsstift (CEE7/4 Typ F)</b><img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/CEE7_4F.svg'/></div>"
                     }
                 }
             }
@@ -1028,7 +1044,7 @@
                         "then": "Diese Ampel hat eine Taste, um ein grünes Signal anzufordern"
                     },
                     "1": {
-                        "then": "Diese Ampel hat keine Taste, um ein grünes Signal anzufordern."
+                        "then": "Diese Ampel hat keine Taste, um ein grünes Signal anzufordern"
                     }
                 },
                 "question": "Hat diese Ampel eine Taste, um ein grünes Signal anzufordern?"
@@ -1630,7 +1646,7 @@
                     }
                 },
                 "question": "Ist diese Trinkwasserstelle noch in Betrieb?",
-                "render": "Der Betriebsstatus ist <i>{operational_status}/i>"
+                "render": "Der Betriebsstatus ist <i>{operational_status}</i>"
             },
             "render-closest-drinking-water": {
                 "render": "<a href='#{_closest_other_drinking_water_id}'>Ein weiterer Trinkwasserbrunnen befindet sich in {_closest_other_drinking_water_distance} Meter</a>"
@@ -1659,6 +1675,58 @@
             }
         }
     },
+    "extinguisher": {
+        "description": "Kartenebene zur Anzeige von Hydranten.",
+        "name": "Karte mit Feuerlöschern.",
+        "presets": {
+            "0": {
+                "description": "Ein Feuerlöscher ist ein kleines, tragbares Gerät, das dazu dient, ein Feuer zu löschen",
+                "title": "Feuerlöscher"
+            }
+        },
+        "tagRenderings": {
+            "extinguisher-location": {
+                "mappings": {
+                    "0": {
+                        "then": "Im Innenraum vorhanden."
+                    },
+                    "1": {
+                        "then": "Im Außenraum vorhanden."
+                    }
+                },
+                "question": "Wo befindet er sich?",
+                "render": "Standort: {location}"
+            }
+        },
+        "title": {
+            "render": "Feuerlöscher"
+        }
+    },
+    "fire_station": {
+        "description": "Kartenebene zur Darstellung von Feuerwachen.",
+        "name": "Karte der Feuerwachen",
+        "presets": {
+            "0": {
+                "description": "Eine Feuerwache ist ein Ort, an dem die Feuerwehrfahrzeuge und die Feuerwehrleute untergebracht sind, wenn sie nicht im Einsatz sind.",
+                "title": "Feuerwache"
+            }
+        },
+        "tagRenderings": {
+            "station-agency": {
+                "mappings": {
+                    "0": {
+                        "then": "Brandschutzbehörde"
+                    }
+                }
+            },
+            "station-name": {
+                "question": "Wie lautet der Name dieser Feuerwache?"
+            }
+        },
+        "title": {
+            "render": "Feuerwache"
+        }
+    },
     "food": {
         "filter": {
             "0": {
@@ -1829,6 +1897,71 @@
             "render": "Geisterrad"
         }
     },
+    "hydrant": {
+        "description": "Kartenebene zur Anzeige von Hydranten.",
+        "name": "Karte der Hydranten",
+        "presets": {
+            "0": {
+                "description": "Ein Hydrant ist ein Anschlusspunkt, an dem die Feuerwehr Wasser zapfen kann. Er kann sich unterirdisch befinden.",
+                "title": "Löschwasser-Hydrant"
+            }
+        },
+        "tagRenderings": {
+            "hydrant-color": {
+                "mappings": {
+                    "0": {
+                        "then": "Die Farbe des Hydranten ist unbekannt."
+                    },
+                    "1": {
+                        "then": "Die Farbe des Hydranten ist gelb."
+                    },
+                    "2": {
+                        "then": "Die Farbe des Hydranten ist rot."
+                    }
+                },
+                "question": "Welche Farbe hat der Hydrant?",
+                "render": "Der Hydrant hat die Farbe {colour}"
+            },
+            "hydrant-state": {
+                "mappings": {
+                    "0": {
+                        "then": "Der Hydrant ist (ganz oder teilweise) in Betrieb."
+                    },
+                    "1": {
+                        "then": "Der Hydrant ist nicht verfügbar."
+                    },
+                    "2": {
+                        "then": "Der Hydrant wurde entfernt."
+                    }
+                },
+                "question": "Aktualisieren Sie den Lebenszyklusstatus des Hydranten."
+            },
+            "hydrant-type": {
+                "mappings": {
+                    "0": {
+                        "then": "Der Typ des Hydranten ist unbekannt."
+                    },
+                    "1": {
+                        "then": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_pillar.svg\" /> Säulenart."
+                    },
+                    "2": {
+                        "then": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> Rohrtyp."
+                    },
+                    "3": {
+                        "then": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> Wandtyp."
+                    },
+                    "4": {
+                        "then": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_underground.svg\" /> Untergrundtyp."
+                    }
+                },
+                "question": "Um welche Art von Hydrant handelt es sich?",
+                "render": " Hydranten-Typ: {fire_hydrant:type}"
+            }
+        },
+        "title": {
+            "render": "Hydrant"
+        }
+    },
     "information_board": {
         "name": "Informationstafeln",
         "presets": {
diff --git a/langs/layers/en.json b/langs/layers/en.json
index 61e89af2d..88dfb14c9 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -1,4 +1,53 @@
 {
+    "ambulancestation": {
+        "description": "An ambulance station is an area for storage of ambulance vehicles, medical equipment, personal protective equipment, and other medical supplies.",
+        "name": "Map of ambulance stations",
+        "presets": {
+            "0": {
+                "description": "Add an ambulance station to the map",
+                "title": "Ambulance station"
+            }
+        },
+        "tagRenderings": {
+            "ambulance-agency": {
+                "question": "What agency operates this station?",
+                "render": "This station is operated by {operator}."
+            },
+            "ambulance-name": {
+                "question": "What is the name of this ambulance station?",
+                "render": "This station is called {name}."
+            },
+            "ambulance-operator-type": {
+                "mappings": {
+                    "0": {
+                        "then": "The station is operated by the government."
+                    },
+                    "1": {
+                        "then": "The station is operated by a community-based, or informal organization."
+                    },
+                    "2": {
+                        "then": "The station is operated by a formal group of volunteers."
+                    },
+                    "3": {
+                        "then": "The station is privately operated."
+                    }
+                },
+                "question": "How is the station operator classified?",
+                "render": "The operator is a(n) {operator:type} entity."
+            },
+            "ambulance-place": {
+                "question": "Where is the station located? (e.g. name of neighborhood, villlage, or town)",
+                "render": "This station is found within {addr:place}."
+            },
+            "ambulance-street": {
+                "question": " What is the street name where the station located?",
+                "render": "This station is along a highway called {addr:street}."
+            }
+        },
+        "title": {
+            "render": "Ambulance Station"
+        }
+    },
     "artwork": {
         "description": "Diverse pieces of artwork",
         "name": "Artworks",
@@ -1050,13 +1099,7 @@
                 "title": "charging station with a normal european wall plug <img src='./assets/layers/charging_station/TypeE.svg' style='width: 2rem; height: 2rem; float: left; background: white; border-radius: 1rem; margin-right: 0.5rem'/> (meant to charge electrical bikes)"
             },
             "1": {
-                "title": "charging station for e-bikes"
-            },
-            "2": {
                 "title": "charging station for cars"
-            },
-            "3": {
-                "title": "charging station"
             }
         },
         "tagRenderings": {
@@ -1257,7 +1300,7 @@
             "Type": {
                 "mappings": {
                     "0": {
-                        "then": "<b>Bcycles</b> can be charged here"
+                        "then": "<b>Bicycles</b> can be charged here"
                     },
                     "1": {
                         "then": "<b>Cars</b> can be charged here"
@@ -2682,6 +2725,87 @@
             }
         }
     },
+    "extinguisher": {
+        "description": "Map layer to show fire hydrants.",
+        "name": "Map of fire extinguishers.",
+        "presets": {
+            "0": {
+                "description": "A fire extinguisher is a small, portable device used to stop a fire",
+                "title": "Fire extinguisher"
+            }
+        },
+        "tagRenderings": {
+            "extinguisher-location": {
+                "mappings": {
+                    "0": {
+                        "then": "Found indoors."
+                    },
+                    "1": {
+                        "then": "Found outdoors."
+                    }
+                },
+                "question": "Where is it positioned?",
+                "render": "Location: {location}"
+            }
+        },
+        "title": {
+            "render": "Extinguishers"
+        }
+    },
+    "fire_station": {
+        "description": "Map layer to show fire stations.",
+        "name": "Map of fire stations",
+        "presets": {
+            "0": {
+                "description": "A fire station is a place where the fire trucks and firefighters are located when not in operation.",
+                "title": "Fire station"
+            }
+        },
+        "tagRenderings": {
+            "station-agency": {
+                "mappings": {
+                    "0": {
+                        "then": "Bureau of Fire Protection"
+                    }
+                },
+                "question": "What agency operates this station?",
+                "render": "This station is operated by {operator}."
+            },
+            "station-name": {
+                "question": "What is the name of this fire station?",
+                "render": "This station is called {name}."
+            },
+            "station-operator": {
+                "mappings": {
+                    "0": {
+                        "then": "The station is operated by the government."
+                    },
+                    "1": {
+                        "then": "The station is operated by a community-based, or informal organization."
+                    },
+                    "2": {
+                        "then": "The station is operated by a formal group of volunteers."
+                    },
+                    "3": {
+                        "then": "The station is privately operated."
+                    }
+                },
+                "question": "How is the station operator classified?",
+                "render": "The operator is a(n) {operator:type} entity."
+            },
+            "station-place": {
+                "question": "Where is the station located? (e.g. name of neighborhood, villlage, or town)",
+                "render": "This station is found within {addr:place}."
+            },
+            "station-street": {
+                "question": " What is the street name where the station located?",
+                "render": "This station is along a highway called {addr:street}."
+            }
+        },
+        "title": {
+            "render": "Fire Station"
+        }
+    },
     "food": {
         "filter": {
             "0": {
@@ -2859,6 +2983,71 @@
             }
         }
     },
+    "hydrant": {
+        "description": "Map layer to show fire hydrants.",
+        "name": "Map of hydrants",
+        "presets": {
+            "0": {
+                "description": "A hydrant is a connection point where firefighters can tap water. It might be located underground.",
+                "title": "Fire hydrant"
+            }
+        },
+        "tagRenderings": {
+            "hydrant-color": {
+                "mappings": {
+                    "0": {
+                        "then": "The hydrant color is unknown."
+                    },
+                    "1": {
+                        "then": "The hydrant color is yellow."
+                    },
+                    "2": {
+                        "then": "The hydrant color is red."
+                    }
+                },
+                "question": "What color is the hydrant?",
+                "render": "The hydrant color is {colour}"
+            },
+            "hydrant-state": {
+                "mappings": {
+                    "0": {
+                        "then": "The hydrant is (fully or partially) working"
+                    },
+                    "1": {
+                        "then": "The hydrant is unavailable"
+                    },
+                    "2": {
+                        "then": "The hydrant has been removed"
+                    }
+                },
+                "question": "Is this hydrant still working?"
+            },
+            "hydrant-type": {
+                "mappings": {
+                    "0": {
+                        "then": "The hydrant type is unknown."
+                    },
+                    "1": {
+                        "then": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_pillar.svg\" /> Pillar type."
+                    },
+                    "2": {
+                        "then": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> Pipe type."
+                    },
+                    "3": {
+                        "then": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> Wall type."
+                    },
+                    "4": {
+                        "then": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_underground.svg\" /> Underground type."
+                    }
+                },
+                "question": "What type of hydrant is it?",
+                "render": " Hydrant type: {fire_hydrant:type}"
+            }
+        },
+        "title": {
+            "render": "Hydrant"
+        }
+    },
     "information_board": {
         "name": "Information boards",
         "presets": {
diff --git a/langs/layers/eo.json b/langs/layers/eo.json
index 219d02d91..6d97c7fc1 100644
--- a/langs/layers/eo.json
+++ b/langs/layers/eo.json
@@ -76,6 +76,13 @@
             }
         }
     },
+    "extinguisher": {
+        "tagRenderings": {
+            "extinguisher-location": {
+                "render": "Loko: {location}"
+            }
+        }
+    },
     "ghost_bike": {
         "name": "Fantombiciklo",
         "presets": {
diff --git a/langs/layers/fr.json b/langs/layers/fr.json
index fce1d651c..e1e76f262 100644
--- a/langs/layers/fr.json
+++ b/langs/layers/fr.json
@@ -1,4 +1,53 @@
 {
+    "ambulancestation": {
+        "description": "Une station d’ambulance est un lieu où sont stockés les véhicules d’urgence ainsi que de l’équipement médical.",
+        "name": "Couche des ambulances",
+        "presets": {
+            "0": {
+                "description": "Ajouter une station d’ambulances à la carte",
+                "title": "Station d’ambulances"
+            }
+        },
+        "tagRenderings": {
+            "ambulance-agency": {
+                "question": "Quel est l’exploitant de la station ?",
+                "render": "Cette station est opérée par {operator}."
+            },
+            "ambulance-name": {
+                "question": "Quel est le nom de cette station ?",
+                "render": "Cette station s’appelle {name}."
+            },
+            "ambulance-operator-type": {
+                "mappings": {
+                    "0": {
+                        "then": "La station est opérée par le gouvernement."
+                    },
+                    "1": {
+                        "then": "La station est opérée par une organisation informelle."
+                    },
+                    "2": {
+                        "then": "La station est opérée par un groupe officiel de bénévoles."
+                    },
+                    "3": {
+                        "then": "La station est opérée par un groupe privé."
+                    }
+                },
+                "question": "Quel est le type d’exploitant ?",
+                "render": "L’exploitant est de type {operator:type}."
+            },
+            "ambulance-place": {
+                "question": "Dans quelle localité la station est-elle située ?",
+                "render": "La station fait partie de {addr:place}."
+            },
+            "ambulance-street": {
+                "question": " Quel est le nom de la rue où la station se situe ?",
+                "render": "La station fait partie de {addr:street}."
+            }
+        },
+        "title": {
+            "render": "Station d’ambulances"
+        }
+    },
     "artwork": {
         "description": "Diverses œuvres d'art",
         "name": "Œuvres d'art",
@@ -1060,6 +1109,87 @@
             "render": "Eau potable"
         }
     },
+    "extinguisher": {
+        "description": "Couche des lances à incendie.",
+        "name": "Couche des extincteurs.",
+        "presets": {
+            "0": {
+                "description": "Un extincteur est un appareil portatif servant à éteindre un feu",
+                "title": "Extincteur"
+            }
+        },
+        "tagRenderings": {
+            "extinguisher-location": {
+                "mappings": {
+                    "0": {
+                        "then": "Intérieur."
+                    },
+                    "1": {
+                        "then": "Extérieur."
+                    }
+                },
+                "question": "Où est-elle positionnée ?",
+                "render": "Emplacement : {location}"
+            }
+        },
+        "title": {
+            "render": "Exctincteurs"
+        }
+    },
+    "fire_station": {
+        "description": "Couche des stations de pompiers.",
+        "name": "Couche des stations de pompiers",
+        "presets": {
+            "0": {
+                "description": "Une caserne de pompiers est un lieu où les pompiers et leur équipements sont situés en dehors des missions.",
+                "title": "Caserne de pompiers"
+            }
+        },
+        "tagRenderings": {
+            "station-agency": {
+                "mappings": {
+                    "0": {
+                        "then": "Brigade de Protection du Feu"
+                    }
+                },
+                "question": "Quel est l’exploitant de la station ?",
+                "render": "Cette station est opérée par {operator}."
+            },
+            "station-name": {
+                "question": "Quel est le nom de la station ?",
+                "render": "Cette station s’appelle {name}."
+            },
+            "station-operator": {
+                "mappings": {
+                    "0": {
+                        "then": "La station est opérée par le gouvernement."
+                    },
+                    "1": {
+                        "then": "La station est opérée par une organisation informelle."
+                    },
+                    "2": {
+                        "then": "La station est opérée par un groupe officiel de bénévoles."
+                    },
+                    "3": {
+                        "then": "La station est opérée par un groupe privé."
+                    }
+                },
+                "question": "Quel est le type d’exploitant ?",
+                "render": "L’exploitant est de type {operator:type}."
+            },
+            "station-place": {
+                "question": "Dans quelle localité la station est-elle située ?",
+                "render": "La station fait partie de {addr:place}."
+            },
+            "station-street": {
+                "question": " Quel est le nom de la rue dans lequel elle se situe ?",
+                "render": "La station fait partie de la {addr:street}."
+            }
+        },
+        "title": {
+            "render": "Station de pompiers"
+        }
+    },
     "food": {
         "tagRenderings": {
             "friture-oil": {
@@ -1159,6 +1289,71 @@
             "render": "Vélo fantôme"
         }
     },
+    "hydrant": {
+        "description": "Couche des bornes incendie.",
+        "name": "Carte des bornes incendie",
+        "presets": {
+            "0": {
+                "description": "Une borne incendie est un point où les pompiers peuvent s’alimenter en eau. Elle peut être enterrée.",
+                "title": "Borne incendie"
+            }
+        },
+        "tagRenderings": {
+            "hydrant-color": {
+                "mappings": {
+                    "0": {
+                        "then": "La borne est de couleur inconnue."
+                    },
+                    "1": {
+                        "then": "La borne est jaune."
+                    },
+                    "2": {
+                        "then": "La borne est rouge."
+                    }
+                },
+                "question": "Quelle est la couleur de la borne ?",
+                "render": "La borne est {colour}"
+            },
+            "hydrant-state": {
+                "mappings": {
+                    "0": {
+                        "then": "La borne est en état, ou partiellement en état, de fonctionner."
+                    },
+                    "1": {
+                        "then": "La borne est hors-service."
+                    },
+                    "2": {
+                        "then": "La borne a été retirée."
+                    }
+                },
+                "question": "Mettre à jour l’état de la borne."
+            },
+            "hydrant-type": {
+                "mappings": {
+                    "0": {
+                        "then": "La borne est de type inconnu."
+                    },
+                    "1": {
+                        "then": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_pillar.svg\" /> Pilier."
+                    },
+                    "2": {
+                        "then": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> Tuyau."
+                    },
+                    "3": {
+                        "then": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> Mural."
+                    },
+                    "4": {
+                        "then": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_underground.svg\" /> Enterré."
+                    }
+                },
+                "question": "De quel type de borne s’agit-il ?",
+                "render": " Type de borne : {fire_hydrant:type}"
+            }
+        },
+        "title": {
+            "render": "Bornes incendie"
+        }
+    },
     "information_board": {
         "name": "Panneaux d'informations",
         "presets": {
diff --git a/langs/layers/id.json b/langs/layers/id.json
index b71c81e61..600901e75 100644
--- a/langs/layers/id.json
+++ b/langs/layers/id.json
@@ -283,6 +283,17 @@
             }
         }
     },
+    "hydrant": {
+        "tagRenderings": {
+            "hydrant-type": {
+                "mappings": {
+                    "3": {
+                        "then": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> Jenis dinding."
+                    }
+                }
+            }
+        }
+    },
     "nature_reserve": {
         "tagRenderings": {
             "Email": {
diff --git a/langs/layers/it.json b/langs/layers/it.json
index 82aad1b9f..fe7c1a0b7 100644
--- a/langs/layers/it.json
+++ b/langs/layers/it.json
@@ -1,4 +1,53 @@
 {
+    "ambulancestation": {
+        "description": "La stazione delle ambulanze è un’area per lo stoccaggio delle ambulanze, dell’equipaggiamento medico, dei dispositivi di protezione individuale e di altre forniture medicali.",
+        "name": "Carta delle stazioni delle ambulanze",
+        "presets": {
+            "0": {
+                "description": "Aggiungi una stazione delle ambulanza alla mappa",
+                "title": "Stazione delle ambulanze"
+            }
+        },
+        "tagRenderings": {
+            "ambulance-agency": {
+                "question": "Quale agenzia gestisce questa stazione?",
+                "render": "Questa stazione è gestita da {operator}."
+            },
+            "ambulance-name": {
+                "question": "Qual è il nome di questa stazione delle ambulanze?",
+                "render": "Questa stazione è chiamata {name}."
+            },
+            "ambulance-operator-type": {
+                "mappings": {
+                    "0": {
+                        "then": "La stazione è gestita dal governo."
+                    },
+                    "1": {
+                        "then": "La stazione è gestita dalla comunità o un’organizzazione non ufficiale."
+                    },
+                    "2": {
+                        "then": "La stazione è gestita da un gruppo ufficiale di volontari."
+                    },
+                    "3": {
+                        "then": "La stazione è gestita da un privato."
+                    }
+                },
+                "question": "Com’è classificato il gestore della stazione?",
+                "render": "L’operatore è un ente {operator:type}."
+            },
+            "ambulance-place": {
+                "question": "Dove si trova la stazione? (ad es. quartiere, paese o città)",
+                "render": "La stazione si trova a {addr:place}."
+            },
+            "ambulance-street": {
+                "question": " Come si chiama la strada in cui si trova questa stazione?",
+                "render": "Questa stazione si trova in {addr:street}."
+            }
+        },
+        "title": {
+            "render": "Stazione delle ambulanze"
+        }
+    },
     "artwork": {
         "description": "Diverse opere d’arte",
         "name": "Opere d’arte",
@@ -915,6 +964,87 @@
             "render": "Acqua potabile"
         }
     },
+    "extinguisher": {
+        "description": "Livello della mappa che mostra gli idranti antincendio.",
+        "name": "Cartina degli estintori.",
+        "presets": {
+            "0": {
+                "description": "Un estintore è un dispositivo portatile di piccole dimensioni usato per spegnere un incendio",
+                "title": "Estintore"
+            }
+        },
+        "tagRenderings": {
+            "extinguisher-location": {
+                "mappings": {
+                    "0": {
+                        "then": "Si trova all’interno."
+                    },
+                    "1": {
+                        "then": "Si trova all’esterno."
+                    }
+                },
+                "question": "Dove è posizionato?",
+                "render": "Posizione: {location}"
+            }
+        },
+        "title": {
+            "render": "Estintori"
+        }
+    },
+    "fire_station": {
+        "description": "Livello che mostra le caserme dei vigili del fuoco.",
+        "name": "Mappa delle caserme dei vigili del fuoco",
+        "presets": {
+            "0": {
+                "description": "Una caserma dei pompieri è un luogo dove si trovano i mezzi antincendio e i pompieri tra una missione e l’altra.",
+                "title": "Caserma dei vigili del fuoco"
+            }
+        },
+        "tagRenderings": {
+            "station-agency": {
+                "mappings": {
+                    "0": {
+                        "then": "Servizio antincendio governativo"
+                    }
+                },
+                "question": "Quale agenzia gestisce questa stazione?",
+                "render": "Questa stazione è gestita da {operator}."
+            },
+            "station-name": {
+                "question": "Come si chiama questa caserma dei vigili del fuoco?",
+                "render": "Questa caserma si chiama {name}."
+            },
+            "station-operator": {
+                "mappings": {
+                    "0": {
+                        "then": "Questa stazione è gestita dal governo."
+                    },
+                    "1": {
+                        "then": "Questa stazione è gestita dalla comunità oppure un’associazione informale."
+                    },
+                    "2": {
+                        "then": "Questa stazione è gestita da un gruppo di volontari ufficiale."
+                    },
+                    "3": {
+                        "then": "Questa stazione è gestita da privati."
+                    }
+                },
+                "question": "Com’è classificato il gestore di questa stazione?",
+                "render": "Il gestore è un ente {operator:type}."
+            },
+            "station-place": {
+                "question": "In che località si trova la stazione? (ad es. quartiere, paese o città)",
+                "render": "La stazione si trova a {addr:place}."
+            },
+            "station-street": {
+                "question": " Qual è il nome della via in cui si trova la caserma?",
+                "render": "La stazione si trova in una strada chiamata {addr:street}."
+            }
+        },
+        "title": {
+            "render": "Caserma dei vigili del fuoco"
+        }
+    },
     "ghost_bike": {
         "name": "Bici fantasma",
         "presets": {
@@ -957,6 +1087,71 @@
             "render": "Bici fantasma"
         }
     },
+    "hydrant": {
+        "description": "Livello della mappa che mostra gli idranti antincendio.",
+        "name": "Mappa degli idranti",
+        "presets": {
+            "0": {
+                "description": "Un idrante è un punto di collegamento dove i pompieri possono estrarre acqua. Potrebbe trovarsi sottoterra.",
+                "title": "Idrante antincendio"
+            }
+        },
+        "tagRenderings": {
+            "hydrant-color": {
+                "mappings": {
+                    "0": {
+                        "then": "Il colore dell’idrante è sconosciuto."
+                    },
+                    "1": {
+                        "then": "Il colore dell’idrante è giallo."
+                    },
+                    "2": {
+                        "then": "L'idrante è rosso."
+                    }
+                },
+                "question": "Qual è il colore dell’idrante?",
+                "render": "Il colore dell’idrante è {colour}"
+            },
+            "hydrant-state": {
+                "mappings": {
+                    "0": {
+                        "then": "L’idrante è (parzialmente o completamente) funzionante."
+                    },
+                    "1": {
+                        "then": "L’idrante è fuori servizio."
+                    },
+                    "2": {
+                        "then": "L’idrante è stato rimosso."
+                    }
+                },
+                "question": "Aggiorna lo stato di funzionamento dell’idrante."
+            },
+            "hydrant-type": {
+                "mappings": {
+                    "0": {
+                        "then": "Il tipo di idrante è sconosciuto."
+                    },
+                    "1": {
+                        "then": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_pillar.svg\" /> Soprasuolo."
+                    },
+                    "2": {
+                        "then": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> Tubo."
+                    },
+                    "3": {
+                        "then": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> A muro."
+                    },
+                    "4": {
+                        "then": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_underground.svg\" /> Sottosuolo."
+                    }
+                },
+                "question": "Di che tipo è questo idrante?",
+                "render": " Tipo di idrante: {fire_hydrant:type}"
+            }
+        },
+        "title": {
+            "render": "Idrante"
+        }
+    },
     "information_board": {
         "name": "Pannelli informativi",
         "presets": {
diff --git a/langs/layers/ja.json b/langs/layers/ja.json
index 252865ede..743f4b2c8 100644
--- a/langs/layers/ja.json
+++ b/langs/layers/ja.json
@@ -1,4 +1,53 @@
 {
+    "ambulancestation": {
+        "description": "救急ステーションは、救急車、医療機器、個人用保護具、およびその他の医療用品を保管する場所です。",
+        "name": "救急ステーションの地図",
+        "presets": {
+            "0": {
+                "description": "救急ステーション(消防署)をマップに追加する",
+                "title": "救急ステーション(消防署)"
+            }
+        },
+        "tagRenderings": {
+            "ambulance-agency": {
+                "question": "このステーションを運営しているのはどこですか?",
+                "render": "このステーションは{operator}によって運営されています。"
+            },
+            "ambulance-name": {
+                "question": "この救急ステーションの名前は何ですか?",
+                "render": "このステーションの名前は{name}です。"
+            },
+            "ambulance-operator-type": {
+                "mappings": {
+                    "0": {
+                        "then": "ステーションは自治体が運営する。"
+                    },
+                    "1": {
+                        "then": "任意団体やコミュニティが運営しているステーションである。"
+                    },
+                    "2": {
+                        "then": "公益団体が運営しているステーションである。"
+                    },
+                    "3": {
+                        "then": "個人が運営しているステーションである。"
+                    }
+                },
+                "question": "ステーションの運営の分類は?",
+                "render": "運営者は、{operator:type} です。"
+            },
+            "ambulance-place": {
+                "question": "このステーションの住所は?(例: 地区、村、または町の名称)",
+                "render": "このステーションは{addr:place}にあります。"
+            },
+            "ambulance-street": {
+                "question": " 救急ステーションの所在地はどこですか?",
+                "render": "{addr:street} 沿いにあります。"
+            }
+        },
+        "title": {
+            "render": "救急ステーション"
+        }
+    },
     "artwork": {
         "description": "多様な作品",
         "name": "美術品",
@@ -72,6 +121,87 @@
             "render": "アートワーク"
         }
     },
+    "extinguisher": {
+        "description": "消火栓を表示するマップレイヤ。",
+        "name": "消火器の地図です。",
+        "presets": {
+            "0": {
+                "description": "消火器は、火災を止めるために使用される小型で携帯可能な装置である",
+                "title": "消火器"
+            }
+        },
+        "tagRenderings": {
+            "extinguisher-location": {
+                "mappings": {
+                    "0": {
+                        "then": "屋内にある。"
+                    },
+                    "1": {
+                        "then": "屋外にある。"
+                    }
+                },
+                "question": "どこにあるんですか?",
+                "render": "場所:{location}"
+            }
+        },
+        "title": {
+            "render": "消火器"
+        }
+    },
+    "fire_station": {
+        "description": "消防署を表示するためのマップレイヤ。",
+        "name": "消防署の地図",
+        "presets": {
+            "0": {
+                "description": "消防署は、運転していないときに消防車や消防士がいる場所です。",
+                "title": "消防署"
+            }
+        },
+        "tagRenderings": {
+            "station-agency": {
+                "mappings": {
+                    "0": {
+                        "then": "消防局(消防庁)"
+                    }
+                },
+                "question": "このステーションを運営しているのはどこですか?",
+                "render": "このステーションは{operator}によって運営されています。"
+            },
+            "station-name": {
+                "question": "この消防署の名前は何ですか?",
+                "render": "このステーションの名前は{name}です。"
+            },
+            "station-operator": {
+                "mappings": {
+                    "0": {
+                        "then": "ステーションは自治体が運営する。"
+                    },
+                    "1": {
+                        "then": "任意団体やコミュニティが運営しているステーションである。"
+                    },
+                    "2": {
+                        "then": "公益団体が運営しているステーションである。"
+                    },
+                    "3": {
+                        "then": "個人が運営しているステーションである。"
+                    }
+                },
+                "question": "ステーションの運営の分類は?",
+                "render": "運営者は、{operator:type} です。"
+            },
+            "station-place": {
+                "question": "このステーションの住所は?(例: 地区、村、または町の名称)",
+                "render": "このステーションは{addr:place}にあります。"
+            },
+            "station-street": {
+                "question": " 救急ステーションの所在地はどこですか?",
+                "render": "{addr:street} 沿いにあります。"
+            }
+        },
+        "title": {
+            "render": "消防署"
+        }
+    },
     "food": {
         "tagRenderings": {
             "friture-take-your-container": {
@@ -101,6 +231,71 @@
             "render": "ゴーストバイク"
         }
     },
+    "hydrant": {
+        "description": "消火栓を表示するマップレイヤ。",
+        "name": "消火栓の地図",
+        "presets": {
+            "0": {
+                "description": "消火栓は消防士が水を汲み上げることができる接続点です。地下にあるかもしれません。",
+                "title": "消火栓"
+            }
+        },
+        "tagRenderings": {
+            "hydrant-color": {
+                "mappings": {
+                    "0": {
+                        "then": "消火栓の色は不明です。"
+                    },
+                    "1": {
+                        "then": "消火栓の色は黄色です。"
+                    },
+                    "2": {
+                        "then": "消火栓の色は赤です。"
+                    }
+                },
+                "question": "消火栓の色は何色ですか?",
+                "render": "消火栓の色は{colour}です"
+            },
+            "hydrant-state": {
+                "mappings": {
+                    "0": {
+                        "then": "消火栓は(完全にまたは部分的に)機能しています。"
+                    },
+                    "1": {
+                        "then": "消火栓は使用できません。"
+                    },
+                    "2": {
+                        "then": "消火栓が撤去されました。"
+                    }
+                },
+                "question": "消火栓のライフサイクルステータスを更新します。"
+            },
+            "hydrant-type": {
+                "mappings": {
+                    "0": {
+                        "then": "消火栓の種類は不明です。"
+                    },
+                    "1": {
+                        "then": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_pillar.svg\" /> ピラー型。"
+                    },
+                    "2": {
+                        "then": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> パイプ型。"
+                    },
+                    "3": {
+                        "then": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> 壁型。"
+                    },
+                    "4": {
+                        "then": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_underground.svg\" />地下式。"
+                    }
+                },
+                "question": "どんな消火栓なんですか?",
+                "render": " 消火栓のタイプ:{fire_hydrant:type}"
+            }
+        },
+        "title": {
+            "render": "消火栓"
+        }
+    },
     "shops": {
         "description": "ショップ",
         "name": "店",
diff --git a/langs/layers/nb_NO.json b/langs/layers/nb_NO.json
index e9fa529cd..3f8508b36 100644
--- a/langs/layers/nb_NO.json
+++ b/langs/layers/nb_NO.json
@@ -174,6 +174,41 @@
             }
         }
     },
+    "extinguisher": {
+        "description": "Kartlag for å vise brannslokkere.",
+        "name": "Kart over brannhydranter",
+        "presets": {
+            "0": {
+                "title": "Brannslukker"
+            }
+        },
+        "title": {
+            "render": "Brannslokkere"
+        }
+    },
+    "fire_station": {
+        "name": "Kart over brannstasjoner",
+        "presets": {
+            "0": {
+                "title": "Brannstasjon"
+            }
+        },
+        "tagRenderings": {
+            "station-name": {
+                "render": "Denne stasjonen heter {name}."
+            },
+            "station-operator": {
+                "mappings": {
+                    "0": {
+                        "then": "Stasjonen drives av myndighetene."
+                    }
+                }
+            }
+        },
+        "title": {
+            "render": "Brannstasjon"
+        }
+    },
     "ghost_bike": {
         "name": "Spøkelsessykler",
         "presets": {
@@ -185,6 +220,24 @@
             "render": "Spøkelsessykler"
         }
     },
+    "hydrant": {
+        "description": "Kartlag for å vise brannhydranter.",
+        "name": "Kart over brannhydranter",
+        "presets": {
+            "0": {
+                "title": "Brannhydrant"
+            }
+        },
+        "tagRenderings": {
+            "hydrant-color": {
+                "question": "Hvilken farge har brannhydranten?",
+                "render": "Brannhydranter er {colour}"
+            }
+        },
+        "title": {
+            "render": "Brannhydrant"
+        }
+    },
     "shops": {
         "tagRenderings": {
             "shops-shop": {
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index c2d7a8800..579329cb9 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -1126,13 +1126,7 @@
                 "title": "laadpunt met gewone stekker(s) <img src='./assets/layers/charging_station/TypeE.svg' style='width: 2rem; height: 2rem; float: left; background: white; border-radius: 1rem; margin-right: 0.5rem'/> (bedoeld om electrische fietsen op te laden)"
             },
             "1": {
-                "title": "oplaadpunt voor elektrische fietsen"
-            },
-            "2": {
                 "title": "oplaadstation voor elektrische auto's"
-            },
-            "3": {
-                "title": "oplaadstation"
             }
         },
         "tagRenderings": {
diff --git a/langs/layers/ru.json b/langs/layers/ru.json
index fe3315dae..3308f21f8 100644
--- a/langs/layers/ru.json
+++ b/langs/layers/ru.json
@@ -1,4 +1,29 @@
 {
+    "ambulancestation": {
+        "name": "Карта станций скорой помощи",
+        "presets": {
+            "0": {
+                "description": "Добавить станцию скорой помощи на карту",
+                "title": "Станция скорой помощи"
+            }
+        },
+        "tagRenderings": {
+            "ambulance-name": {
+                "question": "Как называется эта станция скорой помощи?",
+                "render": "Эта станция называется {name}."
+            },
+            "ambulance-place": {
+                "question": "Где расположена станция? (напр., название населённого пункта)"
+            },
+            "ambulance-street": {
+                "question": " По какому адресу расположена эта станция?",
+                "render": "Эта станция расположена вдоль шоссе {addr:street}."
+            }
+        },
+        "title": {
+            "render": "Станция скорой помощи"
+        }
+    },
     "artwork": {
         "description": "Разнообразные произведения искусства",
         "name": "Произведения искусства",
@@ -762,6 +787,59 @@
             "render": "Питьевая вода"
         }
     },
+    "extinguisher": {
+        "description": "Слой карты, отображающий огнетушители.",
+        "name": "Карта огнетушителей.",
+        "presets": {
+            "0": {
+                "description": "Огнетушитель - небольшое переносное устройство для тушения огня",
+                "title": "Огнетушитель"
+            }
+        },
+        "tagRenderings": {
+            "extinguisher-location": {
+                "mappings": {
+                    "0": {
+                        "then": "Внутри."
+                    },
+                    "1": {
+                        "then": "Снаружи."
+                    }
+                },
+                "question": "Где это расположено?",
+                "render": "Местоположение: {location}"
+            }
+        },
+        "title": {
+            "render": "Огнетушители"
+        }
+    },
+    "fire_station": {
+        "description": "Слой карты, отображающий пожарные части.",
+        "name": "Карта пожарных частей",
+        "presets": {
+            "0": {
+                "title": "Пожарная часть"
+            }
+        },
+        "tagRenderings": {
+            "station-name": {
+                "question": "Как называется эта пожарная часть?",
+                "render": "Эта часть называется {name}."
+            },
+            "station-place": {
+                "question": "Где расположена часть? (напр., название населённого пункта)",
+                "render": "Эта часть расположена в {addr:place}."
+            },
+            "station-street": {
+                "question": " По какому адресу расположена эта часть?",
+                "render": "Часть расположена вдоль шоссе {addr:street}."
+            }
+        },
+        "title": {
+            "render": "Пожарная часть"
+        }
+    },
     "food": {
         "presets": {
             "0": {
@@ -806,6 +884,57 @@
             "render": "Велосипед Ghost"
         }
     },
+    "hydrant": {
+        "description": "Слой карты, отображающий пожарные гидранты.",
+        "name": "Карта пожарных гидрантов",
+        "presets": {
+            "0": {
+                "title": "Пожарный гидрант"
+            }
+        },
+        "tagRenderings": {
+            "hydrant-color": {
+                "mappings": {
+                    "0": {
+                        "then": "Цвет гидранта не определён."
+                    },
+                    "1": {
+                        "then": "Гидрант жёлтого цвета."
+                    },
+                    "2": {
+                        "then": "Гидрант красного цвета."
+                    }
+                },
+                "question": "Какого цвета гидрант?",
+                "render": "Цвет гидранта {colour}"
+            },
+            "hydrant-state": {
+                "mappings": {
+                    "0": {
+                        "then": "Гидрант (полностью или частично) в рабочем состоянии"
+                    },
+                    "2": {
+                        "then": "Гидрант демонтирован"
+                    }
+                }
+            },
+            "hydrant-type": {
+                "mappings": {
+                    "0": {
+                        "then": "Тип гидранта не определён."
+                    },
+                    "3": {
+                        "then": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> Тип стены."
+                    }
+                },
+                "question": "К какому типу относится этот гидрант?",
+                "render": " Тип гидранта: {fire_hydrant:type}"
+            }
+        },
+        "title": {
+            "render": "Гидрант"
+        }
+    },
     "information_board": {
         "name": "Информационные щиты",
         "presets": {
diff --git a/langs/layers/zh_Hant.json b/langs/layers/zh_Hant.json
index a5b4efd56..4277017d0 100644
--- a/langs/layers/zh_Hant.json
+++ b/langs/layers/zh_Hant.json
@@ -448,6 +448,9 @@
             "render": "單車停車場"
         }
     },
+    "extinguisher": {
+        "description": "顯示消防栓的地圖圖層。"
+    },
     "ghost_bike": {
         "name": "幽靈單車",
         "presets": {
@@ -458,5 +461,9 @@
         "title": {
             "render": "幽靈單車"
         }
+    },
+    "hydrant": {
+        "description": "顯示消防栓的地圖圖層。",
+        "name": "消防栓地圖"
     }
 }
\ No newline at end of file
diff --git a/langs/themes/de.json b/langs/themes/de.json
index 07f704334..6c811cc9d 100644
--- a/langs/themes/de.json
+++ b/langs/themes/de.json
@@ -346,6 +346,9 @@
                         },
                         "question": "Wie heißt diese Kletterroute?",
                         "render": "<strong>{name}</strong>"
+                    },
+                    "Rock type": {
+                        "render": "Der Gesteinstyp ist {_embedding_features_with_rock:rock}, wie <a href='#{_embedding_features_with_rock:id}'>auf dem umgebenden Felsen angegeben</a>"
                     }
                 },
                 "title": {
@@ -373,6 +376,9 @@
                     "Contained routes length hist": {
                         "render": "<h3>Längenübersicht</h3>{histogramm(_length_hist)}"
                     },
+                    "Contained_climbing_routes": {
+                        "render": "<h3> Enthält {_contained_climbing_routes_count} Routen</h3> <ul>{_contained_climbing_routes}</ul>"
+                    },
                     "Rock type (crag/rock/cliff only)": {
                         "mappings": {
                             "0": {
@@ -386,6 +392,9 @@
                         "mappings": {
                             "0": {
                                 "then": "Ein Kletterfelsen - ein einzelner Felsen oder eine Klippe mit einer oder wenigen Kletterrouten, die ohne Seil sicher bestiegen werden können"
+                            },
+                            "1": {
+                                "then": "Ein Kletterfelsen - ein einzelner Fels oder eine Klippe mit mindestens einigen Kletterrouten"
                             }
                         }
                     },
@@ -401,6 +410,9 @@
                 },
                 "title": {
                     "mappings": {
+                        "0": {
+                            "then": "Klettergarten <b>{name}</b>"
+                        },
                         "1": {
                             "then": "Klettergebiet <b>{name}</b>"
                         },
@@ -594,7 +606,7 @@
                     }
                 },
                 "title": {
-                    "render": "Knotenpunkt"
+                    "render": "Knotenpunkt <strong>{rcn_ref}</strong>"
                 }
             }
         },
@@ -644,7 +656,7 @@
                             "then": "Diese Straße ist keine Fahrradstraße"
                         }
                     },
-                    "question": "Ist diese Straße eine Fahrradstraße?"
+                    "question": "Ist die Straße <b>{Name}</b> eine Fahrradstraße?"
                 },
                 "1": {
                     "question": "Wann wird diese Straße eine Fahrradstraße?",
@@ -657,7 +669,7 @@
     },
     "cyclofix": {
         "description": "Mit dieser Karte wird Radfahrern eine einfache Lösung bereitgestellt, um die passende Fahrradinfrastruktur zu finden.<br><br>Sie können Ihren genauen Standort verfolgen (nur mobil) und in der linken unteren Ecke die für Sie relevanten Ebenen auswählen. Sie können auch interessante Orte zur Karte hinzuzufügen oder bearbeiten und weitere Daten durch Beantwortung von Fragen bereitstellen.<br><br>Ihre Änderungen, werden automatisch in OpenStreetMap gespeichert und können von anderen frei verwendet werden.<br><br>Weitere Informationen über Cyclofix finden Sie unter <a href='https://cyclofix.osm.be/'>cyclofix.osm.be</a>.",
-        "title": "Cyclofix — eine freie Karte für Radfahrer"
+        "title": "Cyclofix - die freie Karte für Radler"
     },
     "drinking_water": {
         "description": "Eine Karte zum Anzeigen und Bearbeiten öffentlicher Trinkwasserstellen",
@@ -854,139 +866,7 @@
         "title": "Hackerspaces"
     },
     "hailhydrant": {
-        "description": "Auf dieser Karte können Sie Hydranten, Feuerwachen, Krankenwagen und Feuerlöscher in Ihren bevorzugten Stadtvierteln finden und aktualisieren.  \n\nSie können Ihren genauen Standort verfolgen (nur mobil) und in der unteren linken Ecke die für Sie relevanten Ebenen auswählen. Sie können mit diesem Tool auch Pins (Points of Interest) zur Karte hinzufügen oder bearbeiten und durch die Beantwortung verfügbarer Fragen zusätzliche Angaben machen.  \n\nAlle von Ihnen vorgenommenen Änderungen werden automatisch in der globalen Datenbank von OpenStreetMap gespeichert und können von anderen frei weiterverwendet werden.",
-        "layers": {
-            "0": {
-                "description": "Kartenebene zur Anzeige von Hydranten.",
-                "name": "Karte der Hydranten",
-                "presets": {
-                    "0": {
-                        "description": "Ein Hydrant ist ein Anschlusspunkt, an dem die Feuerwehr Wasser zapfen kann. Er kann sich unterirdisch befinden.",
-                        "title": "Löschwasser-Hydrant"
-                    }
-                },
-                "tagRenderings": {
-                    "hydrant-color": {
-                        "mappings": {
-                            "0": {
-                                "then": "Die Farbe des Hydranten ist unbekannt."
-                            },
-                            "1": {
-                                "then": "Die Farbe des Hydranten ist gelb."
-                            },
-                            "2": {
-                                "then": "Die Farbe des Hydranten ist rot."
-                            }
-                        },
-                        "question": "Welche Farbe hat der Hydrant?",
-                        "render": "Der Hydrant hat die Farbe {colour}"
-                    },
-                    "hydrant-state": {
-                        "mappings": {
-                            "0": {
-                                "then": "Der Hydrant ist (ganz oder teilweise) in Betrieb."
-                            },
-                            "1": {
-                                "then": "Der Hydrant ist nicht verfügbar."
-                            },
-                            "2": {
-                                "then": "Der Hydrant wurde entfernt."
-                            }
-                        },
-                        "question": "Aktualisieren Sie den Lebenszyklusstatus des Hydranten."
-                    },
-                    "hydrant-type": {
-                        "mappings": {
-                            "0": {
-                                "then": "Der Typ des Hydranten ist unbekannt."
-                            },
-                            "1": {
-                                "then": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_pillar.svg\" /> Säulenart."
-                            },
-                            "2": {
-                                "then": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> Rohrtyp."
-                            },
-                            "3": {
-                                "then": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> Wandtyp."
-                            },
-                            "4": {
-                                "then": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_underground.svg\" /> Untergrundtyp."
-                            }
-                        },
-                        "question": "Um welche Art von Hydrant handelt es sich?",
-                        "render": " Hydranten-Typ: {fire_hydrant:type}"
-                    }
-                },
-                "title": {
-                    "render": "Hydrant"
-                }
-            },
-            "1": {
-                "description": "Kartenebene zur Anzeige von Hydranten.",
-                "name": "Karte mit Feuerlöschern.",
-                "presets": {
-                    "0": {
-                        "description": "Ein Feuerlöscher ist ein kleines, tragbares Gerät, das dazu dient, ein Feuer zu löschen",
-                        "title": "Feuerlöscher"
-                    }
-                },
-                "tagRenderings": {
-                    "extinguisher-location": {
-                        "mappings": {
-                            "0": {
-                                "then": "Im Innenraum vorhanden."
-                            },
-                            "1": {
-                                "then": "Im Außenraum vorhanden."
-                            }
-                        },
-                        "question": "Wo befindet er sich?",
-                        "render": "Standort: {location}"
-                    }
-                },
-                "title": {
-                    "render": "Feuerlöscher"
-                }
-            },
-            "2": {
-                "description": "Kartenebene zur Darstellung von Feuerwachen.",
-                "name": "Karte der Feuerwachen",
-                "presets": {
-                    "0": {
-                        "description": "Eine Feuerwache ist ein Ort, an dem die Feuerwehrfahrzeuge und die Feuerwehrleute untergebracht sind, wenn sie nicht im Einsatz sind.",
-                        "title": "Feuerwache"
-                    }
-                },
-                "tagRenderings": {
-                    "station-agency": {
-                        "mappings": {
-                            "0": {
-                                "then": "Brandschutzbehörde"
-                            }
-                        }
-                    },
-                    "station-name": {
-                        "question": "Wie lautet der Name dieser Feuerwache?"
-                    }
-                },
-                "title": {
-                    "render": "Feuerwache"
-                }
-            },
-            "3": {
-                "description": "Eine Rettungswache ist ein Ort, an dem Rettungsfahrzeuge, medizinische Ausrüstung, persönliche Schutzausrüstung und anderes medizinisches Material untergebracht sind.",
-                "name": "Karte der Rettungswachen",
-                "presets": {
-                    "0": {
-                        "description": "Eine Rettungsstation der Karte hinzufügen",
-                        "title": "Rettungswache"
-                    }
-                },
-                "title": {
-                    "render": "Rettungswache"
-                }
-            }
-        },
+        "description": "Auf dieser Karte können Sie Hydranten, Feuerwachen, Krankenwagen und Feuerlöscher in Ihren bevorzugten Stadtvierteln finden und aktualisieren.\n\nSie können Ihren genauen Standort verfolgen (nur mobil) und in der unteren linken Ecke die für Sie relevanten Ebenen auswählen. Sie können mit diesem Tool auch Pins (Points of Interest) zur Karte hinzufügen oder bearbeiten und durch die Beantwortung verfügbarer Fragen zusätzliche Angaben machen.\n\nAlle von Ihnen vorgenommenen Änderungen werden automatisch in der globalen Datenbank von OpenStreetMap gespeichert und können von anderen frei weiterverwendet werden.",
         "shortDescription": "Hydranten, Feuerlöscher, Feuerwachen und Rettungswachen."
     },
     "maps": {
@@ -997,7 +877,7 @@
     "natuurpunt": {
         "description": "Auf dieser Karte können Sie alle Naturschutzgebiete von Natuurpunt finden ",
         "shortDescription": "Diese Karte zeigt Naturschutzgebiete des flämischen Naturverbands Natuurpunt",
-        "title": "Naturschutzgebiete"
+        "title": "Die Karte von Natuurpunt"
     },
     "observation_towers": {
         "description": "Öffentlich zugänglicher Aussichtsturm",
@@ -1044,7 +924,7 @@
                 }
             }
         },
-        "title": "OpenWindPowerMap"
+        "title": "Freie Windenergie-Karte"
     },
     "parkings": {
         "description": "Diese Karte zeigt Parkplätze",
@@ -1052,7 +932,7 @@
         "title": "Parken"
     },
     "personal": {
-        "description": "Erstellen Sie ein persönliches Thema auf der Grundlage aller verfügbaren Ebenen aller Themen",
+        "description": "Erstellen Sie ein persönliches Thema, das auf allen verfügbaren Ebenen aller Themen basiert. Um einige Daten anzuzeigen, öffnen Sie die <a href='#filter'>Ebenenauswahl</a>",
         "title": "Persönliches Thema"
     },
     "playgrounds": {
diff --git a/langs/themes/en.json b/langs/themes/en.json
index 66355eefc..3823d6d27 100644
--- a/langs/themes/en.json
+++ b/langs/themes/en.json
@@ -915,203 +915,6 @@
     },
     "hailhydrant": {
         "description": "On this map you can find and update hydrants, fire stations, ambulance stations, and extinguishers in your favorite neighborhoods.\n\nYou can track your precise location (mobile only) and select layers that are relevant for you in the bottom left corner. You can also use this tool to add or edit pins (points of interest) to the map and provide additional details by answering available questions.\n\nAll changes you make will automatically be saved in the global database of OpenStreetMap and can be freely re-used by others.",
-        "layers": {
-            "0": {
-                "description": "Map layer to show fire hydrants.",
-                "name": "Map of hydrants",
-                "presets": {
-                    "0": {
-                        "description": "A hydrant is a connection point where firefighters can tap water. It might be located underground.",
-                        "title": "Fire hydrant"
-                    }
-                },
-                "tagRenderings": {
-                    "hydrant-color": {
-                        "mappings": {
-                            "0": {
-                                "then": "The hydrant color is unknown."
-                            },
-                            "1": {
-                                "then": "The hydrant color is yellow."
-                            },
-                            "2": {
-                                "then": "The hydrant color is red."
-                            }
-                        },
-                        "question": "What color is the hydrant?",
-                        "render": "The hydrant color is {colour}"
-                    },
-                    "hydrant-state": {
-                        "mappings": {
-                            "0": {
-                                "then": "The hydrant is (fully or partially) working"
-                            },
-                            "1": {
-                                "then": "The hydrant is unavailable"
-                            },
-                            "2": {
-                                "then": "The hydrant has been removed"
-                            }
-                        },
-                        "question": "Is this hydrant still working?"
-                    },
-                    "hydrant-type": {
-                        "mappings": {
-                            "0": {
-                                "then": "The hydrant type is unknown."
-                            },
-                            "1": {
-                                "then": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_pillar.svg\" /> Pillar type."
-                            },
-                            "2": {
-                                "then": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> Pipe type."
-                            },
-                            "3": {
-                                "then": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> Wall type."
-                            },
-                            "4": {
-                                "then": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_underground.svg\" /> Underground type."
-                            }
-                        },
-                        "question": "What type of hydrant is it?",
-                        "render": " Hydrant type: {fire_hydrant:type}"
-                    }
-                },
-                "title": {
-                    "render": "Hydrant"
-                }
-            },
-            "1": {
-                "description": "Map layer to show fire hydrants.",
-                "name": "Map of fire extinguishers.",
-                "presets": {
-                    "0": {
-                        "description": "A fire extinguisher is a small, portable device used to stop a fire",
-                        "title": "Fire extinguisher"
-                    }
-                },
-                "tagRenderings": {
-                    "extinguisher-location": {
-                        "mappings": {
-                            "0": {
-                                "then": "Found indoors."
-                            },
-                            "1": {
-                                "then": "Found outdoors."
-                            }
-                        },
-                        "question": "Where is it positioned?",
-                        "render": "Location: {location}"
-                    }
-                },
-                "title": {
-                    "render": "Extinguishers"
-                }
-            },
-            "2": {
-                "description": "Map layer to show fire stations.",
-                "name": "Map of fire stations",
-                "presets": {
-                    "0": {
-                        "description": "A fire station is a place where the fire trucks and firefighters are located when not in operation.",
-                        "title": "Fire station"
-                    }
-                },
-                "tagRenderings": {
-                    "station-agency": {
-                        "mappings": {
-                            "0": {
-                                "then": "Bureau of Fire Protection"
-                            }
-                        },
-                        "question": "What agency operates this station?",
-                        "render": "This station is operated by {operator}."
-                    },
-                    "station-name": {
-                        "question": "What is the name of this fire station?",
-                        "render": "This station is called {name}."
-                    },
-                    "station-operator": {
-                        "mappings": {
-                            "0": {
-                                "then": "The station is operated by the government."
-                            },
-                            "1": {
-                                "then": "The station is operated by a community-based, or informal organization."
-                            },
-                            "2": {
-                                "then": "The station is operated by a formal group of volunteers."
-                            },
-                            "3": {
-                                "then": "The station is privately operated."
-                            }
-                        },
-                        "question": "How is the station operator classified?",
-                        "render": "The operator is a(n) {operator:type} entity."
-                    },
-                    "station-place": {
-                        "question": "Where is the station located? (e.g. name of neighborhood, villlage, or town)",
-                        "render": "This station is found within {addr:place}."
-                    },
-                    "station-street": {
-                        "question": " What is the street name where the station located?",
-                        "render": "This station is along a highway called {addr:street}."
-                    }
-                },
-                "title": {
-                    "render": "Fire Station"
-                }
-            },
-            "3": {
-                "description": "An ambulance station is an area for storage of ambulance vehicles, medical equipment, personal protective equipment, and other medical supplies.",
-                "name": "Map of ambulance stations",
-                "presets": {
-                    "0": {
-                        "description": "Add an ambulance station to the map",
-                        "title": "Ambulance station"
-                    }
-                },
-                "tagRenderings": {
-                    "ambulance-agency": {
-                        "question": "What agency operates this station?",
-                        "render": "This station is operated by {operator}."
-                    },
-                    "ambulance-name": {
-                        "question": "What is the name of this ambulance station?",
-                        "render": "This station is called {name}."
-                    },
-                    "ambulance-operator-type": {
-                        "mappings": {
-                            "0": {
-                                "then": "The station is operated by the government."
-                            },
-                            "1": {
-                                "then": "The station is operated by a community-based, or informal organization."
-                            },
-                            "2": {
-                                "then": "The station is operated by a formal group of volunteers."
-                            },
-                            "3": {
-                                "then": "The station is privately operated."
-                            }
-                        },
-                        "question": "How is the station operator classified?",
-                        "render": "The operator is a(n) {operator:type} entity."
-                    },
-                    "ambulance-place": {
-                        "question": "Where is the station located? (e.g. name of neighborhood, villlage, or town)",
-                        "render": "This station is found within {addr:place}."
-                    },
-                    "ambulance-street": {
-                        "question": " What is the street name where the station located?",
-                        "render": "This station is along a highway called {addr:street}."
-                    }
-                },
-                "title": {
-                    "render": "Ambulance Station"
-                }
-            }
-        },
         "shortDescription": "Map to show hydrants, extinguishers, fire stations, and ambulance stations.",
         "title": "Hydrants, Extinguishers, Fire stations, and Ambulance stations."
     },
diff --git a/langs/themes/eo.json b/langs/themes/eo.json
index 27f8b03a8..04e1e7d6f 100644
--- a/langs/themes/eo.json
+++ b/langs/themes/eo.json
@@ -39,17 +39,6 @@
     "ghostbikes": {
         "title": "Fantombicikloj"
     },
-    "hailhydrant": {
-        "layers": {
-            "1": {
-                "tagRenderings": {
-                    "extinguisher-location": {
-                        "render": "Loko: {location}"
-                    }
-                }
-            }
-        }
-    },
     "maps": {
         "title": "Mapo de mapoj"
     },
diff --git a/langs/themes/fr.json b/langs/themes/fr.json
index 22f725ad4..c23c53ee3 100644
--- a/langs/themes/fr.json
+++ b/langs/themes/fr.json
@@ -648,203 +648,6 @@
     },
     "hailhydrant": {
         "description": "Sur cette carte on trouve et met à jour les bornes incendies, extincteurs, casernes de pompiers et ambulanciers dans son quartier.<br/>Les options en haut à gauche permettent de localiser sa position (sur téléphone) et de filtrer les éléments. Il est possible d’utiliser cet outil pour ajouter et éditer les points d’intérêt de la carte et d’y ajouter des détails en répondant aux questions.<br/>Toutes les modifications sont automatiquement enregistrées dans la base de données OpenStreetMap et peuvent êtres librement réutilisées par d’autres.",
-        "layers": {
-            "0": {
-                "description": "Couche des bornes incendie.",
-                "name": "Carte des bornes incendie",
-                "presets": {
-                    "0": {
-                        "description": "Une borne incendie est un point où les pompiers peuvent s’alimenter en eau. Elle peut être enterrée.",
-                        "title": "Borne incendie"
-                    }
-                },
-                "tagRenderings": {
-                    "hydrant-color": {
-                        "mappings": {
-                            "0": {
-                                "then": "La borne est de couleur inconnue."
-                            },
-                            "1": {
-                                "then": "La borne est jaune."
-                            },
-                            "2": {
-                                "then": "La borne est rouge."
-                            }
-                        },
-                        "question": "Quelle est la couleur de la borne ?",
-                        "render": "La borne est {colour}"
-                    },
-                    "hydrant-state": {
-                        "mappings": {
-                            "0": {
-                                "then": "La borne est en état, ou partiellement en état, de fonctionner."
-                            },
-                            "1": {
-                                "then": "La borne est hors-service."
-                            },
-                            "2": {
-                                "then": "La borne a été retirée."
-                            }
-                        },
-                        "question": "Mettre à jour l’état de la borne."
-                    },
-                    "hydrant-type": {
-                        "mappings": {
-                            "0": {
-                                "then": "La borne est de type inconnu."
-                            },
-                            "1": {
-                                "then": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_pillar.svg\" /> Pilier."
-                            },
-                            "2": {
-                                "then": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> Tuyau."
-                            },
-                            "3": {
-                                "then": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> Mural."
-                            },
-                            "4": {
-                                "then": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_underground.svg\" /> Enterré."
-                            }
-                        },
-                        "question": "De quel type de borne s’agit-il ?",
-                        "render": " Type de borne : {fire_hydrant:type}"
-                    }
-                },
-                "title": {
-                    "render": "Bornes incendie"
-                }
-            },
-            "1": {
-                "description": "Couche des lances à incendie.",
-                "name": "Couche des extincteurs.",
-                "presets": {
-                    "0": {
-                        "description": "Un extincteur est un appareil portatif servant à éteindre un feu",
-                        "title": "Extincteur"
-                    }
-                },
-                "tagRenderings": {
-                    "extinguisher-location": {
-                        "mappings": {
-                            "0": {
-                                "then": "Intérieur."
-                            },
-                            "1": {
-                                "then": "Extérieur."
-                            }
-                        },
-                        "question": "Où est-elle positionnée ?",
-                        "render": "Emplacement : {location}"
-                    }
-                },
-                "title": {
-                    "render": "Exctincteurs"
-                }
-            },
-            "2": {
-                "description": "Couche des stations de pompiers.",
-                "name": "Couche des stations de pompiers",
-                "presets": {
-                    "0": {
-                        "description": "Une caserne de pompiers est un lieu où les pompiers et leur équipements sont situés en dehors des missions.",
-                        "title": "Caserne de pompiers"
-                    }
-                },
-                "tagRenderings": {
-                    "station-agency": {
-                        "mappings": {
-                            "0": {
-                                "then": "Brigade de Protection du Feu"
-                            }
-                        },
-                        "question": "Quel est l’exploitant de la station ?",
-                        "render": "Cette station est opérée par {operator}."
-                    },
-                    "station-name": {
-                        "question": "Quel est le nom de la station ?",
-                        "render": "Cette station s’appelle {name}."
-                    },
-                    "station-operator": {
-                        "mappings": {
-                            "0": {
-                                "then": "La station est opérée par le gouvernement."
-                            },
-                            "1": {
-                                "then": "La station est opérée par une organisation informelle."
-                            },
-                            "2": {
-                                "then": "La station est opérée par un groupe officiel de bénévoles."
-                            },
-                            "3": {
-                                "then": "La station est opérée par un groupe privé."
-                            }
-                        },
-                        "question": "Quel est le type d’exploitant ?",
-                        "render": "L’exploitant est de type {operator:type}."
-                    },
-                    "station-place": {
-                        "question": "Dans quelle localité la station est-elle située ?",
-                        "render": "La station fait partie de {addr:place}."
-                    },
-                    "station-street": {
-                        "question": " Quel est le nom de la rue dans lequel elle se situe ?",
-                        "render": "La station fait partie de la {addr:street}."
-                    }
-                },
-                "title": {
-                    "render": "Station de pompiers"
-                }
-            },
-            "3": {
-                "description": "Une station d’ambulance est un lieu où sont stockés les véhicules d’urgence ainsi que de l’équipement médical.",
-                "name": "Couche des ambulances",
-                "presets": {
-                    "0": {
-                        "description": "Ajouter une station d’ambulances à la carte",
-                        "title": "Station d’ambulances"
-                    }
-                },
-                "tagRenderings": {
-                    "ambulance-agency": {
-                        "question": "Quel est l’exploitant de la station ?",
-                        "render": "Cette station est opérée par {operator}."
-                    },
-                    "ambulance-name": {
-                        "question": "Quel est le nom de cette station ?",
-                        "render": "Cette station s’appelle {name}."
-                    },
-                    "ambulance-operator-type": {
-                        "mappings": {
-                            "0": {
-                                "then": "La station est opérée par le gouvernement."
-                            },
-                            "1": {
-                                "then": "La station est opérée par une organisation informelle."
-                            },
-                            "2": {
-                                "then": "La station est opérée par un groupe officiel de bénévoles."
-                            },
-                            "3": {
-                                "then": "La station est opérée par un groupe privé."
-                            }
-                        },
-                        "question": "Quel est le type d’exploitant ?",
-                        "render": "L’exploitant est de type {operator:type}."
-                    },
-                    "ambulance-place": {
-                        "question": "Dans quelle localité la station est-elle située ?",
-                        "render": "La station fait partie de {addr:place}."
-                    },
-                    "ambulance-street": {
-                        "question": " Quel est le nom de la rue où la station se situe ?",
-                        "render": "La station fait partie de {addr:street}."
-                    }
-                },
-                "title": {
-                    "render": "Station d’ambulances"
-                }
-            }
-        },
         "shortDescription": "Carte indiquant les bornes incendies, extincteurs, casernes de pompiers et ambulanciers.",
         "title": "Bornes incendies, extincteurs, casernes de pompiers et ambulanciers."
     },
diff --git a/langs/themes/id.json b/langs/themes/id.json
index 350ef3808..a6003b64d 100644
--- a/langs/themes/id.json
+++ b/langs/themes/id.json
@@ -115,21 +115,6 @@
             }
         }
     },
-    "hailhydrant": {
-        "layers": {
-            "0": {
-                "tagRenderings": {
-                    "hydrant-type": {
-                        "mappings": {
-                            "3": {
-                                "then": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> Jenis dinding."
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    },
     "trees": {
         "title": "Pohon"
     },
diff --git a/langs/themes/it.json b/langs/themes/it.json
index e58a3b44b..fcafe2804 100644
--- a/langs/themes/it.json
+++ b/langs/themes/it.json
@@ -791,203 +791,6 @@
     },
     "hailhydrant": {
         "description": "In questa cartina puoi vedere e aggiornare idranti, stazioni dei pompieri, stazioni delle ambulanze ed estintori del tuo quartiere preferito.\n\nPuoi seguire la tua posizione precisa (solo su cellulare) e selezionare i livelli che ti interessano nell’angolo in basso a sinistra. Puoi anche usare questo strumento per aggiungere o modificare i PDI sulla mappa e fornire ulteriori dettagli rispondendo alle domande.\n\nTutte le modifiche che farai verranno automaticamente salvate nel database globale di OpenStreetMap e potranno essere riutilizzate liberamente da tutti.",
-        "layers": {
-            "0": {
-                "description": "Livello della mappa che mostra gli idranti antincendio.",
-                "name": "Mappa degli idranti",
-                "presets": {
-                    "0": {
-                        "description": "Un idrante è un punto di collegamento dove i pompieri possono estrarre acqua. Potrebbe trovarsi sottoterra.",
-                        "title": "Idrante antincendio"
-                    }
-                },
-                "tagRenderings": {
-                    "hydrant-color": {
-                        "mappings": {
-                            "0": {
-                                "then": "Il colore dell’idrante è sconosciuto."
-                            },
-                            "1": {
-                                "then": "Il colore dell’idrante è giallo."
-                            },
-                            "2": {
-                                "then": "L'idrante è rosso."
-                            }
-                        },
-                        "question": "Qual è il colore dell’idrante?",
-                        "render": "Il colore dell’idrante è {colour}"
-                    },
-                    "hydrant-state": {
-                        "mappings": {
-                            "0": {
-                                "then": "L’idrante è (parzialmente o completamente) funzionante."
-                            },
-                            "1": {
-                                "then": "L’idrante è fuori servizio."
-                            },
-                            "2": {
-                                "then": "L’idrante è stato rimosso."
-                            }
-                        },
-                        "question": "Aggiorna lo stato di funzionamento dell’idrante."
-                    },
-                    "hydrant-type": {
-                        "mappings": {
-                            "0": {
-                                "then": "Il tipo di idrante è sconosciuto."
-                            },
-                            "1": {
-                                "then": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_pillar.svg\" /> Soprasuolo."
-                            },
-                            "2": {
-                                "then": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> Tubo."
-                            },
-                            "3": {
-                                "then": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> A muro."
-                            },
-                            "4": {
-                                "then": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_underground.svg\" /> Sottosuolo."
-                            }
-                        },
-                        "question": "Di che tipo è questo idrante?",
-                        "render": " Tipo di idrante: {fire_hydrant:type}"
-                    }
-                },
-                "title": {
-                    "render": "Idrante"
-                }
-            },
-            "1": {
-                "description": "Livello della mappa che mostra gli idranti antincendio.",
-                "name": "Cartina degli estintori.",
-                "presets": {
-                    "0": {
-                        "description": "Un estintore è un dispositivo portatile di piccole dimensioni usato per spegnere un incendio",
-                        "title": "Estintore"
-                    }
-                },
-                "tagRenderings": {
-                    "extinguisher-location": {
-                        "mappings": {
-                            "0": {
-                                "then": "Si trova all’interno."
-                            },
-                            "1": {
-                                "then": "Si trova all’esterno."
-                            }
-                        },
-                        "question": "Dove è posizionato?",
-                        "render": "Posizione: {location}"
-                    }
-                },
-                "title": {
-                    "render": "Estintori"
-                }
-            },
-            "2": {
-                "description": "Livello che mostra le caserme dei vigili del fuoco.",
-                "name": "Mappa delle caserme dei vigili del fuoco",
-                "presets": {
-                    "0": {
-                        "description": "Una caserma dei pompieri è un luogo dove si trovano i mezzi antincendio e i pompieri tra una missione e l’altra.",
-                        "title": "Caserma dei vigili del fuoco"
-                    }
-                },
-                "tagRenderings": {
-                    "station-agency": {
-                        "mappings": {
-                            "0": {
-                                "then": "Servizio antincendio governativo"
-                            }
-                        },
-                        "question": "Quale agenzia gestisce questa stazione?",
-                        "render": "Questa stazione è gestita da {operator}."
-                    },
-                    "station-name": {
-                        "question": "Come si chiama questa caserma dei vigili del fuoco?",
-                        "render": "Questa caserma si chiama {name}."
-                    },
-                    "station-operator": {
-                        "mappings": {
-                            "0": {
-                                "then": "Questa stazione è gestita dal governo."
-                            },
-                            "1": {
-                                "then": "Questa stazione è gestita dalla comunità oppure un’associazione informale."
-                            },
-                            "2": {
-                                "then": "Questa stazione è gestita da un gruppo di volontari ufficiale."
-                            },
-                            "3": {
-                                "then": "Questa stazione è gestita da privati."
-                            }
-                        },
-                        "question": "Com’è classificato il gestore di questa stazione?",
-                        "render": "Il gestore è un ente {operator:type}."
-                    },
-                    "station-place": {
-                        "question": "In che località si trova la stazione? (ad es. quartiere, paese o città)",
-                        "render": "La stazione si trova a {addr:place}."
-                    },
-                    "station-street": {
-                        "question": " Qual è il nome della via in cui si trova la caserma?",
-                        "render": "La stazione si trova in una strada chiamata {addr:street}."
-                    }
-                },
-                "title": {
-                    "render": "Caserma dei vigili del fuoco"
-                }
-            },
-            "3": {
-                "description": "La stazione delle ambulanze è un’area per lo stoccaggio delle ambulanze, dell’equipaggiamento medico, dei dispositivi di protezione individuale e di altre forniture medicali.",
-                "name": "Carta delle stazioni delle ambulanze",
-                "presets": {
-                    "0": {
-                        "description": "Aggiungi una stazione delle ambulanza alla mappa",
-                        "title": "Stazione delle ambulanze"
-                    }
-                },
-                "tagRenderings": {
-                    "ambulance-agency": {
-                        "question": "Quale agenzia gestisce questa stazione?",
-                        "render": "Questa stazione è gestita da {operator}."
-                    },
-                    "ambulance-name": {
-                        "question": "Qual è il nome di questa stazione delle ambulanze?",
-                        "render": "Questa stazione è chiamata {name}."
-                    },
-                    "ambulance-operator-type": {
-                        "mappings": {
-                            "0": {
-                                "then": "La stazione è gestita dal governo."
-                            },
-                            "1": {
-                                "then": "La stazione è gestita dalla comunità o un’organizzazione non ufficiale."
-                            },
-                            "2": {
-                                "then": "La stazione è gestita da un gruppo ufficiale di volontari."
-                            },
-                            "3": {
-                                "then": "La stazione è gestita da un privato."
-                            }
-                        },
-                        "question": "Com’è classificato il gestore della stazione?",
-                        "render": "L’operatore è un ente {operator:type}."
-                    },
-                    "ambulance-place": {
-                        "question": "Dove si trova la stazione? (ad es. quartiere, paese o città)",
-                        "render": "La stazione si trova a {addr:place}."
-                    },
-                    "ambulance-street": {
-                        "question": " Come si chiama la strada in cui si trova questa stazione?",
-                        "render": "Questa stazione si trova in {addr:street}."
-                    }
-                },
-                "title": {
-                    "render": "Stazione delle ambulanze"
-                }
-            }
-        },
         "shortDescription": "Carta che mostra gli idranti, gli estintori, le caserme dei vigili del fuoco e le stazioni delle ambulanze.",
         "title": "Idranti, estintori, caserme dei vigili del fuoco e stazioni delle ambulanze."
     },
diff --git a/langs/themes/ja.json b/langs/themes/ja.json
index 3540821fc..d2f6b71ba 100644
--- a/langs/themes/ja.json
+++ b/langs/themes/ja.json
@@ -631,203 +631,6 @@
     },
     "hailhydrant": {
         "description": "このマップでは、お気に入りの近隣にある消火栓、消防署、救急ステーション、消火器を検索して更新できます。\n\n正確な位置を追跡し(モバイルのみ)、左下コーナーで関連するレイヤを選択できます。このツールを使用して、マップにピン(注視点)を追加または編集したり、利用可能な質問に答えることによって追加の詳細を提供することもできます。\n\nすべての変更は自動的にOpenStreetMapのグローバルデータベースに保存され、他のユーザが自由に再利用できます。",
-        "layers": {
-            "0": {
-                "description": "消火栓を表示するマップレイヤ。",
-                "name": "消火栓の地図",
-                "presets": {
-                    "0": {
-                        "description": "消火栓は消防士が水を汲み上げることができる接続点です。地下にあるかもしれません。",
-                        "title": "消火栓"
-                    }
-                },
-                "tagRenderings": {
-                    "hydrant-color": {
-                        "mappings": {
-                            "0": {
-                                "then": "消火栓の色は不明です。"
-                            },
-                            "1": {
-                                "then": "消火栓の色は黄色です。"
-                            },
-                            "2": {
-                                "then": "消火栓の色は赤です。"
-                            }
-                        },
-                        "question": "消火栓の色は何色ですか?",
-                        "render": "消火栓の色は{colour}です"
-                    },
-                    "hydrant-state": {
-                        "mappings": {
-                            "0": {
-                                "then": "消火栓は(完全にまたは部分的に)機能しています。"
-                            },
-                            "1": {
-                                "then": "消火栓は使用できません。"
-                            },
-                            "2": {
-                                "then": "消火栓が撤去されました。"
-                            }
-                        },
-                        "question": "消火栓のライフサイクルステータスを更新します。"
-                    },
-                    "hydrant-type": {
-                        "mappings": {
-                            "0": {
-                                "then": "消火栓の種類は不明です。"
-                            },
-                            "1": {
-                                "then": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_pillar.svg\" /> ピラー型。"
-                            },
-                            "2": {
-                                "then": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> パイプ型。"
-                            },
-                            "3": {
-                                "then": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> 壁型。"
-                            },
-                            "4": {
-                                "then": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_underground.svg\" />地下式。"
-                            }
-                        },
-                        "question": "どんな消火栓なんですか?",
-                        "render": " 消火栓のタイプ:{fire_hydrant:type}"
-                    }
-                },
-                "title": {
-                    "render": "消火栓"
-                }
-            },
-            "1": {
-                "description": "消火栓を表示するマップレイヤ。",
-                "name": "消火器の地図です。",
-                "presets": {
-                    "0": {
-                        "description": "消火器は、火災を止めるために使用される小型で携帯可能な装置である",
-                        "title": "消火器"
-                    }
-                },
-                "tagRenderings": {
-                    "extinguisher-location": {
-                        "mappings": {
-                            "0": {
-                                "then": "屋内にある。"
-                            },
-                            "1": {
-                                "then": "屋外にある。"
-                            }
-                        },
-                        "question": "どこにあるんですか?",
-                        "render": "場所:{location}"
-                    }
-                },
-                "title": {
-                    "render": "消火器"
-                }
-            },
-            "2": {
-                "description": "消防署を表示するためのマップレイヤ。",
-                "name": "消防署の地図",
-                "presets": {
-                    "0": {
-                        "description": "消防署は、運転していないときに消防車や消防士がいる場所です。",
-                        "title": "消防署"
-                    }
-                },
-                "tagRenderings": {
-                    "station-agency": {
-                        "mappings": {
-                            "0": {
-                                "then": "消防局(消防庁)"
-                            }
-                        },
-                        "question": "このステーションを運営しているのはどこですか?",
-                        "render": "このステーションは{operator}によって運営されています。"
-                    },
-                    "station-name": {
-                        "question": "この消防署の名前は何ですか?",
-                        "render": "このステーションの名前は{name}です。"
-                    },
-                    "station-operator": {
-                        "mappings": {
-                            "0": {
-                                "then": "ステーションは自治体が運営する。"
-                            },
-                            "1": {
-                                "then": "任意団体やコミュニティが運営しているステーションである。"
-                            },
-                            "2": {
-                                "then": "公益団体が運営しているステーションである。"
-                            },
-                            "3": {
-                                "then": "個人が運営しているステーションである。"
-                            }
-                        },
-                        "question": "ステーションの運営の分類は?",
-                        "render": "運営者は、{operator:type} です。"
-                    },
-                    "station-place": {
-                        "question": "このステーションの住所は?(例: 地区、村、または町の名称)",
-                        "render": "このステーションは{addr:place}にあります。"
-                    },
-                    "station-street": {
-                        "question": " 救急ステーションの所在地はどこですか?",
-                        "render": "{addr:street} 沿いにあります。"
-                    }
-                },
-                "title": {
-                    "render": "消防署"
-                }
-            },
-            "3": {
-                "description": "救急ステーションは、救急車、医療機器、個人用保護具、およびその他の医療用品を保管する場所です。",
-                "name": "救急ステーションの地図",
-                "presets": {
-                    "0": {
-                        "description": "救急ステーション(消防署)をマップに追加する",
-                        "title": "救急ステーション(消防署)"
-                    }
-                },
-                "tagRenderings": {
-                    "ambulance-agency": {
-                        "question": "このステーションを運営しているのはどこですか?",
-                        "render": "このステーションは{operator}によって運営されています。"
-                    },
-                    "ambulance-name": {
-                        "question": "この救急ステーションの名前は何ですか?",
-                        "render": "このステーションの名前は{name}です。"
-                    },
-                    "ambulance-operator-type": {
-                        "mappings": {
-                            "0": {
-                                "then": "ステーションは自治体が運営する。"
-                            },
-                            "1": {
-                                "then": "任意団体やコミュニティが運営しているステーションである。"
-                            },
-                            "2": {
-                                "then": "公益団体が運営しているステーションである。"
-                            },
-                            "3": {
-                                "then": "個人が運営しているステーションである。"
-                            }
-                        },
-                        "question": "ステーションの運営の分類は?",
-                        "render": "運営者は、{operator:type} です。"
-                    },
-                    "ambulance-place": {
-                        "question": "このステーションの住所は?(例: 地区、村、または町の名称)",
-                        "render": "このステーションは{addr:place}にあります。"
-                    },
-                    "ambulance-street": {
-                        "question": " 救急ステーションの所在地はどこですか?",
-                        "render": "{addr:street} 沿いにあります。"
-                    }
-                },
-                "title": {
-                    "render": "救急ステーション"
-                }
-            }
-        },
         "shortDescription": "消火栓、消火器、消防署消火栓、消火器、消防署、および救急ステーションを表示します。",
         "title": "消火栓、消火器、消防署、救急ステーションです。"
     },
diff --git a/langs/themes/nb_NO.json b/langs/themes/nb_NO.json
index 56da4593b..06bd4017a 100644
--- a/langs/themes/nb_NO.json
+++ b/langs/themes/nb_NO.json
@@ -235,61 +235,6 @@
         "title": "Spøkelsessykler"
     },
     "hailhydrant": {
-        "layers": {
-            "0": {
-                "description": "Kartlag for å vise brannhydranter.",
-                "name": "Kart over brannhydranter",
-                "presets": {
-                    "0": {
-                        "title": "Brannhydrant"
-                    }
-                },
-                "tagRenderings": {
-                    "hydrant-color": {
-                        "question": "Hvilken farge har brannhydranten?",
-                        "render": "Brannhydranter er {colour}"
-                    }
-                },
-                "title": {
-                    "render": "Brannhydrant"
-                }
-            },
-            "1": {
-                "description": "Kartlag for å vise brannslokkere.",
-                "name": "Kart over brannhydranter",
-                "presets": {
-                    "0": {
-                        "title": "Brannslukker"
-                    }
-                },
-                "title": {
-                    "render": "Brannslokkere"
-                }
-            },
-            "2": {
-                "name": "Kart over brannstasjoner",
-                "presets": {
-                    "0": {
-                        "title": "Brannstasjon"
-                    }
-                },
-                "tagRenderings": {
-                    "station-name": {
-                        "render": "Denne stasjonen heter {name}."
-                    },
-                    "station-operator": {
-                        "mappings": {
-                            "0": {
-                                "then": "Stasjonen drives av myndighetene."
-                            }
-                        }
-                    }
-                },
-                "title": {
-                    "render": "Brannstasjon"
-                }
-            }
-        },
         "title": "Hydranter, brannslukkere, brannstasjoner, og ambulansestasjoner."
     },
     "maps": {
diff --git a/langs/themes/ru.json b/langs/themes/ru.json
index 4f24b0ab8..b6166629c 100644
--- a/langs/themes/ru.json
+++ b/langs/themes/ru.json
@@ -402,137 +402,6 @@
         "title": "Хакерспейсы"
     },
     "hailhydrant": {
-        "layers": {
-            "0": {
-                "description": "Слой карты, отображающий пожарные гидранты.",
-                "name": "Карта пожарных гидрантов",
-                "presets": {
-                    "0": {
-                        "title": "Пожарный гидрант"
-                    }
-                },
-                "tagRenderings": {
-                    "hydrant-color": {
-                        "mappings": {
-                            "0": {
-                                "then": "Цвет гидранта не определён."
-                            },
-                            "1": {
-                                "then": "Гидрант жёлтого цвета."
-                            },
-                            "2": {
-                                "then": "Гидрант красного цвета."
-                            }
-                        },
-                        "question": "Какого цвета гидрант?",
-                        "render": "Цвет гидранта {colour}"
-                    },
-                    "hydrant-state": {
-                        "mappings": {
-                            "0": {
-                                "then": "Гидрант (полностью или частично) в рабочем состоянии"
-                            },
-                            "2": {
-                                "then": "Гидрант демонтирован"
-                            }
-                        }
-                    },
-                    "hydrant-type": {
-                        "mappings": {
-                            "0": {
-                                "then": "Тип гидранта не определён."
-                            },
-                            "3": {
-                                "then": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> Тип стены."
-                            }
-                        },
-                        "question": "К какому типу относится этот гидрант?",
-                        "render": " Тип гидранта: {fire_hydrant:type}"
-                    }
-                },
-                "title": {
-                    "render": "Гидрант"
-                }
-            },
-            "1": {
-                "description": "Слой карты, отображающий огнетушители.",
-                "name": "Карта огнетушителей.",
-                "presets": {
-                    "0": {
-                        "description": "Огнетушитель - небольшое переносное устройство для тушения огня",
-                        "title": "Огнетушитель"
-                    }
-                },
-                "tagRenderings": {
-                    "extinguisher-location": {
-                        "mappings": {
-                            "0": {
-                                "then": "Внутри."
-                            },
-                            "1": {
-                                "then": "Снаружи."
-                            }
-                        },
-                        "question": "Где это расположено?",
-                        "render": "Местоположение: {location}"
-                    }
-                },
-                "title": {
-                    "render": "Огнетушители"
-                }
-            },
-            "2": {
-                "description": "Слой карты, отображающий пожарные части.",
-                "name": "Карта пожарных частей",
-                "presets": {
-                    "0": {
-                        "title": "Пожарная часть"
-                    }
-                },
-                "tagRenderings": {
-                    "station-name": {
-                        "question": "Как называется эта пожарная часть?",
-                        "render": "Эта часть называется {name}."
-                    },
-                    "station-place": {
-                        "question": "Где расположена часть? (напр., название населённого пункта)",
-                        "render": "Эта часть расположена в {addr:place}."
-                    },
-                    "station-street": {
-                        "question": " По какому адресу расположена эта часть?",
-                        "render": "Часть расположена вдоль шоссе {addr:street}."
-                    }
-                },
-                "title": {
-                    "render": "Пожарная часть"
-                }
-            },
-            "3": {
-                "name": "Карта станций скорой помощи",
-                "presets": {
-                    "0": {
-                        "description": "Добавить станцию скорой помощи на карту",
-                        "title": "Станция скорой помощи"
-                    }
-                },
-                "tagRenderings": {
-                    "ambulance-name": {
-                        "question": "Как называется эта станция скорой помощи?",
-                        "render": "Эта станция называется {name}."
-                    },
-                    "ambulance-place": {
-                        "question": "Где расположена станция? (напр., название населённого пункта)"
-                    },
-                    "ambulance-street": {
-                        "question": " По какому адресу расположена эта станция?",
-                        "render": "Эта станция расположена вдоль шоссе {addr:street}."
-                    }
-                },
-                "title": {
-                    "render": "Станция скорой помощи"
-                }
-            }
-        },
         "shortDescription": "Карта пожарных гидрантов, огнетушителей, пожарных станций и станций скорой помощи.",
         "title": "Пожарные гидранты, огнетушители, пожарные станции и станции скорой помощи."
     },
diff --git a/langs/themes/zh_Hant.json b/langs/themes/zh_Hant.json
index 23642b39d..6761d0f69 100644
--- a/langs/themes/zh_Hant.json
+++ b/langs/themes/zh_Hant.json
@@ -271,15 +271,6 @@
     },
     "hailhydrant": {
         "description": "在這份地圖上面你可以在你喜愛的社區尋找與更新消防栓、消防隊、急救站與滅火器。\n\n你可以追蹤確切位置 (只有行動版) 以及在左下角選擇與你相關的圖層。你也可以使用這工具新增或編輯地圖上的釘子 (興趣點)，以及透過回答一些問題提供額外的資訊。\n\n所有你做出的變動都會自動存到開放街圖這個全球資料庫，而且能自由讓其他人取用。",
-        "layers": {
-            "0": {
-                "description": "顯示消防栓的地圖圖層。",
-                "name": "消防栓地圖"
-            },
-            "1": {
-                "description": "顯示消防栓的地圖圖層。"
-            }
-        },
         "shortDescription": "顯示消防栓、滅火器、消防隊與急救站的地圖。",
         "title": "消防栓、滅火器、消防隊、以及急救站。"
     },