diff --git a/Models/ThemeConfig/Json/LayerConfigJson.ts b/Models/ThemeConfig/Json/LayerConfigJson.ts
index 9bc71e38fc..d70433da93 100644
--- a/Models/ThemeConfig/Json/LayerConfigJson.ts
+++ b/Models/ThemeConfig/Json/LayerConfigJson.ts
@@ -203,6 +203,11 @@ export interface LayerConfigJson {
     presets?: {
         /**
          * The title - shown on the 'add-new'-button.
+         * 
+         * This should include the article of the noun, e.g. 'a hydrant', 'a bicycle pump'.
+         * This text will be inserted into `Add {category} here`, becoming `Add a hydrant here`.
+         * 
+         * Do _not_ indicate 'new': 'add a new shop here' is incorrect, as the shop might have existed forever, it could just be unmapped!
          */
         title: string | any,
         /**
diff --git a/assets/layers/ambulancestation/ambulancestation.json b/assets/layers/ambulancestation/ambulancestation.json
index 4a18e1420b..d7d9218131 100644
--- a/assets/layers/ambulancestation/ambulancestation.json
+++ b/assets/layers/ambulancestation/ambulancestation.json
@@ -250,11 +250,11 @@
         "en": "Ambulance station",
         "ru": "Станция скорой помощи",
         "ja": "救急ステーション(消防署)",
-        "fr": "Station d’ambulances",
-        "de": "Rettungswache",
-        "it": "Stazione delle ambulanze",
+        "fr": "une station d’ambulances",
+        "de": "eine rettungswache",
+        "it": "una stazione delle ambulanze",
         "hu": "Mentőállomás",
-        "nl": "Ambulancestation",
+        "nl": "een ambulancestation",
         "zh_Hans": "救护车站",
         "id": "Stasiun ambulans"
       },
diff --git a/assets/layers/artwork/artwork.json b/assets/layers/artwork/artwork.json
index bffc6f05f1..7df12ba1f1 100644
--- a/assets/layers/artwork/artwork.json
+++ b/assets/layers/artwork/artwork.json
@@ -88,22 +88,22 @@
       ],
       "title": {
         "en": "Artwork",
-        "nl": "Kunstwerk",
-        "fr": "Œuvre d'art",
-        "de": "Kunstwerk",
-        "it": "Opera d’arte",
+        "nl": "een kunstwerk",
+        "fr": "une œuvre d'art",
+        "de": "eine kunstwerk",
+        "it": "una opera d’arte",
         "ru": "Художественная работа",
-        "es": "Obra de arte",
+        "es": "una obra de arte",
         "ja": "アートワーク",
         "zh_Hant": "藝術品",
-        "nb_NO": "Kunstverk",
+        "nb_NO": "en kunstverk",
         "fi": "Taideteos",
         "gl": "Obra de arte",
         "hu": "Műalkotás",
         "id": "Karya Seni",
         "pl": "Dzieło sztuki",
-        "pt": "Obra de arte",
-        "pt_BR": "Obra de arte",
+        "pt": "uma obra de arte",
+        "pt_BR": "uma obra de arte",
         "sv": "Konstverk"
       }
     }
diff --git a/assets/layers/barrier/barrier.json b/assets/layers/barrier/barrier.json
index e0eecd93ab..d147e99780 100644
--- a/assets/layers/barrier/barrier.json
+++ b/assets/layers/barrier/barrier.json
@@ -61,12 +61,12 @@
     {
       "title": {
         "en": "Bollard",
-        "nl": "Paaltje",
-        "de": "Poller",
+        "nl": "een paaltje",
+        "de": "eine poller",
         "ru": "Прикол",
-        "fr": "Bollard",
+        "fr": "une bollard",
         "hu": "Terelőoszlop",
-        "es": "Bolardo"
+        "es": "una bolardo"
       },
       "tags": [
         "barrier=bollard"
@@ -89,10 +89,10 @@
     {
       "title": {
         "en": "Cycle barrier",
-        "nl": "Fietshekjes",
-        "de": "Fahrradhindernis",
+        "nl": "een fietshekjes",
+        "de": "eine fahrradhindernis",
         "hu": "Kerékpárakadály",
-        "fr": "Barrière cyclable"
+        "fr": "une barrière cyclable"
       },
       "tags": [
         "barrier=cycle_barrier"
diff --git a/assets/layers/bench/bench.json b/assets/layers/bench/bench.json
index 41e29267bb..2748c73d4d 100644
--- a/assets/layers/bench/bench.json
+++ b/assets/layers/bench/bench.json
@@ -606,20 +606,20 @@
       ],
       "title": {
         "en": "bench",
-        "de": "sitzbank",
-        "fr": "banc",
-        "nl": "zitbank",
-        "es": "banco",
-        "it": "panchina",
+        "de": "eine sitzbank",
+        "fr": "une banc",
+        "nl": "een zitbank",
+        "es": "una banco",
+        "it": "una panchina",
         "ru": "cкамейка",
         "id": "bangku",
         "zh_Hans": "长椅",
-        "nb_NO": "benk",
+        "nb_NO": "en benk",
         "zh_Hant": "長椅",
-        "pt_BR": "banco",
+        "pt_BR": "uma banco",
         "fi": "penkki",
         "pl": "Ławka",
-        "pt": "banco"
+        "pt": "uma banco"
       },
       "presiceInput": {
         "preferredBackground": "photo"
diff --git a/assets/layers/bicycle_library/bicycle_library.json b/assets/layers/bicycle_library/bicycle_library.json
index a4c78a05a1..e2c5d1e636 100644
--- a/assets/layers/bicycle_library/bicycle_library.json
+++ b/assets/layers/bicycle_library/bicycle_library.json
@@ -240,14 +240,14 @@
     {
       "title": {
         "en": "Fietsbibliotheek",
-        "nl": "Bicycle library",
+        "nl": "een bicycle library",
         "ru": "Велосипедная библиотека",
         "zh_Hant": "自行車圖書館 ( Fietsbibliotheek)",
-        "it": "Bici in prestito",
-        "fr": "Vélothèque",
-        "pt_BR": "Biblioteca de bicicletas",
-        "de": "Fahrradbibliothek",
-        "pt": "Biblioteca de bicicletas",
+        "it": "una bici in prestito",
+        "fr": "une vélothèque",
+        "pt_BR": "uma biblioteca de bicicletas",
+        "de": "eine fahrradbibliothek",
+        "pt": "uma biblioteca de bicicletas",
         "eo": "Fietsbibliotheek"
       },
       "tags": [
diff --git a/assets/layers/bicycle_rental/bicycle_rental.json b/assets/layers/bicycle_rental/bicycle_rental.json
index d163a0465a..f2b28a8d20 100644
--- a/assets/layers/bicycle_rental/bicycle_rental.json
+++ b/assets/layers/bicycle_rental/bicycle_rental.json
@@ -290,8 +290,8 @@
     {
       "title": {
         "en": "bicycle rental shop",
-        "nl": "fietsverhuurzaak",
-        "fr": "magasin de location de vélos"
+        "nl": "een fietsverhuurzaak",
+        "fr": "une magasin de location de vélos"
       },
       "tags": [
         "amenity=bicycle_rental",
@@ -306,7 +306,7 @@
     {
       "title": {
         "en": "bicycle rental",
-        "nl": "fietsverhuur"
+        "nl": "een fietsverhuur"
       },
       "tags": [
         "amenity=bicycle_rental"
diff --git a/assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json b/assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json
index 6558cc5d25..43ee693ebe 100644
--- a/assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json
+++ b/assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json
@@ -50,14 +50,14 @@
     {
       "title": {
         "en": "Bicycle tube vending machine",
-        "nl": "Fietsbanden-verkoopsautomaat",
-        "fr": "Distributeur automatique de chambre à air de vélo",
-        "it": "Distributore automatico di camere d’aria per bici",
-        "de": "Fahrradschlauch-Automat",
+        "nl": "een fietsbanden-verkoopsautomaat",
+        "fr": "une distributeur automatique de chambre à air de vélo",
+        "it": "una distributore automatico di camere d’aria per bici",
+        "de": "eine fahrradschlauch-automat",
         "ru": "Торговый автомат для велосипедистов",
         "zh_Hant": "自行車內胎自動售貨機",
-        "pt_BR": "Máquina de venda automática de tubos de bicicleta",
-        "pt": "Máquina de venda automática de tubos de bicicleta"
+        "pt_BR": "uma máquina de venda automática de tubos de bicicleta",
+        "pt": "uma máquina de venda automática de tubos de bicicleta"
       },
       "tags": [
         "amenity=vending_machine",
diff --git a/assets/layers/bike_cafe/bike_cafe.json b/assets/layers/bike_cafe/bike_cafe.json
index becb7d4071..d124bd6484 100644
--- a/assets/layers/bike_cafe/bike_cafe.json
+++ b/assets/layers/bike_cafe/bike_cafe.json
@@ -337,16 +337,16 @@
     {
       "title": {
         "en": "Bike cafe",
-        "nl": "Fietscafé",
-        "fr": "Café Vélo",
+        "nl": "een fietscafé",
+        "fr": "une café vélo",
         "gl": "Café de ciclistas",
-        "de": "Fahrrad-Café",
-        "it": "Caffè in bici",
+        "de": "eine fahrrad-café",
+        "it": "una caffè in bici",
         "zh_Hans": "自行车咖啡",
         "zh_Hant": "單車咖啡廳",
         "ru": "Велосипедное кафе",
-        "pt_BR": "Café de bicicleta",
-        "pt": "Café de bicicleta"
+        "pt_BR": "uma café de bicicleta",
+        "pt": "uma café de bicicleta"
       },
       "tags": [
         "amenity=pub",
diff --git a/assets/layers/bike_cleaning/bike_cleaning.json b/assets/layers/bike_cleaning/bike_cleaning.json
index ace20b610b..8637eff600 100644
--- a/assets/layers/bike_cleaning/bike_cleaning.json
+++ b/assets/layers/bike_cleaning/bike_cleaning.json
@@ -52,13 +52,13 @@
     {
       "title": {
         "en": "Bike cleaning service",
-        "nl": "Fietsschoonmaakpunt",
-        "fr": "Service de nettoyage de vélo",
-        "it": "Servizio lavaggio bici",
-        "de": "Fahrrad-Reinigungsdienst",
+        "nl": "een fietsschoonmaakpunt",
+        "fr": "une service de nettoyage de vélo",
+        "it": "una servizio lavaggio bici",
+        "de": "eine fahrrad-reinigungsdienst",
         "zh_Hant": "單車清理服務",
-        "pt_BR": "Serviço de limpeza de bicicletas",
-        "pt": "Serviço de limpeza de bicicletas"
+        "pt_BR": "uma serviço de limpeza de bicicletas",
+        "pt": "uma serviço de limpeza de bicicletas"
       },
       "tags": [
         "amenity=bicycle_wash"
diff --git a/assets/layers/bike_parking/bike_parking.json b/assets/layers/bike_parking/bike_parking.json
index 7e7f91c3ff..7b580090d5 100644
--- a/assets/layers/bike_parking/bike_parking.json
+++ b/assets/layers/bike_parking/bike_parking.json
@@ -26,17 +26,17 @@
     {
       "title": {
         "en": "Bike parking",
-        "nl": "Fietsparking",
-        "fr": "Parking à vélo",
+        "nl": "een fietsparking",
+        "fr": "une parking à vélo",
         "gl": "Aparcadoiro de bicicletas",
-        "de": "Fahrrad-Parkplätze",
+        "de": "eine fahrrad-parkplätze",
         "hu": "Kerékpártároló",
-        "it": "Parcheggio bici",
+        "it": "una parcheggio bici",
         "zh_Hant": "單車停車場",
         "ru": "Велопарковка",
         "pl": "Parking dla rowerów",
-        "pt_BR": "Estacionamento de bicicletas",
-        "pt": "Estacionamento de bicicletas"
+        "pt_BR": "uma estacionamento de bicicletas",
+        "pt": "uma estacionamento de bicicletas"
       },
       "tags": [
         "amenity=bicycle_parking"
diff --git a/assets/layers/bike_repair_station/bike_repair_station.json b/assets/layers/bike_repair_station/bike_repair_station.json
index 82512f157a..a9e266dd40 100644
--- a/assets/layers/bike_repair_station/bike_repair_station.json
+++ b/assets/layers/bike_repair_station/bike_repair_station.json
@@ -658,15 +658,15 @@
     {
       "title": {
         "en": "bike pump",
-        "nl": "fietspomp",
-        "fr": "pompe à vélo",
+        "nl": "een fietspomp",
+        "fr": "une pompe à vélo",
         "gl": "bomba de ar",
-        "de": "fahrradpumpe",
-        "it": "pompa per bici",
+        "de": "eine fahrradpumpe",
+        "it": "una pompa per bici",
         "ru": "bелосипедный насос",
         "fi": "pyöräpumppu",
         "pl": "pompka do roweru",
-        "pt_BR": "bomba de bicicleta"
+        "pt_BR": "uma bomba de bicicleta"
       },
       "tags": [
         "amenity=bicycle_repair_station",
@@ -692,11 +692,11 @@
     {
       "title": {
         "en": "bike repair station and pump",
-        "nl": "herstelpunt en pomp",
-        "fr": "point de réparation vélo avec pompe",
+        "nl": "een herstelpunt en pomp",
+        "fr": "une point de réparation vélo avec pompe",
         "gl": "estación de arranxo de bicicletas con bomba de ar",
-        "de": "fahrrad-Reparaturstation und Pumpe",
-        "it": "stazione di riparazione bici e pompa",
+        "de": "eine fahrrad-reparaturstation und pumpe",
+        "it": "una stazione di riparazione bici e pompa",
         "pl": "stacja naprawy rowerów i pompka"
       },
       "tags": [
@@ -719,11 +719,11 @@
     {
       "title": {
         "en": "bike repair station without pump",
-        "nl": "herstelpunt zonder pomp",
-        "fr": "point de réparation vélo sans pompe",
+        "nl": "een herstelpunt zonder pomp",
+        "fr": "une point de réparation vélo sans pompe",
         "gl": "estación de arranxo de bicicletas sin bomba de ar",
-        "de": "fahrrad-Reparaturstation ohne Pumpe",
-        "it": "stazione di riparazione bici senza pompa"
+        "de": "eine fahrrad-reparaturstation ohne pumpe",
+        "it": "una stazione di riparazione bici senza pompa"
       },
       "tags": [
         "amenity=bicycle_repair_station",
diff --git a/assets/layers/bike_shop/bike_shop.json b/assets/layers/bike_shop/bike_shop.json
index eda0288650..b77f8df949 100644
--- a/assets/layers/bike_shop/bike_shop.json
+++ b/assets/layers/bike_shop/bike_shop.json
@@ -671,11 +671,11 @@
     {
       "title": {
         "en": "Bike repair/shop",
-        "nl": "Fietszaak",
-        "fr": "Magasin et réparateur de vélo",
+        "nl": "een fietszaak",
+        "fr": "une magasin et réparateur de vélo",
         "gl": "Tenda/arranxo de bicicletas",
-        "de": "Fahrradwerkstatt/geschäft",
-        "it": "Negozio/riparatore di bici",
+        "de": "eine fahrradwerkstatt/geschäft",
+        "it": "una negozio/riparatore di bici",
         "ru": "Обслуживание велосипедов/магазин"
       },
       "tags": [
diff --git a/assets/layers/binocular/binocular.json b/assets/layers/binocular/binocular.json
index 60fd228c19..936587c0c6 100644
--- a/assets/layers/binocular/binocular.json
+++ b/assets/layers/binocular/binocular.json
@@ -82,8 +82,8 @@
       ],
       "title": {
         "en": "binoculars",
-        "nl": "verrekijker",
-        "de": "Ferngläser",
+        "nl": "een verrekijker",
+        "de": "eine ferngläser",
         "ru": "бинокль"
       },
       "description": {
diff --git a/assets/layers/birdhide/birdhide.json b/assets/layers/birdhide/birdhide.json
index 07bbc253c5..4f35f14338 100644
--- a/assets/layers/birdhide/birdhide.json
+++ b/assets/layers/birdhide/birdhide.json
@@ -234,7 +234,7 @@
       ],
       "title": {
         "en": "Birdhide",
-        "nl": "vogelkijkhut"
+        "nl": "een vogelkijkhut"
       },
       "description": {
         "en": "A covered shelter where one can watch birds comfortably",
@@ -249,7 +249,7 @@
       ],
       "title": {
         "en": "Bird blind",
-        "nl": "vogelkijkwand"
+        "nl": "een vogelkijkwand"
       },
       "description": {
         "en": "A screen or wall with openings to watch birds",
diff --git a/assets/layers/cafe_pub/cafe_pub.json b/assets/layers/cafe_pub/cafe_pub.json
index 0b2164603a..c18a758350 100644
--- a/assets/layers/cafe_pub/cafe_pub.json
+++ b/assets/layers/cafe_pub/cafe_pub.json
@@ -25,8 +25,8 @@
       ],
       "title": {
         "en": "pub",
-        "nl": "bruin cafe of kroeg",
-        "de": "Kneipe",
+        "nl": "een bruin cafe of kroeg",
+        "de": "eine kneipe",
         "ru": "паб",
         "hu": "kocsma"
       },
@@ -44,8 +44,8 @@
       ],
       "title": {
         "en": "bar",
-        "nl": "bar",
-        "de": "Bar",
+        "nl": "een bar",
+        "de": "eine bar",
         "ru": "бар",
         "hu": "bár"
       },
@@ -63,8 +63,8 @@
       ],
       "title": {
         "en": "cafe",
-        "nl": "cafe",
-        "de": "Café",
+        "nl": "een cafe",
+        "de": "eine café",
         "ru": "кафе",
         "hu": "kávézó"
       },
diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json
index 9bde3a320a..859ee8954c 100644
--- a/assets/layers/charging_station/charging_station.json
+++ b/assets/layers/charging_station/charging_station.json
@@ -4001,7 +4001,7 @@
       ],
       "title": {
         "en": "charging station for electrical bikes 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)",
-        "nl": "oplaadpunt voor elektrische fietsen"
+        "nl": "een oplaadpunt voor elektrische fietsen"
       },
       "preciseInput": {
         "preferredBackground": "map"
@@ -4015,8 +4015,8 @@
       ],
       "title": {
         "en": "charging station for cars",
-        "nl": "oplaadstation voor elektrische auto's",
-        "de": "Ladestation für e-bikes"
+        "nl": "een oplaadstation voor elektrische auto's",
+        "de": "eine ladestation für e-bikes"
       },
       "preciseInput": {
         "preferredBackground": "map"
diff --git a/assets/layers/crossings/crossings.json b/assets/layers/crossings/crossings.json
index dd6a4f7b5c..8d9a9a7f6f 100644
--- a/assets/layers/crossings/crossings.json
+++ b/assets/layers/crossings/crossings.json
@@ -54,9 +54,9 @@
     {
       "title": {
         "en": "Crossing",
-        "nl": "Oversteekplaats",
-        "de": "Kreuzung",
-        "fr": "Traversée"
+        "nl": "een oversteekplaats",
+        "de": "eine kreuzung",
+        "fr": "une traversée"
       },
       "tags": [
         "highway=crossing"
@@ -78,10 +78,10 @@
     {
       "title": {
         "en": "Traffic signal",
-        "nl": "Verkeerslicht",
+        "nl": "een verkeerslicht",
         "ru": "Светофор",
-        "de": "Ampel",
-        "fr": "Feu de signalisation"
+        "de": "eine ampel",
+        "fr": "une feu de signalisation"
       },
       "tags": [
         "highway=traffic_signals"
diff --git a/assets/layers/defibrillator/defibrillator.json b/assets/layers/defibrillator/defibrillator.json
index 6b4ca0127d..49127b4a38 100644
--- a/assets/layers/defibrillator/defibrillator.json
+++ b/assets/layers/defibrillator/defibrillator.json
@@ -37,11 +37,11 @@
       "title": {
         "en": "Defibrillator",
         "ca": "Desfibril·lador",
-        "es": "Desfibrilador",
-        "fr": "Défibrillateur",
-        "nl": "Defibrillator",
-        "de": "Defibrillator",
-        "it": "Defibrillatore",
+        "es": "una desfibrilador",
+        "fr": "une défibrillateur",
+        "nl": "een defibrillator",
+        "de": "eine defibrillator",
+        "it": "una defibrillatore",
         "ru": "Дефибриллятор",
         "sl": "Defibrilator"
       },
@@ -52,7 +52,7 @@
     {
       "title": {
         "en": "defibrillator mounted on a wall",
-        "nl": "defibrillator die aan een muur hangt",
+        "nl": "een defibrillator die aan een muur hangt",
         "sl": "defibrilator je pritrjen na steno"
       },
       "tags": [
diff --git a/assets/layers/drinking_water/drinking_water.json b/assets/layers/drinking_water/drinking_water.json
index 22c659bcfe..c72c72d392 100644
--- a/assets/layers/drinking_water/drinking_water.json
+++ b/assets/layers/drinking_water/drinking_water.json
@@ -43,11 +43,11 @@
     {
       "title": {
         "en": "drinking water",
-        "nl": "drinkbaar water",
-        "fr": "eau potable",
+        "nl": "een drinkbaar water",
+        "fr": "une eau potable",
         "gl": "auga potábel",
-        "de": "trinkwasser",
-        "it": "acqua potabile",
+        "de": "eine trinkwasser",
+        "it": "una acqua potabile",
         "ru": "питьевая вода",
         "id": "air minum",
         "hu": "ivóvíz"
diff --git a/assets/layers/entrance/entrance.json b/assets/layers/entrance/entrance.json
index 57782545f6..65a717e3bf 100644
--- a/assets/layers/entrance/entrance.json
+++ b/assets/layers/entrance/entrance.json
@@ -296,7 +296,9 @@
   ],
   "presets": [
     {
-      "title": "entrance",
+      "title": {
+        "*": "entrance"
+      },
       "preciseInput": {
         "preferredBackground": "photo",
         "snapToLayer": [
diff --git a/assets/layers/extinguisher/extinguisher.json b/assets/layers/extinguisher/extinguisher.json
index 78fca98483..e03245705f 100644
--- a/assets/layers/extinguisher/extinguisher.json
+++ b/assets/layers/extinguisher/extinguisher.json
@@ -108,12 +108,12 @@
       "title": {
         "en": "Fire extinguisher",
         "ja": "消火器",
-        "nb_NO": "Brannslukker",
+        "nb_NO": "en brannslukker",
         "ru": "Огнетушитель",
-        "fr": "Extincteur",
-        "de": "Feuerlöscher",
-        "it": "Estintore",
-        "nl": "Brandblusser"
+        "fr": "une extincteur",
+        "de": "eine feuerlöscher",
+        "it": "una estintore",
+        "nl": "een brandblusser"
       },
       "description": {
         "en": "A fire extinguisher is a small, portable device used to stop a fire",
diff --git a/assets/layers/fire_station/fire_station.json b/assets/layers/fire_station/fire_station.json
index 66c850e314..66a224ca80 100644
--- a/assets/layers/fire_station/fire_station.json
+++ b/assets/layers/fire_station/fire_station.json
@@ -218,10 +218,10 @@
         "en": "Fire station",
         "ja": "消防署",
         "ru": "Пожарная часть",
-        "fr": "Caserne de pompiers",
-        "de": "Feuerwache",
-        "it": "Caserma dei vigili del fuoco",
-        "nb_NO": "Brannstasjon"
+        "fr": "une caserne de pompiers",
+        "de": "eine feuerwache",
+        "it": "una caserma dei vigili del fuoco",
+        "nb_NO": "en brannstasjon"
       },
       "description": {
         "en": "A fire station is a place where the fire trucks and firefighters are located when not in operation.",
diff --git a/assets/layers/food/food.json b/assets/layers/food/food.json
index 4195e31c26..fad134f750 100644
--- a/assets/layers/food/food.json
+++ b/assets/layers/food/food.json
@@ -18,9 +18,9 @@
     {
       "title": {
         "en": "restaurant",
-        "nl": "restaurant",
+        "nl": "een restaurant",
         "ru": "ресторан",
-        "de": "Restaurant"
+        "de": "eine restaurant"
       },
       "tags": [
         "amenity=restaurant"
@@ -37,9 +37,9 @@
     {
       "title": {
         "en": "fastfood",
-        "nl": "fastfood-zaak",
+        "nl": "een fastfood-zaak",
         "ru": "быстрое питание",
-        "de": "Schnellimbiss"
+        "de": "eine schnellimbiss"
       },
       "tags": [
         "amenity=fast_food"
@@ -56,8 +56,8 @@
     {
       "title": {
         "en": "fries shop",
-        "nl": "frituur",
-        "de": "Pommesbude"
+        "nl": "een frituur",
+        "de": "eine pommesbude"
       },
       "tags": [
         "amenity=fast_food",
diff --git a/assets/layers/ghost_bike/ghost_bike.json b/assets/layers/ghost_bike/ghost_bike.json
index 98697e3e92..263c1a4c5f 100644
--- a/assets/layers/ghost_bike/ghost_bike.json
+++ b/assets/layers/ghost_bike/ghost_bike.json
@@ -62,20 +62,20 @@
     {
       "title": {
         "en": "Ghost bike",
-        "nl": "Witte fiets",
-        "de": "Geisterrad",
-        "it": "Bici fantasma",
-        "fr": "Vélo fantôme",
+        "nl": "een witte fiets",
+        "de": "eine geisterrad",
+        "it": "una bici fantasma",
+        "fr": "une vélo fantôme",
         "eo": "Fantombiciklo",
-        "es": "Bicicleta blanca",
+        "es": "una bicicleta blanca",
         "fi": "Haamupyörä",
         "gl": "Bicicleta pantasma",
         "hu": "Emlékkerékpár",
         "ja": "ゴーストバイク",
-        "nb_NO": "Spøkelsessykler",
+        "nb_NO": "en spøkelsessykler",
         "pl": "Duch roweru",
-        "pt": "Bicicleta fantasma",
-        "pt_BR": "Bicicleta fantasma",
+        "pt": "uma bicicleta fantasma",
+        "pt_BR": "uma bicicleta fantasma",
         "ru": "Велосипед ghost",
         "sv": "Spökcykel",
         "zh_Hant": "幽靈單車"
diff --git a/assets/layers/hydrant/hydrant.json b/assets/layers/hydrant/hydrant.json
index b5b6c83054..0a50cbf189 100644
--- a/assets/layers/hydrant/hydrant.json
+++ b/assets/layers/hydrant/hydrant.json
@@ -297,10 +297,10 @@
         "en": "Fire hydrant",
         "ru": "Пожарный гидрант",
         "ja": "消火栓",
-        "nb_NO": "Brannhydrant",
-        "fr": "Borne incendie",
-        "de": "Löschwasser-Hydrant",
-        "it": "Idrante antincendio"
+        "nb_NO": "en brannhydrant",
+        "fr": "une borne incendie",
+        "de": "eine löschwasser-hydrant",
+        "it": "una idrante antincendio"
       },
       "description": {
         "en": "A hydrant is a connection point where firefighters can tap water. It might be located underground.",
diff --git a/assets/layers/information_board/information_board.json b/assets/layers/information_board/information_board.json
index d82fe3d94e..8c4ec46b26 100644
--- a/assets/layers/information_board/information_board.json
+++ b/assets/layers/information_board/information_board.json
@@ -36,11 +36,11 @@
         "information=board"
       ],
       "title": {
-        "nl": "informatiebord",
+        "nl": "een informatiebord",
         "en": "information board",
-        "it": "pannello informativo",
-        "fr": "panneau d'informations",
-        "de": "informationstafel",
+        "it": "una pannello informativo",
+        "fr": "une panneau d'informations",
+        "de": "eine informationstafel",
         "ru": "информационный щит"
       }
     }
diff --git a/assets/layers/map/map.json b/assets/layers/map/map.json
index 464ed658fa..310e161c22 100644
--- a/assets/layers/map/map.json
+++ b/assets/layers/map/map.json
@@ -173,11 +173,11 @@
       ],
       "title": {
         "en": "Map",
-        "nl": "Kaart",
-        "it": "Mappa",
+        "nl": "een kaart",
+        "it": "una mappa",
         "ru": "Карта",
-        "fr": "Carte",
-        "de": "Karte"
+        "fr": "une carte",
+        "de": "eine karte"
       },
       "description": {
         "en": "Add a missing map",
diff --git a/assets/layers/nature_reserve/nature_reserve.json b/assets/layers/nature_reserve/nature_reserve.json
index f264a56939..3622571492 100644
--- a/assets/layers/nature_reserve/nature_reserve.json
+++ b/assets/layers/nature_reserve/nature_reserve.json
@@ -381,7 +381,7 @@
       ],
       "title": {
         "en": "nature reserve",
-        "nl": "natuurreservaat"
+        "nl": "een natuurreservaat"
       },
       "description": {
         "en": "Add a missing nature reserve",
diff --git a/assets/layers/parking/parking.json b/assets/layers/parking/parking.json
index 1d3a5bf919..7ffa142a0f 100644
--- a/assets/layers/parking/parking.json
+++ b/assets/layers/parking/parking.json
@@ -27,7 +27,7 @@
         "amenity=parking"
       ],
       "title": {
-        "nl": "parking voor auto's",
+        "nl": "een parking voor auto's",
         "en": "car parking"
       }
     }
diff --git a/assets/layers/picnic_table/picnic_table.json b/assets/layers/picnic_table/picnic_table.json
index 03082ea333..88c805a052 100644
--- a/assets/layers/picnic_table/picnic_table.json
+++ b/assets/layers/picnic_table/picnic_table.json
@@ -86,11 +86,11 @@
       ],
       "title": {
         "en": "picnic table",
-        "nl": "picnic-tafel",
-        "it": "tavolo da picnic",
+        "nl": "een picnic-tafel",
+        "it": "una tavolo da picnic",
         "ru": "стол для пикника",
-        "de": "picknicktisch",
-        "fr": "table de pique-nique"
+        "de": "eine picknicktisch",
+        "fr": "une table de pique-nique"
       }
     }
   ],
diff --git a/assets/layers/play_forest/play_forest.json b/assets/layers/play_forest/play_forest.json
index 227311cadc..eb5014b600 100644
--- a/assets/layers/play_forest/play_forest.json
+++ b/assets/layers/play_forest/play_forest.json
@@ -95,7 +95,9 @@
   "hideFromOverview": false,
   "presets": [
     {
-      "title": "Speelbos",
+      "title": {
+        "*": "Speelbos"
+      },
       "tags": [
         "leisure=playground",
         "playground=forest",
diff --git a/assets/layers/playground/playground.json b/assets/layers/playground/playground.json
index b8eff0c6e7..b457ffee77 100644
--- a/assets/layers/playground/playground.json
+++ b/assets/layers/playground/playground.json
@@ -492,12 +492,12 @@
         "leisure=playground"
       ],
       "title": {
-        "nl": "speeltuin",
+        "nl": "een speeltuin",
         "en": "playground",
         "ru": "Детская площадка",
-        "fr": "terrain de jeux",
-        "it": "campetto",
-        "de": "spielplatz"
+        "fr": "une terrain de jeux",
+        "it": "una campetto",
+        "de": "eine spielplatz"
       }
     }
   ],
diff --git a/assets/layers/public_bookcase/public_bookcase.json b/assets/layers/public_bookcase/public_bookcase.json
index 8d267bdbd1..e48135a86b 100644
--- a/assets/layers/public_bookcase/public_bookcase.json
+++ b/assets/layers/public_bookcase/public_bookcase.json
@@ -51,11 +51,11 @@
     {
       "title": {
         "en": "Bookcase",
-        "nl": "Boekenruilkast",
-        "de": "Bücherschrank",
-        "fr": "Microbibliothèque",
+        "nl": "een boekenruilkast",
+        "de": "eine bücherschrank",
+        "fr": "une microbibliothèque",
         "ru": "Книжный шкаф",
-        "it": "Microbiblioteca",
+        "it": "una microbiblioteca",
         "hu": "Könyvespolc"
       },
       "tags": [
diff --git a/assets/layers/recycling/recycling.json b/assets/layers/recycling/recycling.json
index bab282396b..ec34478d54 100644
--- a/assets/layers/recycling/recycling.json
+++ b/assets/layers/recycling/recycling.json
@@ -408,7 +408,7 @@
     {
       "title": {
         "en": "recycling container",
-        "nl": "recycling container"
+        "nl": "een recycling container"
       },
       "tags": [
         "amenity=recycling",
@@ -418,7 +418,7 @@
     {
       "title": {
         "en": "recycling centre",
-        "nl": "recycling centre"
+        "nl": "een recycling centre"
       },
       "tags": [
         "amenity=recycling",
diff --git a/assets/layers/shops/shops.json b/assets/layers/shops/shops.json
index 5899cf8951..edbd599a8a 100644
--- a/assets/layers/shops/shops.json
+++ b/assets/layers/shops/shops.json
@@ -332,11 +332,11 @@
       ],
       "title": {
         "en": "Shop",
-        "fr": "Magasin",
+        "fr": "une magasin",
         "ru": "Магазин",
         "ja": "店",
-        "nl": "Winkel",
-        "de": "Geschäft",
+        "nl": "een winkel",
+        "de": "eine geschäft",
         "eo": "Butiko"
       },
       "description": {
diff --git a/assets/layers/sport_pitch/sport_pitch.json b/assets/layers/sport_pitch/sport_pitch.json
index c3d7f38e1c..e9adc044d0 100644
--- a/assets/layers/sport_pitch/sport_pitch.json
+++ b/assets/layers/sport_pitch/sport_pitch.json
@@ -425,12 +425,12 @@
   "presets": [
     {
       "title": {
-        "nl": "Ping-pong tafel",
-        "fr": "Table de ping-pong",
+        "nl": "een ping-pong tafel",
+        "fr": "une table de ping-pong",
         "en": "Tabletennis table",
-        "it": "Tavolo da tennistavolo",
+        "it": "una tavolo da tennistavolo",
         "ru": "Стол для настольного тенниса",
-        "de": "Tischtennisplatte"
+        "de": "eine tischtennisplatte"
       },
       "tags": [
         "leisure=pitch",
@@ -439,12 +439,12 @@
     },
     {
       "title": {
-        "nl": "Sportterrein",
-        "fr": "Terrain de sport",
+        "nl": "een sportterrein",
+        "fr": "une terrain de sport",
         "en": "Sport pitch",
         "ru": "Спортивная площадка",
-        "it": "Campo sportivo",
-        "de": "Sportplatz"
+        "it": "una campo sportivo",
+        "de": "eine sportplatz"
       },
       "tags": [
         "leisure=pitch",
diff --git a/assets/layers/street_lamps/street_lamps.json b/assets/layers/street_lamps/street_lamps.json
index 401b72f92f..838ad184fa 100644
--- a/assets/layers/street_lamps/street_lamps.json
+++ b/assets/layers/street_lamps/street_lamps.json
@@ -43,7 +43,7 @@
     {
       "title": {
         "en": "street lamp",
-        "nl": "straatlantaarn"
+        "nl": "een straatlantaarn"
       },
       "tags": [
         "highway=street_lamp"
diff --git a/assets/layers/toilet/toilet.json b/assets/layers/toilet/toilet.json
index e74afb0896..fbf145f566 100644
--- a/assets/layers/toilet/toilet.json
+++ b/assets/layers/toilet/toilet.json
@@ -26,11 +26,11 @@
     {
       "title": {
         "en": "public toilet",
-        "de": "öffentlich zugängliche Toilette",
-        "fr": "toilette publique",
-        "nl": "publiek toilet",
+        "de": "eine öffentlich zugängliche toilette",
+        "fr": "une toilette publique",
+        "nl": "een publiek toilet",
         "ru": "общественный туалет ",
-        "it": "servizi igienici aperti al pubblico"
+        "it": "una servizi igienici aperti al pubblico"
       },
       "tags": [
         "amenity=toilets"
@@ -39,10 +39,10 @@
     {
       "title": {
         "en": "toilets with wheelchair accessible toilet",
-        "de": "toiletten mit rollstuhlgerechter Toilette",
-        "fr": "toilettes accessible aux personnes à mobilité réduite",
-        "nl": "rolstoeltoegankelijke, publiek toilet",
-        "it": "servizi igienici accessibili per persone in sedia a rotelle",
+        "de": "eine toiletten mit rollstuhlgerechter toilette",
+        "fr": "une toilettes accessible aux personnes à mobilité réduite",
+        "nl": "een rolstoeltoegankelijke, publiek toilet",
+        "it": "una servizi igienici accessibili per persone in sedia a rotelle",
         "ru": "tуалет с доступом для пользователей кресел-колясок"
       },
       "tags": [
diff --git a/assets/layers/tree_node/tree_node.json b/assets/layers/tree_node/tree_node.json
index ae1696f06f..2725bb9133 100644
--- a/assets/layers/tree_node/tree_node.json
+++ b/assets/layers/tree_node/tree_node.json
@@ -520,12 +520,12 @@
         "leaf_type=broadleaved"
       ],
       "title": {
-        "nl": "Loofboom",
+        "nl": "een loofboom",
         "en": "Broadleaved tree",
-        "it": "Albero latifoglia",
-        "fr": "Arbre feuillu",
+        "it": "una albero latifoglia",
+        "fr": "une arbre feuillu",
         "ru": "Лиственное дерево",
-        "de": "Laubbaum"
+        "de": "eine laubbaum"
       },
       "description": {
         "nl": "Een boom van een soort die blaadjes heeft, bijvoorbeeld eik of populier.",
@@ -544,12 +544,12 @@
         "leaf_type=needleleaved"
       ],
       "title": {
-        "nl": "Naaldboom",
+        "nl": "een naaldboom",
         "en": "Needleleaved tree",
-        "it": "Albero aghifoglia",
+        "it": "una albero aghifoglia",
         "ru": "Хвойное дерево",
-        "fr": "Arbre résineux",
-        "de": "Nadelbaum"
+        "fr": "une arbre résineux",
+        "de": "eine nadelbaum"
       },
       "description": {
         "nl": "Een boom van een soort met naalden, bijvoorbeeld den of spar.",
@@ -568,13 +568,13 @@
         "natural=tree"
       ],
       "title": {
-        "nl": "Boom",
+        "nl": "een boom",
         "en": "Tree",
-        "it": "Albero",
+        "it": "una albero",
         "ru": "Дерево",
-        "fr": "Arbre",
+        "fr": "une arbre",
         "id": "Pohon",
-        "de": "Baum"
+        "de": "eine baum"
       },
       "description": {
         "nl": "Wanneer je niet zeker bent of het nu een loof- of naaldboom is.",
diff --git a/assets/layers/viewpoint/viewpoint.json b/assets/layers/viewpoint/viewpoint.json
index b3f077b748..2f314af156 100644
--- a/assets/layers/viewpoint/viewpoint.json
+++ b/assets/layers/viewpoint/viewpoint.json
@@ -26,11 +26,11 @@
     {
       "title": {
         "en": "Viewpoint",
-        "nl": "Uitzicht",
-        "de": "Aussichtspunkt",
-        "fr": "Point de vue",
+        "nl": "een uitzicht",
+        "de": "eine aussichtspunkt",
+        "fr": "une point de vue",
         "ru": "Смотровая площадка",
-        "it": "Punto panoramico",
+        "it": "una punto panoramico",
         "id": "Sudut pandang"
       },
       "tags": [
diff --git a/assets/layers/waste_basket/waste_basket.json b/assets/layers/waste_basket/waste_basket.json
index d78595b87e..554a654810 100644
--- a/assets/layers/waste_basket/waste_basket.json
+++ b/assets/layers/waste_basket/waste_basket.json
@@ -157,9 +157,9 @@
       ],
       "title": {
         "en": "Waste Basket",
-        "nl": "Vuilnisbak",
+        "nl": "een vuilnisbak",
         "ru": "Контейнер для мусора",
-        "de": "Abfalleimer",
+        "de": "eine abfalleimer",
         "eo": "Rubujo"
       },
       "presiceInput": {
diff --git a/assets/themes/buurtnatuur/buurtnatuur.json b/assets/themes/buurtnatuur/buurtnatuur.json
index d6d16daca0..b9c9bba168 100644
--- a/assets/themes/buurtnatuur/buurtnatuur.json
+++ b/assets/themes/buurtnatuur/buurtnatuur.json
@@ -78,7 +78,7 @@
             "fixme=Toegevoegd met MapComplete, geometry nog uit te tekenen"
           ],
           "title": {
-            "nl": "Natuurreservaat"
+            "nl": "een natuurreservaat"
           },
           "description": {
             "nl": "Voeg een ontbrekend, erkend natuurreservaat toe, bv. een gebied dat beheerd wordt door het ANB of natuurpunt"
@@ -198,7 +198,7 @@
             "fixme=Toegevoegd met MapComplete, geometry nog uit te tekenen"
           ],
           "title": {
-            "nl": "Park"
+            "nl": "een park"
           },
           "description": {
             "nl": "Voeg een ontbrekend park toe"
@@ -306,7 +306,7 @@
             "fixme=Toegevoegd met MapComplete, geometry nog uit te tekenen"
           ],
           "title": {
-            "nl": "Bos"
+            "nl": "een bos"
           },
           "description": {
             "nl": "Voeg een ontbrekend bos toe aan de kaart"
diff --git a/assets/themes/campersite/campersite.json b/assets/themes/campersite/campersite.json
index e7c6fc25c5..ffe8d336a5 100644
--- a/assets/themes/campersite/campersite.json
+++ b/assets/themes/campersite/campersite.json
@@ -652,11 +652,11 @@
             "ru": "площадка для кемпинга",
             "ja": "キャンプサイト",
             "zh_Hant": "露營地",
-            "it": "luogo di campeggio",
-            "fr": "Aire de camping",
-            "pt_BR": "local de acampamento",
-            "de": "Wohnmobilstellplatz",
-            "nl": "camperplaats",
+            "it": "una luogo di campeggio",
+            "fr": "une aire de camping",
+            "pt_BR": "uma local de acampamento",
+            "de": "eine wohnmobilstellplatz",
+            "nl": "een camperplaats",
             "hu": "lakóautós megállóhely"
           },
           "description": {
@@ -1105,9 +1105,9 @@
           "title": {
             "en": "sanitary dump station",
             "ja": "衛生ゴミ捨て場",
-            "it": "luogo di sversamento delle acque reflue",
-            "fr": "Site de vidange",
-            "de": "Sanitäre Entsorgungsstation",
+            "it": "una luogo di sversamento delle acque reflue",
+            "fr": "une site de vidange",
+            "de": "eine sanitäre entsorgungsstation",
             "zh_Hant": "垃圾丟棄站"
           },
           "description": {
diff --git a/assets/themes/climbing/climbing.json b/assets/themes/climbing/climbing.json
index 550131a869..5e4d20a513 100644
--- a/assets/themes/climbing/climbing.json
+++ b/assets/themes/climbing/climbing.json
@@ -159,14 +159,14 @@
             "sport=climbing"
           ],
           "title": {
-            "de": "Kletterverein",
+            "de": "eine kletterverein",
             "en": "Climbing club",
-            "nl": "Klimclub",
+            "nl": "een klimclub",
             "ja": "クライミングクラブ",
-            "nb_NO": "Klatreklubb",
+            "nb_NO": "en klatreklubb",
             "ru": "Клуб скалолазания",
-            "fr": "Club d’escalade",
-            "it": "Club di arrampicata",
+            "fr": "une club d’escalade",
+            "it": "una club di arrampicata",
             "hu": "Mászóegyesület"
           },
           "description": {
@@ -187,12 +187,12 @@
             "sport=climbing"
           ],
           "title": {
-            "de": "Eine Kletter-Organisation",
+            "de": "eine eine kletter-organisation",
             "en": "Climbing NGO",
-            "nl": "Een klimorganisatie",
+            "nl": "een een klimorganisatie",
             "ja": "クライミングNGO",
-            "fr": "Association d’escalade",
-            "it": "Associazione di arrampicata",
+            "fr": "une association d’escalade",
+            "it": "una associazione di arrampicata",
             "hu": "Mászószervezet"
           },
           "description": {
@@ -562,10 +562,10 @@
         {
           "title": {
             "en": "Climbing route",
-            "nl": "Klimroute",
-            "fr": "Voie d’escalade",
-            "de": "Kletterroute",
-            "it": "Via di arrampicata"
+            "nl": "een klimroute",
+            "fr": "une voie d’escalade",
+            "de": "eine kletterroute",
+            "it": "una via di arrampicata"
           },
           "tags": [
             "sport=climbing",
@@ -856,12 +856,12 @@
           ],
           "title": {
             "en": "Climbing opportunity",
-            "nl": "Klimgelegenheid",
-            "de": "Klettermöglichkeit",
+            "nl": "een klimgelegenheid",
+            "de": "eine klettermöglichkeit",
             "ja": "登坂教室",
-            "nb_NO": "Klatremulighet",
-            "fr": "Opportunité d’escalade",
-            "it": "Opportunità di arrampicata"
+            "nb_NO": "en klatremulighet",
+            "fr": "une opportunité d’escalade",
+            "it": "una opportunità di arrampicata"
           },
           "description": {
             "nl": "Een klimgelegenheid",
diff --git a/assets/themes/facadegardens/facadegardens.json b/assets/themes/facadegardens/facadegardens.json
index 923346ff35..2dd67fd06d 100644
--- a/assets/themes/facadegardens/facadegardens.json
+++ b/assets/themes/facadegardens/facadegardens.json
@@ -394,12 +394,12 @@
             "garden:type=facade_garden"
           ],
           "title": {
-            "nl": "geveltuintje",
+            "nl": "een geveltuintje",
             "en": "facade garden",
             "ja": "ファサード庭園",
-            "it": "giardino verticale",
-            "fr": "jardin mural",
-            "de": "Fassadengarten",
+            "it": "una giardino verticale",
+            "fr": "une jardin mural",
+            "de": "eine fassadengarten",
             "hu": "homlokzatkert"
           },
           "description": {
diff --git a/assets/themes/fruit_trees/fruit_trees.json b/assets/themes/fruit_trees/fruit_trees.json
index 7fe8c93236..617fb84901 100644
--- a/assets/themes/fruit_trees/fruit_trees.json
+++ b/assets/themes/fruit_trees/fruit_trees.json
@@ -46,7 +46,7 @@
             "fixme=Added with mapcomplete - geometry still to draw"
           ],
           "title": {
-            "nl": "Boomgaard"
+            "nl": "een boomgaard"
           },
           "description": {
             "nl": "Voeg een boomgaard toe (als punt - omtrek nog te tekenen)"
@@ -157,7 +157,7 @@
             "natural=tree"
           ],
           "title": {
-            "nl": "Boom"
+            "nl": "een boom"
           },
           "description": {
             "nl": "Voeg hier een boom toe"
diff --git a/assets/themes/hackerspaces/hackerspaces.json b/assets/themes/hackerspaces/hackerspaces.json
index c5728cb7ec..e708f12f9c 100644
--- a/assets/themes/hackerspaces/hackerspaces.json
+++ b/assets/themes/hackerspaces/hackerspaces.json
@@ -214,7 +214,7 @@
           ],
           "title": {
             "en": "Hackerspace",
-            "de": "Hackerspace",
+            "de": "eine hackerspace",
             "ru": "Хакерспейс",
             "zh_Hant": "駭客空間",
             "hu": "Hackerspace"
@@ -233,7 +233,7 @@
           ],
           "title": {
             "en": "Makerspace",
-            "de": "Makerspace",
+            "de": "eine makerspace",
             "zh_Hant": "創客空間",
             "hu": "Makerspace"
           },
diff --git a/assets/themes/openwindpowermap/openwindpowermap.json b/assets/themes/openwindpowermap/openwindpowermap.json
index 7c1d079784..aecf8205c8 100644
--- a/assets/themes/openwindpowermap/openwindpowermap.json
+++ b/assets/themes/openwindpowermap/openwindpowermap.json
@@ -189,10 +189,10 @@
           ],
           "title": {
             "en": "wind turbine",
-            "nl": "windturbine",
-            "fr": "Éolienne",
-            "de": "Windrad",
-            "it": "pala eolica",
+            "nl": "een windturbine",
+            "fr": "une éolienne",
+            "de": "eine windrad",
+            "it": "una pala eolica",
             "zh_Hant": "風機",
             "hu": "Szélerőmű"
           }
diff --git a/assets/themes/postboxes/postboxes.json b/assets/themes/postboxes/postboxes.json
index 4cb850b8cb..a2f81f36a8 100644
--- a/assets/themes/postboxes/postboxes.json
+++ b/assets/themes/postboxes/postboxes.json
@@ -79,7 +79,7 @@
           ],
           "title": {
             "en": "postbox",
-            "de": "Briefkasten",
+            "de": "eine briefkasten",
             "ru": "почтовый ящик",
             "zh_Hant": "郵筒",
             "id": "kotak pos",
@@ -195,7 +195,7 @@
           ],
           "title": {
             "en": "Post Office",
-            "de": "Poststelle",
+            "de": "eine poststelle",
             "ru": "Почтовое отделение",
             "zh_Hant": "郵局",
             "id": "Kantor Pos",
diff --git a/langs/de.json b/langs/de.json
index d6dc6f7a36..d90c785ce5 100644
--- a/langs/de.json
+++ b/langs/de.json
@@ -41,7 +41,7 @@
         "about": "OpenStreetMap für ein bestimmtes Thema einfach bearbeiten und hinzufügen",
         "aboutMapcomplete": "<h3>Über MapComplete</h3><p>Nutzen Sie es, um OpenStreetMap-Informationen zu einem <b>einzigen Thema</b> hinzuzufügen. Beantworten Sie Fragen, und innerhalb weniger Minuten sind Ihre Beiträge überall verfügbar. Der <b>Theme-Maintainer</b> definiert Elemente, Fragen und Sprachen dafür.</p><h3>Mehr erfahren</h3><p>MapComplete bietet immer <b>den nächsten Schritt</b>, um mehr über OpenStreetMap zu erfahren.</p><ul><li>Wenn es in eine Website eingebettet wird, verlinkt der iframe zu einer Vollbildversion von MapComplete</li><li>Die Vollbildversion bietet Infos über OpenStreetMap</li><li>Das Betrachten funktioniert ohne Anmeldung, aber das Bearbeiten erfordert ein OSM-Konto.</li><li>Wenn Sie nicht angemeldet sind, werden Sie dazu aufgefordert</li><li>Sobald Sie eine Frage beantwortet haben, können Sie der Karte neue Punkte hinzufügen</li><li>Nach einer Weile werden aktuelle OSM-Tags angezeigt, die später mit dem Wiki verlinkt werden</li></ul><p></p><br><p>Haben Sie <b>ein Problem</b> bemerkt? Haben Sie einen <b>Funktionswunsch</b>? Möchten Sie <b>bei der Übersetzung helfen</b>? Besuchen Sie den <a href=\"https://github.com/pietervdvn/MapComplete\" target=\"_blank\">Quellcode</a> oder den <a href=\"https://github.com/pietervdvn/MapComplete/issues\" target=\"_blank\">Issue Tracker</a> </p><p>Möchten Sie <b>Ihren Fortschritt</b> sehen? Verfolgen Sie die Anzahl der Änderungen auf <a href=\"{osmcha_link}\" target=\"_blank\">OsmCha</a>.</p>",
         "add": {
-            "addNew": "Füge eine neue {category} hinzu",
+            "addNew": "Füge {category} hinzu",
             "addNewMapLabel": "Hier klicken, um ein neues Element hinzuzufügen",
             "confirmButton": "Fügen Sie eine {category} hinzu.<br><div class=\"alert\">Ihre Ergänzung ist für alle sichtbar</div>",
             "confirmIntro": "<h3>Füge einen {title} hinzu?</h3>Der Punkt, den Sie hier anlegen, wird <b>für alle sichtbar sein</b>. Bitte fügen Sie der Karte nur dann Dinge hinzu, wenn sie wirklich existieren. Viele Anwendungen verwenden diese Daten.",
diff --git a/langs/es.json b/langs/es.json
index 183d980766..df9849a01e 100644
--- a/langs/es.json
+++ b/langs/es.json
@@ -26,7 +26,7 @@
     "general": {
         "about": "Edita fácilmente y añade puntos en OpenStreetMap de un tema concreto",
         "add": {
-            "addNew": "Añadir una nueva {category}",
+            "addNew": "Añadir {category}",
             "addNewMapLabel": "Haga clic aquí para añadir un nuevo ítem",
             "confirmButton": "Añadir una {category} .<br><div class=\"alert\">Tu contribución es visible para todos</div>",
             "confirmIntro": "<h3>Añadir {title} aquí?</h3>El punto que estás creando <b>lo verá todo el mundo</b>. Sólo añade cosas que realmente existan. Muchas aplicaciones usan estos datos.",
diff --git a/langs/fr.json b/langs/fr.json
index 3f3c790d9c..a383e4d37b 100644
--- a/langs/fr.json
+++ b/langs/fr.json
@@ -41,7 +41,7 @@
         "about": "Éditer facilement et ajouter OpenStreetMap pour un certain thème",
         "aboutMapcomplete": "<h3>À propos de MapComplete</h3><p>Avec MapComplete vous pouvez enrichir OpenStreetMap d'informations sur un <b>thème unique.</b> Répondez à quelques questions, et en quelques minutes vos contributions seront disponible dans le monde entier ! Le <b>concepteur du thème</b> définis les éléments, questions et langues pour le thème.</p><h3>En savoir plus</h3><p>MapComplete <b>propose toujours l'étape suivante</b> pour en apprendre plus sur OpenStreetMap.</p><ul><li>Lorsqu'il est intégré dans un site Web, l'&lt;i&gt;iframe&lt;/i&gt; pointe vers MapComplete en plein écran</li><li>La version plein écran donne des informations sur OpenStreetMap</li><li>Il est possible de regarder sans se connecter, mais l'édition demande une connexion à OSM.</li><li>Si vous n'êtes pas connecté, il vous est demandé de le faire</li><li>Une fois que vous avez répondu à une seule question, vous pouvez ajouter de nouveaux points à la carte</li><li>Au bout d'un moment, les vrais tags OSM sont montrés, qui pointent ensuite vers le wiki</li></ul><p></p><br><p>Vous avez remarqué <b>un problème</b> ? Vous souhaitez <b>demander une fonctionnalité</b> ? Vous voulez <b>aider à traduire</b> ? Allez voir <a href=\"https://github.com/pietervdvn/MapComplete\" target=\"_blank\">le code source</a> ou l'&lt;i&gt;<a href=\"https://github.com/pietervdvn/MapComplete/issues\" target=\"_blank\">issue tracker.</a>&lt;/i&gt; </p><p> Vous voulez visualiser <b>votre progression</b> ? Suivez le compteur d'édition sur <a href=\"{osmcha_link}\" target=\"_blank\">OsmCha</a>.</p>",
         "add": {
-            "addNew": "Ajouter une nouvelle {category}",
+            "addNew": "Ajouter {category}",
             "addNewMapLabel": "Cliquez ici pour ajouter un élément",
             "confirmButton": "Ajouter un/une {category} ici.<br><div class=\"alert\">Votre ajout sera visible par tout le monde</div>",
             "confirmIntro": "<h3>Ajouter un/une {title} ici?</h3>Le point que vous ajouterez sera <b>visible par tout le monde</b>. Merci de vous assurer que ce point existe réellement. Beaucoup d'autres applications utilisent ces données.",
diff --git a/langs/it.json b/langs/it.json
index b8656f67f6..13128003de 100644
--- a/langs/it.json
+++ b/langs/it.json
@@ -41,7 +41,7 @@
         "about": "Modifica e aggiungi con semplicità OpenStreetMap per un certo tema",
         "aboutMapcomplete": "<h3>Informazioni su MapComplete</h3><p>Con MapComplete puoi arricchire OpenStreetMap con informazioni su un <b>singolo argomento</b>. Rispondi a poche domande e in pochi minuti i tuoi contributi saranno disponibili a tutto il mondo! L’utente <b>gestore del tema</b> definisce gli elementi, le domande e le lingue per quel tema.</p><h3>Scopri altro</h3><p>MapComplete <b>propone sempre un passo in più</b> per imparare qualcosa di nuovo su OpenStreetMap.</p><ul><li>Quando viene incorporato in un sito web, il collegamento dell’iframe punta a MapComplete a tutto schermo</li><li>La versione a tutto schermo fornisce informazioni su OpenStreetMap</li><li>La visualizzazione non necessita di alcun accesso ma per modificare occorre aver effettuato l’accesso su OSM.</li><li>Se non hai effettuato l’accesso, ti verrà richiesto di farlo</li><li>Dopo aver risposto ad una sola domanda potrai aggiungere dei nuovi punti alla mappa</li><li>Dopo qualche momento verranno mostrate le etichette effettive, in seguito i collegamenti alla wiki</li></ul><p></p><br><p>Hai trovato un <b>errore</b>? Vuoi richiedere <b>nuove funzionalità</b>? Vuoi aiutare con la <b>traduzione</b>? Dai un’occhiata al <a href=\"https://github.com/pietervdvn/MapComplete\" target=\"_blank\">codice sorgente</a> oppure al <a href=\"https://github.com/pietervdvn/MapComplete/issues\" target=\"_blank\">tracker degli errori.</a></p><p>Vuoi vedere i <b>tuoi progressi</b>?Segui il contatore delle modifiche su <a href=\"{osmcha_link}\" target=\"_blank\">OsmCha</a>.</p>",
         "add": {
-            "addNew": "Aggiungi una nuova {category} qua",
+            "addNew": "Aggiungi {category} qua",
             "addNewMapLabel": "Aggiungi nuovo elemento",
             "confirmButton": "Aggiungi una {category} qua.<br><div class=\"alert\">La tua aggiunta è visibile a chiunque</div>",
             "confirmIntro": "<h3>Aggiungere un {title} qua?</h3>Il punto che hai creato qua sarà <b>visibile da chiunque</b>. Per favore, aggiungi sulla mappa solo oggetti realmente esistenti. Molte applicazioni usano questi dati.",
diff --git a/langs/nb_NO.json b/langs/nb_NO.json
index 92ff2f2583..47ccb608f6 100644
--- a/langs/nb_NO.json
+++ b/langs/nb_NO.json
@@ -37,7 +37,7 @@
     },
     "general": {
         "add": {
-            "addNew": "Legg til en ny {category} her",
+            "addNew": "Legg til {category} her",
             "addNewMapLabel": "Legg til nytt element",
             "confirmButton": "Legg til en {category} her.<br><div class=\"alert\">Din endring er synlig for alle</div>",
             "confirmIntro": "<h3>Legg til {title} her?</h3>Punktet du oppretter her vil være <b>synlig for alle</b>. Kun legg til ting på kartet hvis de virkelig finnes. Mange programmer bruker denne dataen.",
diff --git a/langs/nl.json b/langs/nl.json
index c0c5a7c6af..04d0af9cb2 100644
--- a/langs/nl.json
+++ b/langs/nl.json
@@ -41,7 +41,7 @@
         "about": "Bewerk en voeg data toe aan OpenStreetMap over een specifiek onderwerp op een gemakkelijke manier",
         "aboutMapcomplete": "<h3>Over MapComplete</h3><p>Met MapComplete kun je OpenStreetMap verrijken met informatie over een bepaald thema. Beantwoord enkele vragen, en binnen een paar minuten is jouw bijdrage wereldwijd beschikbaar! De <b>maker van het thema</b> bepaalt de elementen, vragen en taalversies voor het thema.</p><h3>Ontdek meer</h3><p>MapComplete <b>biedt altijd de volgende stap</b> naar meer OpenStreetMap:</p><ul><li>Indien ingebed in een website linkt het iframe naar de volledige MapComplete</li><li>De volledige versie heeft uitleg over OpenStreetMap</li><li>Bekijken kan altijd, maar wijzigen vereist een OSM-account</li><li>Als je niet aangemeld bent, wordt je gevraagd dit te doen</li><li>Als je minstens één vraag hebt beantwoord, kan je ook elementen toevoegen</li><li>Heb je genoeg changesets, dan verschijnen de OSM-tags, nog later links naar de wiki</li></ul><p></p><p>Merk je <b>een bug</b> of wil je een <b>extra feature</b>? Wil je <b>helpen vertalen</b>? Bezoek dan de <a href=\"https://github.com/pietervdvn/MapComplete\" target=\"_blank\">broncode</a> en <a href=\"https://github.com/pietervdvn/MapComplete/issues\" target=\"_blank\">issue tracker</a>. </p><p></p>Wil je <b>je vorderingen</b> zien? Volg de edits <a href=\"{osmcha_link}\" target=\"_blank\">op OsmCha</a>.<p></p>",
         "add": {
-            "addNew": "Voeg een {category} toe",
+            "addNew": "Voeg {category} toe",
             "addNewMapLabel": "Klik hier om een item toe te voegen",
             "confirmButton": "Voeg een {category} toe<br/><div class='alert'>Je toevoeging is voor iedereen zichtbaar</div>",
             "confirmIntro": "<h3>Voeg een {title} toe?</h3>Het punt dat je toevoegt, is <b>zichtbaar voor iedereen</b>. Veel applicaties gebruiken deze data, voeg dus enkel punten toe die echt bestaan.",
diff --git a/langs/pt.json b/langs/pt.json
index 50c200c5c8..f185c3161a 100644
--- a/langs/pt.json
+++ b/langs/pt.json
@@ -41,7 +41,7 @@
         "about": "Edite e adicione facilmente o OpenStreetMap para um determinado tema",
         "aboutMapcomplete": "<h3>Sobre o MapComplete</h3><p>Use-o para adicionar informações ao OpenStreetMap <b>sobre um tema específico</b>. Responda a perguntas e em poucos minutos as suas contribuições estão disponíveis em todos os lugares. O <b>responsável pelo tema</b> define os elementos, as perguntas e os idiomas disponíveis nele.</p> <h3>Descubra mais</h3><p>O MapComplete <b>mostra sempre o próximo passo</b> para saber mais sobre o OpenStreetMap.</p><ul> <li>Quando incorporado num site, o iframe liga-se ao MapComplete em ecrã cheio.</li><li>A versão ecrã cheio fornece informações sobre o OpenStreetMap</li><li>A visualização funciona sem ser preciso autenticar-se, mas a edição requer uma conta no OpenStreetMap.</li> <li>Se não estiver autenticado, é solicitado a fazê-lo</li><li>Após responder a uma pergunta, pode adicionar novos pontos ao mapa</li><li>Depois de um tempo, as etiquetas reais do OpenStreetMap são mostradas, mais tarde vinculando-se à wiki</li></ul><p></p><br><p>Deparou-se com <b>um problema</b>? Quer uma <b>nova funcionalidade</b>? Quer <b>ajudar a traduzir</b>? Vá ao <a href=\"https://github.com/pietervdvn/MapComplete\" target=\"_blank\">código-fonte</a> ou <a href=\"https://github.com/pietervdvn/MapComplete/issues\" target=\"_blank\">rastreador de problemas</a>. </p> <p>Quer ver <b>o seu progresso</b>? Veja a contagem de edições em <a href=\"{osmcha_link}\" target=\"_blank\">OsmCha</a>.</p>",
         "add": {
-            "addNew": "Adicionar uma nova {category} aqui",
+            "addNew": "Adicionar {category} aqui",
             "addNewMapLabel": "Adicionar novo item",
             "confirmButton": "Adicione uma {category} aqui.<br><div class=\"alert\">Esta adição será visível a todos</div>",
             "confirmIntro": "<h3>Adicionar {title} aqui?</h3>O ponto que criar aqui será <b>visível a todos</b>. Por favor, só adicione coisas ao mapa se elas realmente existirem. Muitas aplicações usam estes dados.",
diff --git a/langs/pt_BR.json b/langs/pt_BR.json
index 0e393c85e5..102e0085fd 100644
--- a/langs/pt_BR.json
+++ b/langs/pt_BR.json
@@ -14,7 +14,7 @@
         "about": "Edite e adicione facilmente o OpenStreetMap para um determinado tema",
         "aboutMapcomplete": "<h3>Sobre o MapComplete</h3><p>Com o MapComplete, você pode enriquecer o OpenStreetMap com informações sobre um<b>único tema.</b>Responda a algumas perguntas e, em minutos, suas contribuições estarão disponíveis em todo o mundo! O<b>mantenedor do tema</b>define elementos, questões e linguagens para o tema.</p><h3>Saiba mais</h3><p>MapComplete sempre<b>oferece a próxima etapa</b>para saber mais sobre o OpenStreetMap.</p><ul><li>Quando incorporado em um site, o iframe vincula-se a um MapComplete em tela inteira</li><li>A versão em tela inteira oferece informações sobre o OpenStreetMap</li><li>A visualização funciona sem login, mas a edição requer um login do OSM.</li><li>Se você não estiver conectado, será solicitado que você faça o login</li><li>Depois de responder a uma única pergunta, você pode adicionar novos aponta para o mapa </li><li> Depois de um tempo, as tags OSM reais são mostradas, posteriormente vinculadas ao wiki </li></ul><p></p><br><p>Você percebeu<b>um problema</b>? Você tem uma<b>solicitação de recurso </b>? Quer<b>ajudar a traduzir</b>? Acesse <a href=\"https://github.com/pietervdvn/MapComplete\" target=\"_blank\">o código-fonte</a>ou <a href=\"https: //github.com/pietervdvn/MapComplete / issues \" target=\" _ blank \">rastreador de problemas.</a></p><p>Quer ver<b>seu progresso</b>? Siga a contagem de edição em<a href=\"{osmcha_link}\" target=\"_blank\">OsmCha</a>.</p>",
         "add": {
-            "addNew": "Adicione uma nova {category} aqui",
+            "addNew": "Adicione {category} aqui",
             "confirmButton": "Adicione uma {category} aqui.<br><div class=\"alert\">Sua adição é visível para todos</div>",
             "confirmIntro": "<h3>Adicionar um {title} aqui?</h3>O ponto que você criar aqui será <b>visível para todos</b>. Por favor, só adicione coisas ao mapa se elas realmente existirem. Muitos aplicativos usam esses dados.",
             "intro": "Você clicou em algum lugar onde ainda não há dados conhecidos.<br>",
diff --git a/scripts/lint.ts b/scripts/lint.ts
index 460eb8c874..00d2840a7f 100644
--- a/scripts/lint.ts
+++ b/scripts/lint.ts
@@ -1,16 +1,59 @@
 import ScriptUtils from "./ScriptUtils";
 import {writeFileSync} from "fs";
 import {FixLegacyTheme, UpdateLegacyLayer} from "../Models/ThemeConfig/Conversion/LegacyJsonConvert";
+import Translations from "../UI/i18n/Translations";
+import {Translation} from "../UI/i18n/Translation";
+import {LayerConfigJson} from "../Models/ThemeConfig/Json/LayerConfigJson";
 
 /*
  * This script reads all theme and layer files and reformats them inplace
  * Use with caution, make a commit beforehand!
  */
 
+const t : Translation = Translations.t.general.add.addNew
+t.OnEveryLanguage((txt, ln) => {
+    console.log(ln, txt)
+    return txt
+})
+
+const articles = {
+    de: "eine",
+    es: 'una',
+    fr: 'une',
+    it: 'una',
+    nb_NO: 'en',
+    nl: 'een',
+    pt: 'uma',
+    pt_BR : 'uma',
+}
+
+function addArticleToPresets(layerConfig: {presets?: {title: any}[]}){
+    /*
+    if(layerConfig.presets === undefined){
+        return 
+    }
+    for (const preset of layerConfig.presets) {
+        preset.title = new Translation(preset.title, "autofix")
+            .OnEveryLanguage((txt, lang) => {
+                const article = articles[lang]
+                if(article === undefined){
+                    return txt;
+                }
+                if(txt.startsWith(article)){
+                    return txt;
+                }
+                return article +" " +  txt.toLowerCase();
+            })
+            .translations
+    }
+    //*/
+}
+
 const layerFiles = ScriptUtils.getLayerFiles();
 for (const layerFile of layerFiles) {
     try {
-        const fixed = new UpdateLegacyLayer().convertStrict(layerFile.parsed, "While linting " + layerFile.path);
+        const fixed =<LayerConfigJson> new UpdateLegacyLayer().convertStrict(layerFile.parsed, "While linting " + layerFile.path);
+       addArticleToPresets(fixed)
         writeFileSync(layerFile.path, JSON.stringify(fixed, null, "  "))
     } catch (e) {
         console.error("COULD NOT LINT LAYER" + layerFile.path + ":\n\t" + e)
@@ -21,6 +64,12 @@ const themeFiles = ScriptUtils.getThemeFiles()
 for (const themeFile of themeFiles) {
     try {
         const fixed = new FixLegacyTheme().convertStrict(themeFile.parsed, "While linting " + themeFile.path);
+        for (const layer of fixed.layers) {
+            if(layer["presets"] !== undefined){
+                addArticleToPresets(<any> layer)
+            }
+        }
+        
         writeFileSync(themeFile.path, JSON.stringify(fixed, null, "  "))
     } catch (e) {
         console.error("COULD NOT LINT THEME" + themeFile.path + ":\n\t" + e)