diff --git a/index.json b/index.json
index 04c8c973..9425489e 100644
--- a/index.json
+++ b/index.json
@@ -2,7 +2,7 @@
     "type": "index",
     "subCategories": [
         {
-            "id": "leisure",
+            "id": "leisure_sport_shopping",
             "type": "index",
             "name:en": "Leisure, Sport and Shopping",
             "subCategories": [
diff --git a/lang/ast.json b/lang/ast.json
index 00ee1783..af069b69 100644
--- a/lang/ast.json
+++ b/lang/ast.json
@@ -1,48 +1,46 @@
 {
-    "dir:agriculture_industry": "Agricultura ya industria",
-    "dir:culture": "Cultura y relixón",
-    "dir:leisure": "Recréu, deportes y compres",
-    "dir:places": "Llugares",
-    "dir:services": "Servicios",
-    "dir:services/communication": "Comunicaciones",
-    "dir:transport": "Tresporte",
-    "dir:transport/alternative": "Alternativu (Ciclismu, senderismu, ...)",
-    "dir:transport/car": "Tráficu individual",
-    "dir:transport/pt": "Tresporte Públicu",
-    "title:administrative": "Divisiones Alministratives",
-    "title:agriculture": "Agricultura",
-    "title:alternative_amenities": "Infraestructures",
-    "title:alternative_routes": "Rutes",
-    "title:car_amenities": "Infraestructures",
-    "title:car_furniture": "Acondicionamientu urbanu",
-    "title:construction": "Sitios d'obres",
-    "title:culture": "Cultura",
-    "title:education": "Servicios educativos",
-    "title:emergency": "Servicios d'emerxencia",
-    "title:financial": "Dineru",
-    "title:gastro": "Gastronomía",
-    "title:health": "Salú",
-    "title:historic": "Hestoria",
-    "title:internet": "Accesu a Internet",
-    "title:landfill": "Basures",
-    "title:leisure": "Recréu",
-    "title:military": "Militar",
-    "title:natural": "Formaciones naturales",
-    "title:other": "Otres",
-    "title:phone": "Teléfonos",
-    "title:places": "Llugares",
-    "title:playgrounds": "Xuegos infantiles",
-    "title:post": "Corréu",
-    "title:power": "Enerxía",
-    "title:pt_amenities": "Infraestructures",
-    "title:pt_stops": "Paraes y estaciones",
-    "title:public": "Serviciu Públicu",
-    "title:railway": "Ferrocarril",
-    "title:religion": "Relixón",
-    "title:residential": "Zones residenciales",
-    "title:resources": "Estraición de recursos",
-    "title:shop": "Compres",
-    "title:sport": "Deportes",
-    "title:tourism": "Turismu",
-    "title:works": "Fábriques"
+    "category:administrative": "Divisiones Alministratives",
+    "category:agriculture": "Agricultura",
+    "category:agriculture_industry": "Agricultura ya industria",
+    "category:alternative_amenities": "Infraestructures",
+    "category:alternative_routes": "Rutes",
+    "category:car_amenities": "Infraestructures",
+    "category:car_furniture": "Acondicionamientu urbanu",
+    "category:communication": "Comunicaciones",
+    "category:construction": "Sitios d'obres",
+    "category:culture": "Cultura",
+    "category:education": "Servicios educativos",
+    "category:emergency": "Servicios d'emerxencia",
+    "category:financial": "Dineru",
+    "category:gastro": "Gastronomía",
+    "category:health": "Salú",
+    "category:historic": "Hestoria",
+    "category:internet": "Accesu a Internet",
+    "category:landfill": "Basures",
+    "category:leisure": "Recréu",
+    "category:leisure_sport_shopping": "Recréu, deportes y compres",
+    "category:military": "Militar",
+    "category:natural": "Formaciones naturales",
+    "category:other": "Otres",
+    "category:phone": "Teléfonos",
+    "category:places": "Llugares",
+    "category:playgrounds": "Xuegos infantiles",
+    "category:post": "Corréu",
+    "category:power": "Enerxía",
+    "category:pt_amenities": "Infraestructures",
+    "category:pt_stops": "Paraes y estaciones",
+    "category:public": "Serviciu Públicu",
+    "category:railway": "Ferrocarril",
+    "category:religion": "Relixón",
+    "category:residential": "Zones residenciales",
+    "category:resources": "Estraición de recursos",
+    "category:services": "Servicios",
+    "category:shop": "Compres",
+    "category:sport": "Deportes",
+    "category:tourism": "Turismu",
+    "category:transport": "Tresporte",
+    "category:transport_alternative": "Alternativu (Ciclismu, senderismu, ...)",
+    "category:transport_car": "Tráficu individual",
+    "category:transport_pt": "Tresporte Públicu",
+    "category:works": "Fábriques"
 }
diff --git a/lang/ca.json b/lang/ca.json
index 952deff5..d3059d50 100644
--- a/lang/ca.json
+++ b/lang/ca.json
@@ -1,8 +1,8 @@
 {
-    "dir:culture": "Cultura i religió",
-    "dir:leisure": "Oci, esport i compres",
-    "dir:services": "Serveis",
-    "dir:services/communication": "Comunicacions",
-    "title:emergency": "Serveis d'emergència",
-    "title:internet": "Accés a Internet"
+    "category:communication": "Comunicacions",
+    "category:culture": "Cultura i religió",
+    "category:emergency": "Serveis d'emergència",
+    "category:internet": "Accés a Internet",
+    "category:leisure_sport_shopping": "Oci, esport i compres",
+    "category:services": "Serveis"
 }
diff --git a/lang/cs.json b/lang/cs.json
index 09683afd..4f1f41a3 100644
--- a/lang/cs.json
+++ b/lang/cs.json
@@ -1,48 +1,46 @@
 {
-    "dir:agriculture_industry": "Průmysl a zemědělství",
-    "dir:culture": "Kultura a náboženství",
-    "dir:leisure": "Volný čas, sporty a nákupy",
-    "dir:places": "Místa",
-    "dir:services": "Služby",
-    "dir:services/communication": "Komunikace",
-    "dir:transport": "Doprava",
-    "dir:transport/alternative": "Alternativní (Cyklistika, Pěší turistika, ...)",
-    "dir:transport/car": "Individuální doprava",
-    "dir:transport/pt": "Veřejná doprava",
-    "title:administrative": "Administrativní oblasti",
-    "title:agriculture": "Zemědělství",
-    "title:alternative_amenities": "Občanská vybavenost",
-    "title:alternative_routes": "Trasy cest",
-    "title:car_amenities": "Občasnká vybavenost",
-    "title:car_furniture": "Pouliční přislušenství",
-    "title:construction": "Staveniště",
-    "title:culture": "Kultura",
-    "title:education": "Vzdělávací služby",
-    "title:emergency": "Pohotovostní služby",
-    "title:financial": "Finanční služby",
-    "title:gastro": "Stravování",
-    "title:health": "Zdravotnictví",
-    "title:historic": "Historické",
-    "title:internet": "Přístup k internetu",
-    "title:landfill": "Nakládání s odpady",
-    "title:leisure": "Volný čas",
-    "title:military": "Vojenské",
-    "title:natural": "Přírodní úkazy",
-    "title:other": "Jiné",
-    "title:phone": "Telefony",
-    "title:places": "Sídla",
-    "title:playgrounds": "Hřiště",
-    "title:post": "Poštovní služby",
-    "title:power": "Elektřina",
-    "title:pt_amenities": "Občanská vybavenost",
-    "title:pt_stops": "Zastávky & Stanice",
-    "title:public": "Veřejné služby",
-    "title:railway": "Železnice",
-    "title:religion": "Religion",
-    "title:residential": "Obytné oblasti",
-    "title:resources": "Těžba surovin",
-    "title:shop": "Obchody",
-    "title:sport": "Sport",
-    "title:tourism": "Turistika",
-    "title:works": "Továrny"
+    "category:administrative": "Administrativní oblasti",
+    "category:agriculture": "Zemědělství",
+    "category:agriculture_industry": "Průmysl a zemědělství",
+    "category:alternative_amenities": "Občanská vybavenost",
+    "category:alternative_routes": "Trasy cest",
+    "category:car_amenities": "Občasnká vybavenost",
+    "category:car_furniture": "Pouliční přislušenství",
+    "category:communication": "Komunikace",
+    "category:construction": "Staveniště",
+    "category:culture": "Kultura",
+    "category:education": "Vzdělávací služby",
+    "category:emergency": "Pohotovostní služby",
+    "category:financial": "Finanční služby",
+    "category:gastro": "Stravování",
+    "category:health": "Zdravotnictví",
+    "category:historic": "Historické",
+    "category:internet": "Přístup k internetu",
+    "category:landfill": "Nakládání s odpady",
+    "category:leisure": "Volný čas",
+    "category:leisure_sport_shopping": "Volný čas, sporty a nákupy",
+    "category:military": "Vojenské",
+    "category:natural": "Přírodní úkazy",
+    "category:other": "Jiné",
+    "category:phone": "Telefony",
+    "category:places": "Sídla",
+    "category:playgrounds": "Hřiště",
+    "category:post": "Poštovní služby",
+    "category:power": "Elektřina",
+    "category:pt_amenities": "Občanská vybavenost",
+    "category:pt_stops": "Zastávky & Stanice",
+    "category:public": "Veřejné služby",
+    "category:railway": "Železnice",
+    "category:religion": "Religion",
+    "category:residential": "Obytné oblasti",
+    "category:resources": "Těžba surovin",
+    "category:services": "Služby",
+    "category:shop": "Obchody",
+    "category:sport": "Sport",
+    "category:tourism": "Turistika",
+    "category:transport": "Doprava",
+    "category:transport_alternative": "Alternativní (Cyklistika, Pěší turistika, ...)",
+    "category:transport_car": "Individuální doprava",
+    "category:transport_pt": "Veřejná doprava",
+    "category:works": "Továrny"
 }
diff --git a/lang/de.json b/lang/de.json
index e773070d..5386b2e5 100644
--- a/lang/de.json
+++ b/lang/de.json
@@ -1,48 +1,46 @@
 {
     "Bar style": "BAR",
-    "dir:agriculture_industry": "Landwirtschaft und Industrie",
-    "dir:culture": "Kultur und Religion",
-    "dir:leisure": "Freizeit, Sport und Einkauf",
-    "dir:places": "Orte",
-    "dir:services": "Dienste",
-    "dir:services/communication": "Kommunikation",
-    "dir:transport": "Transport",
-    "dir:transport/alternative": "Alternativ (Rad, Wandern, ...)",
-    "dir:transport/car": "Motorisierter Individualverkehr",
-    "dir:transport/pt": "Öffentlicher Verkehr",
-    "title:administrative": "Administrative Gebiete",
-    "title:agriculture": "Landwirtschaft",
-    "title:alternative_amenities": "Einrichtungen",
-    "title:alternative_routes": "(ausgeschilderte) Routen",
-    "title:car_amenities": "Einrichtungen",
-    "title:car_furniture": "Straßenausstattung",
-    "title:construction": "Baustellen",
-    "title:culture": "Kultur",
-    "title:education": "Bildungseinrichtungen",
-    "title:emergency": "Notfalldienste",
-    "title:financial": "Finanzen",
-    "title:gastro": "Gastronomie",
-    "title:health": "Gesundheitsdienste",
-    "title:historic": "Geschichte",
-    "title:internet": "Internetzugang",
-    "title:landfill": "Entsorgung",
-    "title:leisure": "Freizeit",
-    "title:military": "Militär",
-    "title:natural": "Geographische Objekte",
-    "title:other": "Andere",
-    "title:phone": "Telekommunikation",
-    "title:places": "Orte",
-    "title:post": "Post",
-    "title:power": "Energie",
-    "title:pt_amenities": "Einrichtungen",
-    "title:pt_stops": "Haltestellen",
-    "title:public": "Öffentliche Dienste",
-    "title:railway": "Eisenbahn",
-    "title:religion": "Religion",
-    "title:residential": "Wohngebiete",
-    "title:resources": "Ressourcengewinnung",
-    "title:shop": "Einkauf",
-    "title:sport": "anderer Sport",
-    "title:tourism": "Tourismus",
-    "title:works": "Fabriken"
+    "category:administrative": "Administrative Gebiete",
+    "category:agriculture": "Landwirtschaft",
+    "category:agriculture_industry": "Landwirtschaft und Industrie",
+    "category:alternative_amenities": "Einrichtungen",
+    "category:alternative_routes": "(ausgeschilderte) Routen",
+    "category:car_amenities": "Einrichtungen",
+    "category:car_furniture": "Straßenausstattung",
+    "category:communication": "Kommunikation",
+    "category:construction": "Baustellen",
+    "category:culture": "Kultur",
+    "category:education": "Bildungseinrichtungen",
+    "category:emergency": "Notfalldienste",
+    "category:financial": "Finanzen",
+    "category:gastro": "Gastronomie",
+    "category:health": "Gesundheitsdienste",
+    "category:historic": "Geschichte",
+    "category:internet": "Internetzugang",
+    "category:landfill": "Entsorgung",
+    "category:leisure": "Freizeit",
+    "category:leisure_sport_shopping": "Freizeit, Sport und Einkauf",
+    "category:military": "Militär",
+    "category:natural": "Geographische Objekte",
+    "category:other": "Andere",
+    "category:phone": "Telekommunikation",
+    "category:places": "Orte",
+    "category:post": "Post",
+    "category:power": "Energie",
+    "category:pt_amenities": "Einrichtungen",
+    "category:pt_stops": "Haltestellen",
+    "category:public": "Öffentliche Dienste",
+    "category:railway": "Eisenbahn",
+    "category:religion": "Religion",
+    "category:residential": "Wohngebiete",
+    "category:resources": "Ressourcengewinnung",
+    "category:services": "Dienste",
+    "category:shop": "Einkauf",
+    "category:sport": "anderer Sport",
+    "category:tourism": "Tourismus",
+    "category:transport": "Transport",
+    "category:transport_alternative": "Alternativ (Rad, Wandern, ...)",
+    "category:transport_car": "Motorisierter Individualverkehr",
+    "category:transport_pt": "Öffentlicher Verkehr",
+    "category:works": "Fabriken"
 }
diff --git a/lang/el.json b/lang/el.json
index 85901d3f..938afc26 100644
--- a/lang/el.json
+++ b/lang/el.json
@@ -1,32 +1,29 @@
 {
-    "dir:agriculture_industry": "Γεωργία και Βιομηχανία",
-    "dir:culture": "Πολιτισμός και Θρησκεία",
-    "dir:leisure": "Αναψυχή, Αθλητισμός και Αγορές",
-    "dir:places": "Μέρη",
-    "dir:services": "Υπηρεσίες",
-    "dir:services/communication": "Επικοινωνίες",
-    "dir:services_communication": "Επικοινωνίες",
-    "dir:transport": "Μεταφορές",
-    "dir:transport/alternative": "Εναλλακτικά (ποδηλασία, ορειβασία,...)",
-    "dir:transport/pt": "Δημόσιες Μεταφορές",
-    "title:administrative": "Διοικητικά Όρια",
-    "title:agriculture": "Γεωργία",
-    "title:culture": "Πολιτισμός",
-    "title:education": "Υπηρεσίες Εκπαίδευσης",
-    "title:emergency": "Υπηρεσίες Έκτακτης Ανάγκης",
-    "title:financial": "Χρήμα",
-    "title:gastro": "Γαστρονομία",
-    "title:health": "Υγεία",
-    "title:historic": "Ιστορικά",
-    "title:leisure": "Αναψυχή",
-    "title:military": "Στρατιωτικό",
-    "title:natural": "Φυσικοί Σχηματισμοί",
-    "title:places": "Μέρη",
-    "title:pt_stops": "Στάσεις & Σταθμοί",
-    "title:public": "Δημόσιες Υπηρεσίες",
-    "title:religion": "Θρησκεία",
-    "title:residential": "Περιοχές Κατοικίας",
-    "title:shop": "Αγορές",
-    "title:sport": "Άθληση",
-    "title:tourism": "Τουρισμός"
+    "category:administrative": "Διοικητικά Όρια",
+    "category:agriculture": "Γεωργία",
+    "category:agriculture_industry": "Γεωργία και Βιομηχανία",
+    "category:communication": "Επικοινωνίες",
+    "category:culture": "Πολιτισμός",
+    "category:education": "Υπηρεσίες Εκπαίδευσης",
+    "category:emergency": "Υπηρεσίες Έκτακτης Ανάγκης",
+    "category:financial": "Χρήμα",
+    "category:gastro": "Γαστρονομία",
+    "category:health": "Υγεία",
+    "category:historic": "Ιστορικά",
+    "category:leisure": "Αναψυχή",
+    "category:leisure_sport_shopping": "Αναψυχή, Αθλητισμός και Αγορές",
+    "category:military": "Στρατιωτικό",
+    "category:natural": "Φυσικοί Σχηματισμοί",
+    "category:places": "Μέρη",
+    "category:pt_stops": "Στάσεις & Σταθμοί",
+    "category:public": "Δημόσιες Υπηρεσίες",
+    "category:religion": "Θρησκεία",
+    "category:residential": "Περιοχές Κατοικίας",
+    "category:services": "Υπηρεσίες",
+    "category:shop": "Αγορές",
+    "category:sport": "Άθληση",
+    "category:tourism": "Τουρισμός",
+    "category:transport": "Μεταφορές",
+    "category:transport_alternative": "Εναλλακτικά (ποδηλασία, ορειβασία,...)",
+    "category:transport_pt": "Δημόσιες Μεταφορές"
 }
diff --git a/lang/en.json b/lang/en.json
index f27dffd9..21e7f717 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -1,48 +1,46 @@
 {
-    "dir:agriculture_industry": "Agriculture and Industry",
-    "dir:culture": "Culture and Religion",
-    "dir:leisure": "Leisure, Sport and Shopping",
-    "dir:places": "Places",
-    "dir:services": "Services",
-    "dir:services/communication": "Communication",
-    "dir:transport": "Transportation",
-    "dir:transport/alternative": "Alternative (Cycling, Hiking, ...)",
-    "dir:transport/car": "Individual Traffic",
-    "dir:transport/pt": "Public Transportation",
-    "title:administrative": "Administrative Areas",
-    "title:agriculture": "Agriculture",
-    "title:alternative_amenities": "Amenities",
-    "title:alternative_routes": "Routes",
-    "title:car_amenities": "Amenities",
-    "title:car_furniture": "Street Furniture",
-    "title:construction": "Construction Sites",
-    "title:culture": "Culture",
-    "title:education": "Educational Services",
-    "title:emergency": "Emergency Services",
-    "title:financial": "Financial",
-    "title:gastro": "Gastronomy",
-    "title:health": "Health",
-    "title:historic": "Historic",
-    "title:internet": "Internet access",
-    "title:landfill": "Disposal",
-    "title:leisure": "Leisure",
-    "title:military": "Military",
-    "title:natural": "Natural Formations",
-    "title:other": "Other",
-    "title:phone": "Phone",
-    "title:places": "Places",
-    "title:playgrounds": "Playground",
-    "title:post": "Post",
-    "title:power": "Power",
-    "title:pt_amenities": "Amenities",
-    "title:pt_stops": "Stops & Stations",
-    "title:public": "Public Services",
-    "title:railway": "Railway",
-    "title:religion": "Religion",
-    "title:residential": "Residential Areas",
-    "title:resources": "Resource Extraction",
-    "title:shop": "Shopping",
-    "title:sport": "Sport",
-    "title:tourism": "Tourism",
-    "title:works": "Works"
+    "category:administrative": "Administrative Areas",
+    "category:agriculture": "Agriculture",
+    "category:agriculture_industry": "Agriculture and Industry",
+    "category:alternative_amenities": "Amenities",
+    "category:alternative_routes": "Routes",
+    "category:car_amenities": "Amenities",
+    "category:car_furniture": "Street Furniture",
+    "category:communication": "Communication",
+    "category:construction": "Construction Sites",
+    "category:culture": "Culture",
+    "category:education": "Educational Services",
+    "category:emergency": "Emergency Services",
+    "category:financial": "Financial",
+    "category:gastro": "Gastronomy",
+    "category:health": "Health",
+    "category:historic": "Historic",
+    "category:internet": "Internet access",
+    "category:landfill": "Disposal",
+    "category:leisure": "Leisure",
+    "category:leisure_sport_shopping": "Leisure, Sport and Shopping",
+    "category:military": "Military",
+    "category:natural": "Natural Formations",
+    "category:other": "Other",
+    "category:phone": "Phone",
+    "category:places": "Places",
+    "category:playgrounds": "Playground",
+    "category:post": "Post",
+    "category:power": "Power",
+    "category:pt_amenities": "Amenities",
+    "category:pt_stops": "Stops & Stations",
+    "category:public": "Public Services",
+    "category:railway": "Railway",
+    "category:religion": "Religion",
+    "category:residential": "Residential Areas",
+    "category:resources": "Resource Extraction",
+    "category:services": "Services",
+    "category:shop": "Shopping",
+    "category:sport": "Sport",
+    "category:tourism": "Tourism",
+    "category:transport": "Transportation",
+    "category:transport_alternative": "Alternative (Cycling, Hiking, ...)",
+    "category:transport_car": "Individual Traffic",
+    "category:transport_pt": "Public Transportation",
+    "category:works": "Works"
 }
diff --git a/lang/es.json b/lang/es.json
index dea2269e..4882ccaa 100644
--- a/lang/es.json
+++ b/lang/es.json
@@ -1,8 +1,8 @@
 {
-    "dir:culture": "Cultura y religión",
-    "dir:leisure": "Ocio, deporte y compras",
-    "dir:services": "Servicios",
-    "title:emergency": "Servicios de emergencia",
-    "title:internet": "Acceso a Internet",
-    "title:pt_stops": "Paradas y estaciones"
+    "category:culture": "Cultura y religión",
+    "category:emergency": "Servicios de emergencia",
+    "category:internet": "Acceso a Internet",
+    "category:leisure_sport_shopping": "Ocio, deporte y compras",
+    "category:pt_stops": "Paradas y estaciones",
+    "category:services": "Servicios"
 }
diff --git a/lang/et.json b/lang/et.json
index 8f2a688b..077d67d2 100644
--- a/lang/et.json
+++ b/lang/et.json
@@ -1,26 +1,26 @@
 {
-    "dir:agriculture_industry": "Põllumajandus ja tööstus",
-    "dir:culture": "Kultuur ja religioon",
-    "dir:leisure": "Vaba aeg, sport ja ostmine",
-    "dir:places": "Kohad",
-    "dir:services": "Teenused",
-    "dir:services/communication": "Kommunikatsioon",
-    "dir:transport": "Transport",
-    "dir:transport/alternative": "Alternatiivne (jalgrattasõit, matkamine, ...)",
-    "dir:transport/pt": "Ühistransport",
-    "title:administrative": "Administratiivalad",
-    "title:agriculture": "Põllumajandus",
-    "title:education": "Haridusteenused",
-    "title:emergency": "Hädaabi teenused",
-    "title:historic": "Ajalooline",
-    "title:other": "Ülejäänud",
-    "title:phone": "Telefon",
-    "title:playgrounds": "Mänguväljak",
-    "title:power": "Elekter",
-    "title:public": "Kommunaalteenused",
-    "title:railway": "Raudtee",
-    "title:religion": "Religioon",
-    "title:residential": "Elamupiirkonnad",
-    "title:shop": "Ostmine",
-    "title:tourism": "Turism"
+    "category:administrative": "Administratiivalad",
+    "category:agriculture": "Põllumajandus",
+    "category:agriculture_industry": "Põllumajandus ja tööstus",
+    "category:communication": "Kommunikatsioon",
+    "category:culture": "Kultuur ja religioon",
+    "category:education": "Haridusteenused",
+    "category:emergency": "Hädaabi teenused",
+    "category:historic": "Ajalooline",
+    "category:leisure_sport_shopping": "Vaba aeg, sport ja ostmine",
+    "category:other": "Ülejäänud",
+    "category:phone": "Telefon",
+    "category:places": "Kohad",
+    "category:playgrounds": "Mänguväljak",
+    "category:power": "Elekter",
+    "category:public": "Kommunaalteenused",
+    "category:railway": "Raudtee",
+    "category:religion": "Religioon",
+    "category:residential": "Elamupiirkonnad",
+    "category:services": "Teenused",
+    "category:shop": "Ostmine",
+    "category:tourism": "Turism",
+    "category:transport": "Transport",
+    "category:transport_alternative": "Alternatiivne (jalgrattasõit, matkamine, ...)",
+    "category:transport_pt": "Ühistransport"
 }
diff --git a/lang/fr.json b/lang/fr.json
index 2e3a2406..2cb6d410 100644
--- a/lang/fr.json
+++ b/lang/fr.json
@@ -1,45 +1,43 @@
 {
-    "dir:agriculture_industry": "Agriculture et industrie",
-    "dir:culture": "Culture",
-    "dir:leisure": "Loisirs",
-    "dir:places": "Lieux",
-    "dir:services": "Services",
-    "dir:services/communication": "Communication",
-    "dir:transport": "Transport",
-    "dir:transport/alternative": "Alternatif (Cyclisme, Randonnée, ...)",
-    "dir:transport/car": "Transport automobile",
-    "dir:transport/pt": "Transport public",
-    "title:administrative": "Zones administratives",
-    "title:agriculture": "Agriculture",
-    "title:alternative_amenities": "Équipement",
-    "title:alternative_routes": "Routes",
-    "title:car_amenities": "Infrastructures routières",
-    "title:car_furniture": "Infrastrucutures résidentielles",
-    "title:construction": "Sites en construction",
-    "title:culture": "Culture",
-    "title:education": "Service d'Éducation",
-    "title:emergency": "Service d'urgence",
-    "title:financial": "Finance",
-    "title:gastro": "Gastronomie",
-    "title:health": "Santé",
-    "title:historic": "Histoire",
-    "title:landfill": "Rebuts",
-    "title:leisure": "Loisirs",
-    "title:military": "Militaire",
-    "title:natural": "Formation Naturelle",
-    "title:other": "Autre",
-    "title:places": "Place",
-    "title:playgrounds": "Jeux pour enfants",
-    "title:power": "Énergie",
-    "title:pt_amenities": "Équipements",
-    "title:pt_stops": "Arrêts/Stops, Stations",
-    "title:public": "Services Publics",
-    "title:railway": "Chemins de fer",
-    "title:religion": "Religion",
-    "title:residential": "Zone Résidentielle",
-    "title:resources": "Extraction des ressources",
-    "title:shop": "Magasinage/Shopping",
-    "title:sport": "Other Sport",
-    "title:tourism": "Tourisme",
-    "title:works": "Construction"
+    "category:administrative": "Zones administratives",
+    "category:agriculture": "Agriculture",
+    "category:agriculture_industry": "Agriculture et industrie",
+    "category:alternative_amenities": "Équipement",
+    "category:alternative_routes": "Routes",
+    "category:car_amenities": "Infrastructures routières",
+    "category:car_furniture": "Infrastrucutures résidentielles",
+    "category:communication": "Communication",
+    "category:construction": "Sites en construction",
+    "category:culture": "Culture",
+    "category:education": "Service d'Éducation",
+    "category:emergency": "Service d'urgence",
+    "category:financial": "Finance",
+    "category:gastro": "Gastronomie",
+    "category:health": "Santé",
+    "category:historic": "Histoire",
+    "category:landfill": "Rebuts",
+    "category:leisure": "Loisirs",
+    "category:leisure_sport_shopping": "Loisirs",
+    "category:military": "Militaire",
+    "category:natural": "Formation Naturelle",
+    "category:other": "Autre",
+    "category:places": "Place",
+    "category:playgrounds": "Jeux pour enfants",
+    "category:power": "Énergie",
+    "category:pt_amenities": "Équipements",
+    "category:pt_stops": "Arrêts/Stops, Stations",
+    "category:public": "Services Publics",
+    "category:railway": "Chemins de fer",
+    "category:religion": "Religion",
+    "category:residential": "Zone Résidentielle",
+    "category:resources": "Extraction des ressources",
+    "category:services": "Services",
+    "category:shop": "Magasinage/Shopping",
+    "category:sport": "Other Sport",
+    "category:tourism": "Tourisme",
+    "category:transport": "Transport",
+    "category:transport_alternative": "Alternatif (Cyclisme, Randonnée, ...)",
+    "category:transport_car": "Transport automobile",
+    "category:transport_pt": "Transport public",
+    "category:works": "Construction"
 }
diff --git a/lang/hu.json b/lang/hu.json
index 384f900a..96b3b293 100644
--- a/lang/hu.json
+++ b/lang/hu.json
@@ -1,31 +1,29 @@
 {
-    "dir:agriculture_industry": "Mezőgazdaság és ipar",
-    "dir:culture": "Kultúra",
-    "dir:leisure": "Szabadidő",
-    "dir:places": "Helyek",
-    "dir:services": "Szolgáltatás",
-    "dir:services/communication": "Kommunikácó",
-    "dir:transport": "Közlekedés",
-    "dir:transport/alternative": "Alternatív (Krékpár, Túra)",
-    "dir:transport/pt": "Tömegközlekedés",
-    "title:administrative": "Adminisztratív határok",
-    "title:agriculture": "Mezőgazdaság",
-    "title:culture": "Kultúra",
-    "title:gastro": "Gasztronómia",
-    "title:historic": "Historikus",
-    "title:internet": "Internethozzáférés",
-    "title:military": "Katonai",
-    "title:natural": "Természeti képződmények",
-    "title:other": "Egyéb",
-    "title:phone": "Telefon",
-    "title:places": "Helyek",
-    "title:post": "Posta",
-    "title:power": "Áramellátás",
-    "title:pt_stops": "Megállók és állomások",
-    "title:railway": "Vasút",
-    "title:religion": "Vallás",
-    "title:residential": "Lakóövezetek",
-    "title:shop": "Vásárlás",
-    "title:sport": "Sport",
-    "title:tourism": "Túrizmus"
+    "category:administrative": "Adminisztratív határok",
+    "category:agriculture": "Mezőgazdaság",
+    "category:agriculture_industry": "Mezőgazdaság és ipar",
+    "category:communication": "Kommunikácó",
+    "category:culture": "Kultúra",
+    "category:gastro": "Gasztronómia",
+    "category:historic": "Historikus",
+    "category:internet": "Internethozzáférés",
+    "category:leisure_sport_shopping": "Szabadidő",
+    "category:military": "Katonai",
+    "category:natural": "Természeti képződmények",
+    "category:other": "Egyéb",
+    "category:phone": "Telefon",
+    "category:places": "Helyek",
+    "category:post": "Posta",
+    "category:power": "Áramellátás",
+    "category:pt_stops": "Megállók és állomások",
+    "category:railway": "Vasút",
+    "category:religion": "Vallás",
+    "category:residential": "Lakóövezetek",
+    "category:services": "Szolgáltatás",
+    "category:shop": "Vásárlás",
+    "category:sport": "Sport",
+    "category:tourism": "Túrizmus",
+    "category:transport": "Közlekedés",
+    "category:transport_alternative": "Alternatív (Krékpár, Túra)",
+    "category:transport_pt": "Tömegközlekedés"
 }
diff --git a/lang/it.json b/lang/it.json
index 184e8a2e..646c313f 100644
--- a/lang/it.json
+++ b/lang/it.json
@@ -1,44 +1,42 @@
 {
-    "dir:agriculture_industry": "Agricoltura e industria",
-    "dir:culture": "Cultura e Religione",
-    "dir:leisure": "Tempo libero, sport e shopping",
-    "dir:places": "Luoghi",
-    "dir:services": "Servizi",
-    "dir:services/communication": "Communicazioni",
-    "dir:transport": "Trasporti",
-    "dir:transport/alternative": "Alternativi (bicicletta, camminate, ...)",
-    "dir:transport/car": "Trasporti individuali",
-    "dir:transport/pt": "Trasporti pubblici",
-    "title:administrative": "Suddivisioni amministrative",
-    "title:agriculture": "Agricoltura",
-    "title:alternative_amenities": "Infrastrutture",
-    "title:alternative_routes": "Itinerari segnalati",
-    "title:car_amenities": "Infrastrutture",
-    "title:car_furniture": "Dotazioni stradali",
-    "title:construction": "Cantieri",
-    "title:culture": "Cultura",
-    "title:education": "Istruzione",
-    "title:emergency": "Servizi d'emergenza",
-    "title:financial": "Finanze",
-    "title:gastro": "Gastronomia",
-    "title:health": "Sanità",
-    "title:historic": "Storia",
-    "title:landfill": "Smaltimento",
-    "title:leisure": "Tempo libero",
-    "title:military": "Militare",
-    "title:natural": "Natura",
-    "title:other": "Altri",
-    "title:places": "Luoghi",
-    "title:power": "Energia",
-    "title:pt_amenities": "Infrastrutture",
-    "title:pt_stops": "Stazioni e fermate",
-    "title:public": "Servizi pubblici",
-    "title:railway": "Ferrovie",
-    "title:religion": "Religione",
-    "title:residential": "Aree residenziali",
-    "title:resources": "Areee estrattive",
-    "title:shop": "Acquisti",
-    "title:sport": "Altri sport",
-    "title:tourism": "Turismo",
-    "title:works": "Fabbriche"
+    "category:administrative": "Suddivisioni amministrative",
+    "category:agriculture": "Agricoltura",
+    "category:agriculture_industry": "Agricoltura e industria",
+    "category:alternative_amenities": "Infrastrutture",
+    "category:alternative_routes": "Itinerari segnalati",
+    "category:car_amenities": "Infrastrutture",
+    "category:car_furniture": "Dotazioni stradali",
+    "category:communication": "Communicazioni",
+    "category:construction": "Cantieri",
+    "category:culture": "Cultura",
+    "category:education": "Istruzione",
+    "category:emergency": "Servizi d'emergenza",
+    "category:financial": "Finanze",
+    "category:gastro": "Gastronomia",
+    "category:health": "Sanità",
+    "category:historic": "Storia",
+    "category:landfill": "Smaltimento",
+    "category:leisure": "Tempo libero",
+    "category:leisure_sport_shopping": "Tempo libero, sport e shopping",
+    "category:military": "Militare",
+    "category:natural": "Natura",
+    "category:other": "Altri",
+    "category:places": "Luoghi",
+    "category:power": "Energia",
+    "category:pt_amenities": "Infrastrutture",
+    "category:pt_stops": "Stazioni e fermate",
+    "category:public": "Servizi pubblici",
+    "category:railway": "Ferrovie",
+    "category:religion": "Religione",
+    "category:residential": "Aree residenziali",
+    "category:resources": "Areee estrattive",
+    "category:services": "Servizi",
+    "category:shop": "Acquisti",
+    "category:sport": "Altri sport",
+    "category:tourism": "Turismo",
+    "category:transport": "Trasporti",
+    "category:transport_alternative": "Alternativi (bicicletta, camminate, ...)",
+    "category:transport_car": "Trasporti individuali",
+    "category:transport_pt": "Trasporti pubblici",
+    "category:works": "Fabbriche"
 }
diff --git a/lang/ja.json b/lang/ja.json
index e049c395..1b199e69 100644
--- a/lang/ja.json
+++ b/lang/ja.json
@@ -1,45 +1,43 @@
 {
-    "dir:agriculture_industry": "農業と工業",
-    "dir:culture": "文化と宗教",
-    "dir:leisure": "レジャー",
-    "dir:places": "場所",
-    "dir:services": "サービス",
-    "dir:services/communication": "交流",
-    "dir:transport": "輸送",
-    "dir:transport/alternative": "その他交通 (サイクリング、ハイキング、...)",
-    "dir:transport/car": "個人輸送機関",
-    "dir:transport/pt": "公共輸送",
-    "title:agriculture": "農業",
-    "title:alternative_amenities": "生活環境",
-    "title:alternative_routes": "ルート",
-    "title:car_amenities": "生活環境",
-    "title:car_furniture": "街路設置公共物",
-    "title:construction": "工事中",
-    "title:culture": "文化",
-    "title:education": "教育サービス",
-    "title:emergency": "緊急サービス",
-    "title:financial": "金融",
-    "title:gastro": "食べ物",
-    "title:health": "健康",
-    "title:historic": "記念",
-    "title:internet": "インターネット接続",
-    "title:landfill": "処理場",
-    "title:leisure": "レジャー",
-    "title:military": "軍事",
-    "title:natural": "自然地層",
-    "title:other": "その他",
-    "title:phone": "電話",
-    "title:places": "場所",
-    "title:post": "郵便",
-    "title:power": "電力",
-    "title:pt_amenities": "生活環境",
-    "title:pt_stops": "停留所と駅",
-    "title:public": "公共サービス",
-    "title:railway": "鉄道",
-    "title:religion": "宗教",
-    "title:residential": "住居エリア",
-    "title:shop": "ショッピング",
-    "title:sport": "スポーツ",
-    "title:tourism": "観光",
-    "title:works": "工場"
+    "category:agriculture": "農業",
+    "category:agriculture_industry": "農業と工業",
+    "category:alternative_amenities": "生活環境",
+    "category:alternative_routes": "ルート",
+    "category:car_amenities": "生活環境",
+    "category:car_furniture": "街路設置公共物",
+    "category:communication": "交流",
+    "category:construction": "工事中",
+    "category:culture": "文化",
+    "category:education": "教育サービス",
+    "category:emergency": "緊急サービス",
+    "category:financial": "金融",
+    "category:gastro": "食べ物",
+    "category:health": "健康",
+    "category:historic": "記念",
+    "category:internet": "インターネット接続",
+    "category:landfill": "処理場",
+    "category:leisure": "レジャー",
+    "category:leisure_sport_shopping": "レジャー",
+    "category:military": "軍事",
+    "category:natural": "自然地層",
+    "category:other": "その他",
+    "category:phone": "電話",
+    "category:places": "場所",
+    "category:post": "郵便",
+    "category:power": "電力",
+    "category:pt_amenities": "生活環境",
+    "category:pt_stops": "停留所と駅",
+    "category:public": "公共サービス",
+    "category:railway": "鉄道",
+    "category:religion": "宗教",
+    "category:residential": "住居エリア",
+    "category:services": "サービス",
+    "category:shop": "ショッピング",
+    "category:sport": "スポーツ",
+    "category:tourism": "観光",
+    "category:transport": "輸送",
+    "category:transport_alternative": "その他交通 (サイクリング、ハイキング、...)",
+    "category:transport_car": "個人輸送機関",
+    "category:transport_pt": "公共輸送",
+    "category:works": "工場"
 }
diff --git a/lang/nl.json b/lang/nl.json
index c56e0a0a..8895b44a 100644
--- a/lang/nl.json
+++ b/lang/nl.json
@@ -1,47 +1,45 @@
 {
-    "dir:agriculture_industry": "Landbouw en Industrie",
-    "dir:culture": "Cultuur en Religie",
-    "dir:leisure": "Vrije tijd, Sport en Winkelen",
-    "dir:places": "Plaatsen",
-    "dir:services": "Dienstverlening",
-    "dir:services/communication": "Communicatie",
-    "dir:transport": "Vervoer",
-    "dir:transport/alternative": "Alternatief (Fiets, Wandel, ...)",
-    "dir:transport/car": "Gemotoriseerd individueel verkeer",
-    "dir:transport/pt": "Openbaar vervoer",
-    "title:administrative": "Administratieve gebieden",
-    "title:agriculture": "Landbouw",
-    "title:alternative_amenities": "Voorzieningen",
-    "title:alternative_routes": "Alternatieve routes",
-    "title:car_amenities": "Voorzieningen",
-    "title:car_furniture": "Straatmeubilair",
-    "title:construction": "Bouwterrein",
-    "title:culture": "Cultuur",
-    "title:education": "Onderwijs",
-    "title:emergency": "Hulpdiensten",
-    "title:financial": "Financieel",
-    "title:gastro": "Gastronomie",
-    "title:health": "Gezondheid",
-    "title:historic": "Historisch",
-    "title:internet": "Internettoegang",
-    "title:landfill": "Afvalverwijdering",
-    "title:leisure": "Vrije tijd",
-    "title:military": "Militair",
-    "title:natural": "Natuurlijke Formaties",
-    "title:other": "Andere",
-    "title:phone": "Telefonie",
-    "title:places": "Plaatsen",
-    "title:post": "Post",
-    "title:power": "Stroomvoorziening",
-    "title:pt_amenities": "Voorzieningen",
-    "title:pt_stops": "Haltes en Stations",
-    "title:public": "Openbare diensten",
-    "title:railway": "Spoorwegen",
-    "title:religion": "Religie",
-    "title:residential": "Woongebieden",
-    "title:resources": "Grondstoffenwinning",
-    "title:shop": "Winkelen",
-    "title:sport": "Sport",
-    "title:tourism": "Toerisme",
-    "title:works": "Fabrieken"
+    "category:administrative": "Administratieve gebieden",
+    "category:agriculture": "Landbouw",
+    "category:agriculture_industry": "Landbouw en Industrie",
+    "category:alternative_amenities": "Voorzieningen",
+    "category:alternative_routes": "Alternatieve routes",
+    "category:car_amenities": "Voorzieningen",
+    "category:car_furniture": "Straatmeubilair",
+    "category:communication": "Communicatie",
+    "category:construction": "Bouwterrein",
+    "category:culture": "Cultuur",
+    "category:education": "Onderwijs",
+    "category:emergency": "Hulpdiensten",
+    "category:financial": "Financieel",
+    "category:gastro": "Gastronomie",
+    "category:health": "Gezondheid",
+    "category:historic": "Historisch",
+    "category:internet": "Internettoegang",
+    "category:landfill": "Afvalverwijdering",
+    "category:leisure": "Vrije tijd",
+    "category:leisure_sport_shopping": "Vrije tijd, Sport en Winkelen",
+    "category:military": "Militair",
+    "category:natural": "Natuurlijke Formaties",
+    "category:other": "Andere",
+    "category:phone": "Telefonie",
+    "category:places": "Plaatsen",
+    "category:post": "Post",
+    "category:power": "Stroomvoorziening",
+    "category:pt_amenities": "Voorzieningen",
+    "category:pt_stops": "Haltes en Stations",
+    "category:public": "Openbare diensten",
+    "category:railway": "Spoorwegen",
+    "category:religion": "Religie",
+    "category:residential": "Woongebieden",
+    "category:resources": "Grondstoffenwinning",
+    "category:services": "Dienstverlening",
+    "category:shop": "Winkelen",
+    "category:sport": "Sport",
+    "category:tourism": "Toerisme",
+    "category:transport": "Vervoer",
+    "category:transport_alternative": "Alternatief (Fiets, Wandel, ...)",
+    "category:transport_car": "Gemotoriseerd individueel verkeer",
+    "category:transport_pt": "Openbaar vervoer",
+    "category:works": "Fabrieken"
 }
diff --git a/lang/pl.json b/lang/pl.json
index 63b4e4de..2850481f 100644
--- a/lang/pl.json
+++ b/lang/pl.json
@@ -1,21 +1,20 @@
 {
-    "dir:agriculture_industry": "Rolnictwo i Przemysł",
-    "dir:culture": "Kultura i religia",
-    "dir:leisure": "Wypoczynek, Sport i Zakupy",
-    "dir:places": "Miejsca",
-    "dir:services": "Usługi",
-    "dir:transport": "Transport",
-    "dir:transport/car": "Transport Indywidualny",
-    "dir:transport/pt": "Transport Publiczny",
-    "title:car_furniture": "Elementy drogowe",
-    "title:culture": "Kultura",
-    "title:education": "Edukacyjne",
-    "title:financial": "Finasowe",
-    "title:gastro": "Gastronomia",
-    "title:health": "Zdrowie",
-    "title:historic": "Miejsca Historyczne",
-    "title:pt_amenities": "",
-    "title:pt_stops": "Przystanki i Stacje",
-    "title:shop": "Zakupy",
-    "title:tourism": "Turystyka"
+    "category:agriculture_industry": "Rolnictwo i Przemysł",
+    "category:car_furniture": "Elementy drogowe",
+    "category:culture": "Kultura",
+    "category:education": "Edukacyjne",
+    "category:financial": "Finasowe",
+    "category:gastro": "Gastronomia",
+    "category:health": "Zdrowie",
+    "category:historic": "Miejsca Historyczne",
+    "category:leisure_sport_shopping": "Wypoczynek, Sport i Zakupy",
+    "category:places": "Miejsca",
+    "category:pt_amenities": "",
+    "category:pt_stops": "Przystanki i Stacje",
+    "category:services": "Usługi",
+    "category:shop": "Zakupy",
+    "category:tourism": "Turystyka",
+    "category:transport": "Transport",
+    "category:transport_car": "Transport Indywidualny",
+    "category:transport_pt": "Transport Publiczny"
 }
diff --git a/lang/ro.json b/lang/ro.json
index 1516e3b8..492e3946 100644
--- a/lang/ro.json
+++ b/lang/ro.json
@@ -1,34 +1,32 @@
 {
-    "dir:agriculture_industry": "Agricultura si industrie",
-    "dir:culture": "Cultura si religie",
-    "dir:leisure": "Timp liber, Sport si Cumparaturi",
-    "dir:places": "Locuri",
-    "dir:services": "Servicii",
-    "dir:services/communication": "Comunicatii",
-    "dir:transport": "Transport",
-    "dir:transport/alternative": "Alternativ(Bicicleta,Drumetii)",
-    "dir:transport/car": "Trafic individual",
-    "dir:transport/pt": "Transport public",
-    "title:administrative": "Zona administrativa",
-    "title:agriculture": "Agricultura",
-    "title:culture": "Cultura",
-    "title:education": "Servicii educatie",
-    "title:emergency": "Servicii urgenta",
-    "title:financial": "Financiar",
-    "title:gastro": "Gastronomie",
-    "title:health": "Sanatate",
-    "title:historic": "Istoric",
-    "title:internet": "Acces internet",
-    "title:leisure": "Timp liber",
-    "title:military": "Militar",
-    "title:other": "Altele",
-    "title:phone": "Telefon",
-    "title:places": "Locuri",
-    "title:playgrounds": "Loc de joaca",
-    "title:power": "Energie",
-    "title:public": "Servicii publice",
-    "title:religion": "Religie",
-    "title:residential": "Zona rezidentiala",
-    "title:shop": "Cumpărături",
-    "title:tourism": "Turism"
+    "category:administrative": "Zona administrativa",
+    "category:agriculture": "Agricultura",
+    "category:agriculture_industry": "Agricultura si industrie",
+    "category:communication": "Comunicatii",
+    "category:culture": "Cultura",
+    "category:education": "Servicii educatie",
+    "category:emergency": "Servicii urgenta",
+    "category:financial": "Financiar",
+    "category:gastro": "Gastronomie",
+    "category:health": "Sanatate",
+    "category:historic": "Istoric",
+    "category:internet": "Acces internet",
+    "category:leisure": "Timp liber",
+    "category:leisure_sport_shopping": "Timp liber, Sport si Cumparaturi",
+    "category:military": "Militar",
+    "category:other": "Altele",
+    "category:phone": "Telefon",
+    "category:places": "Locuri",
+    "category:playgrounds": "Loc de joaca",
+    "category:power": "Energie",
+    "category:public": "Servicii publice",
+    "category:religion": "Religie",
+    "category:residential": "Zona rezidentiala",
+    "category:services": "Servicii",
+    "category:shop": "Cumpărături",
+    "category:tourism": "Turism",
+    "category:transport": "Transport",
+    "category:transport_alternative": "Alternativ(Bicicleta,Drumetii)",
+    "category:transport_car": "Trafic individual",
+    "category:transport_pt": "Transport public"
 }
diff --git a/lang/ru.json b/lang/ru.json
index 5ee096f2..0510edef 100644
--- a/lang/ru.json
+++ b/lang/ru.json
@@ -1,44 +1,42 @@
 {
-    "dir:agriculture_industry": "Сельское хозяйство и промышленность",
-    "dir:culture": "Культура и религия",
-    "dir:leisure": "Досуг",
-    "dir:places": "Места",
-    "dir:services": "Услуги",
-    "dir:services/communication": "Услуги связи",
-    "dir:transport": "Транспорт",
-    "dir:transport/alternative": "Альтернативное передвижение (Велоспорт, Пешие прогулки, ...)",
-    "dir:transport/car": "Частный транспорт",
-    "dir:transport/pt": "Общественный транспорт",
-    "title:administrative": "Административные границы",
-    "title:agriculture": "Сельское хозяйство",
-    "title:alternative_amenities": "Полезные места",
-    "title:alternative_routes": "Маршруты",
-    "title:car_amenities": "Обслуживание транспорта",
-    "title:car_furniture": "Элементы дороги",
-    "title:construction": "Места строительства",
-    "title:culture": "Культура",
-    "title:education": "Образование",
-    "title:emergency": "Экстренные службы",
-    "title:financial": "Финансы",
-    "title:gastro": "Общепит",
-    "title:health": "Медицина",
-    "title:historic": "Историческое",
-    "title:landfill": "Переработка отходов",
-    "title:leisure": "Досуг",
-    "title:military": "Вооружённые силы",
-    "title:natural": "Природные образования",
-    "title:other": "Прочее",
-    "title:places": "Места",
-    "title:power": "Энергетика",
-    "title:pt_amenities": "Транспортные принадлежности",
-    "title:pt_stops": "Остановки и станции",
-    "title:public": "Общественные места",
-    "title:railway": "Железные дороги",
-    "title:religion": "Религия",
-    "title:residential": "Жилые районы",
-    "title:resources": "Добыча ресурсов",
-    "title:shop": "Покупки",
-    "title:sport": "Спорт",
-    "title:tourism": "Туризм",
-    "title:works": "Промышленность"
+    "category:administrative": "Административные границы",
+    "category:agriculture": "Сельское хозяйство",
+    "category:agriculture_industry": "Сельское хозяйство и промышленность",
+    "category:alternative_amenities": "Полезные места",
+    "category:alternative_routes": "Маршруты",
+    "category:car_amenities": "Обслуживание транспорта",
+    "category:car_furniture": "Элементы дороги",
+    "category:communication": "Услуги связи",
+    "category:construction": "Места строительства",
+    "category:culture": "Культура",
+    "category:education": "Образование",
+    "category:emergency": "Экстренные службы",
+    "category:financial": "Финансы",
+    "category:gastro": "Общепит",
+    "category:health": "Медицина",
+    "category:historic": "Историческое",
+    "category:landfill": "Переработка отходов",
+    "category:leisure": "Досуг",
+    "category:leisure_sport_shopping": "Досуг",
+    "category:military": "Вооружённые силы",
+    "category:natural": "Природные образования",
+    "category:other": "Прочее",
+    "category:places": "Места",
+    "category:power": "Энергетика",
+    "category:pt_amenities": "Транспортные принадлежности",
+    "category:pt_stops": "Остановки и станции",
+    "category:public": "Общественные места",
+    "category:railway": "Железные дороги",
+    "category:religion": "Религия",
+    "category:residential": "Жилые районы",
+    "category:resources": "Добыча ресурсов",
+    "category:services": "Услуги",
+    "category:shop": "Покупки",
+    "category:sport": "Спорт",
+    "category:tourism": "Туризм",
+    "category:transport": "Транспорт",
+    "category:transport_alternative": "Альтернативное передвижение (Велоспорт, Пешие прогулки, ...)",
+    "category:transport_car": "Частный транспорт",
+    "category:transport_pt": "Общественный транспорт",
+    "category:works": "Промышленность"
 }
diff --git a/lang/template.json b/lang/template.json
index 9fdd1714..8ef7a79e 100644
--- a/lang/template.json
+++ b/lang/template.json
@@ -1,33 +1,32 @@
 {
-    "dir:agriculture_industry": "",
-    "dir:leisure": "",
-    "dir:places": "",
-    "dir:transport": "",
-    "dir:transportalternative": "",
-    "dir:transportpt": "",
-    "title:administrative": "",
-    "title:alternative_amenities": "",
-    "title:alternative_routes": "",
-    "title:car_amenities": "",
-    "title:car_furniture": "",
-    "title:car_routes": "",
-    "title:culture": "",
-    "title:gastro": "",
-    "title:historic": "",
-    "title:internet": "",
-    "title:leisure": "",
-    "title:natural": "",
-    "title:other": "",
-    "title:places": "",
-    "title:playgrounds": "",
-    "title:pt-stops": "",
-    "title:pt_amenities": "",
-    "title:pt_routes": "",
-    "title:railway": "",
-    "title:religion": "",
-    "title:residential": "",
-    "title:restaurants": "",
-    "title:shop": "",
-    "title:sport": "",
-    "title:tourism": ""
+    "category:administrative": "",
+    "category:agriculture_industry": "",
+    "category:alternative_amenities": "",
+    "category:alternative_routes": "",
+    "category:car_amenities": "",
+    "category:car_furniture": "",
+    "category:car_routes": "",
+    "category:culture": "",
+    "category:gastro": "",
+    "category:historic": "",
+    "category:internet": "",
+    "category:leisure": "",
+    "category:leisure_sport_shopping": "",
+    "category:natural": "",
+    "category:other": "",
+    "category:places": "",
+    "category:playgrounds": "",
+    "category:pt-stops": "",
+    "category:pt_amenities": "",
+    "category:pt_routes": "",
+    "category:railway": "",
+    "category:religion": "",
+    "category:residential": "",
+    "category:restaurants": "",
+    "category:shop": "",
+    "category:sport": "",
+    "category:tourism": "",
+    "category:transport": "",
+    "category:transportalternative": "",
+    "category:transportpt": ""
 }
diff --git a/lang/tr.json b/lang/tr.json
index 92c7d21d..2324df8c 100644
--- a/lang/tr.json
+++ b/lang/tr.json
@@ -1,3 +1,3 @@
 {
-    "dir:transport": "Toplu Taşıma"
-}
\ No newline at end of file
+    "category:transport": "Toplu Taşıma"
+}
diff --git a/lang/uk.json b/lang/uk.json
index 9985528b..b8d54116 100644
--- a/lang/uk.json
+++ b/lang/uk.json
@@ -1,36 +1,34 @@
 {
-    "dir:agriculture_industry": "Сільське господартво та промисловість",
-    "dir:culture": "Культура",
-    "dir:leisure": "Дозвілля",
-    "dir:places": "Places",
-    "dir:services": "Послуги",
-    "dir:services/communication": "Телекомунікації",
-    "dir:transport": "Транспорт",
-    "dir:transport/alternative": "Інші (Велосипедні, піші, ...)",
-    "dir:transport/car": "Приватний транспорт",
-    "dir:transport/pt": "Громадський транспорт",
-    "title:alternative_amenities": "Amenities",
-    "title:alternative_routes": "Маршрути",
-    "title:car_amenities": "Amenities",
-    "title:car_furniture": "Street Furniture",
-    "title:culture": "Культура ",
-    "title:education": "Освіта",
-    "title:emergency": "Швидка допомога",
-    "title:financial": "Фінанси",
-    "title:gastro": "Гастрономія",
-    "title:health": "Здоров'я",
-    "title:historic": "Історія",
-    "title:leisure": "Дозвілля",
-    "title:natural": "Природне середовище",
-    "title:other": "Інше",
-    "title:places": "Місцевість",
-    "title:playgrounds": "Дитячий майданчик",
-    "title:pt_amenities": "Amenities",
-    "title:pt_stops": "Зупинки та станції",
-    "title:public": "Громадські місця",
-    "title:religion": "Релігія",
-    "title:residential": "Житлова зона",
-    "title:shop": "Торгівля",
-    "title:sport": "Спорт. Інше.",
-    "title:tourism": "Туризм"
+    "category:agriculture_industry": "Сільське господартво та промисловість",
+    "category:alternative_amenities": "Amenities",
+    "category:alternative_routes": "Маршрути",
+    "category:car_amenities": "Amenities",
+    "category:car_furniture": "Street Furniture",
+    "category:communication": "Телекомунікації",
+    "category:culture": "Культура ",
+    "category:education": "Освіта",
+    "category:emergency": "Швидка допомога",
+    "category:financial": "Фінанси",
+    "category:gastro": "Гастрономія",
+    "category:health": "Здоров'я",
+    "category:historic": "Історія",
+    "category:leisure": "Дозвілля",
+    "category:leisure_sport_shopping": "Дозвілля",
+    "category:natural": "Природне середовище",
+    "category:other": "Інше",
+    "category:places": "Місцевість",
+    "category:playgrounds": "Дитячий майданчик",
+    "category:pt_amenities": "Amenities",
+    "category:pt_stops": "Зупинки та станції",
+    "category:public": "Громадські місця",
+    "category:religion": "Релігія",
+    "category:residential": "Житлова зона",
+    "category:services": "Послуги",
+    "category:shop": "Торгівля",
+    "category:sport": "Спорт. Інше.",
+    "category:tourism": "Туризм",
+    "category:transport": "Транспорт",
+    "category:transport_alternative": "Інші (Велосипедні, піші, ...)",
+    "category:transport_car": "Приватний транспорт",
+    "category:transport_pt": "Громадський транспорт"
 }