diff --git a/lang/ast.json b/lang/ast.json
index 29f4518..1a96c74 100644
--- a/lang/ast.json
+++ b/lang/ast.json
@@ -1,26 +1,38 @@
 {
+    "category:historic": "Hestoria",
+    "category:leisure_sport_shopping": "Recréu, deportes y compres",
+    "category:services": "Servicios",
+    "category:transport": "Tresporte",
+    "category:transport_pt": "Tresporte Públicu",
+    "category:transport_car": "Tráficu individual",
+    "category:railway": "Ferrocarril",
+    "category:internet": "Accesu a Internet",
+    "category:leisure": "Recréu",
+    "category:military": "Militar",
     "category:natural": "Formaciones naturales",
     "category:other": "Otres",
     "category:phone": "Teléfonos",
     "category:places": "Llugares",
     "category:places_geo": "Llugares",
-    "category:military": "Militar",
     "category:playgrounds": "Xuegos infantiles",
     "category:post": "Corréu",
     "category:pt:stops": "Paraes y estaciones",
     "category:pt_amenities": "Infraestructures",
     "category:public": "Serviciu Públicu",
     "category:religion": "Relixón",
-    "category:residential": "Zones residenciales",
-    "category:resources": "Estraición de recursos",
     "category:shop": "Compres",
     "category:sport": "Deportes",
     "category:tourism_attractions": "Turismu",
     "category:tourism_services": "Turismu",
+    "category:transport_alternative": "Alternativu (Ciclismu, senderismu, ...)",
+    "category:waste": "Basures",
+    "category:works": "Fábriques",
     "category:administrative": "Divisiones Alministratives",
     "category:agriculture": "Agricultura",
     "category:alternative_amenities": "Infraestructures",
     "category:alternative_routes": "Rutes",
+    "category:resources": "Estraición de recursos",
+    "category:residential": "Zones residenciales",
     "category:car_amenities": "Infraestructures",
     "category:car_furniture": "Acondicionamientu urbanu",
     "category:communication": "Comunicaciones",
@@ -33,18 +45,6 @@
     "category:financial": "Dineru",
     "category:gastro": "Gastronomía",
     "category:health": "Salú",
-    "category:historic": "Hestoria",
-    "category:leisure_sport_shopping": "Recréu, deportes y compres",
-    "category:services": "Servicios",
-    "category:transport": "Tresporte",
-    "category:transport_pt": "Tresporte Públicu",
-    "category:transport_car": "Tráficu individual",
-    "category:railway": "Ferrocarril",
-    "category:internet": "Accesu a Internet",
-    "category:leisure": "Recréu",
-    "category:waste": "Basures",
-    "category:works": "Fábriques",
-    "category:transport_alternative": "Alternativu (Ciclismu, senderismu, ...)",
     "category:buildings": "",
     "category:buildings-entrances": "",
     "category:buildings-figure-ground": "",
diff --git a/lang/ca.json b/lang/ca.json
index 12a6947..21a8940 100644
--- a/lang/ca.json
+++ b/lang/ca.json
@@ -1,5 +1,25 @@
 {
+    "category:historic": "Històric",
+    "category:index": "Índex de Categories",
+    "category:leisure_sport_shopping": "Oci, esport i compres",
+    "category:services": "Serveis",
+    "category:transport": "Transport",
+    "category:transport_walk": "Caminar",
+    "category:transport_cycle": "Ciclisme",
+    "category:transport_pt": "Transport Públic",
+    "category:transport_car": "Trànsit Individual",
+    "category:infrastructure": "Infraestructura",
+    "category:developments": "Planificació i Construcció",
+    "category:energy": "Energia",
+    "category:railway": "Via fèrria",
+    "category:special": "Especial",
+    "category:osm-qa": "Control de Qualitat d'OpenStreetMap",
+    "category:internet": "Accés a Internet",
+    "category:kerbs": "Voreres",
     "category:law": "Llei",
+    "category:leisure": "Oci",
+    "category:memorial": "Memorials i Monuments",
+    "category:military": "Militar",
     "category:mtb-routes": "Rutes Ciclistes de Muntanya",
     "category:natural": "Formacions Naturals",
     "category:office": "Oficines",
@@ -14,31 +34,35 @@
     "category:phone": "Telèfon",
     "category:places": "Llocs",
     "category:places_geo": "Llocs",
-    "category:military": "Militar",
     "category:playgrounds": "Parc infantil",
-    "category:power_routes": "Rutes d'energia",
     "category:post": "Correus",
+    "category:power_routes": "Rutes d'energia",
     "category:proposals": "Propostes",
     "category:pt": "Mapa de transport públic",
     "category:pt:stops": "Parades i Estacions",
     "category:pt:routes": "Rutes",
     "category:pt_amenities": "Serveis",
-    "category:railway-electrification": "Electrificació de la via fèrria",
     "category:public": "Serveis Públics",
+    "category:railway-electrification": "Electrificació de la via fèrria",
     "category:railway-gauge": "Ample de via fèrria",
     "category:railway-infrastructure": "Infraestructura fèrria",
     "category:railway-maxspeed": "Velocitat màxima de la via fèrria",
     "category:railway-routes": "Rutes Fèrries",
-    "category:renewables": "Renovables",
     "category:religion": "Religió",
-    "category:residential": "Àrees Residencials",
-    "category:resources": "Extracció de Recursos",
     "category:roads": "Carreteres",
     "category:shop": "Compres",
     "category:sport": "Esport",
-    "category:tourism_attractions": "Turisme",
     "category:swimming_bathing": "Natació i bany",
+    "category:tourism_attractions": "Turisme",
     "category:tourism_services": "Turisme",
+    "category:transport_alternative": "Modes Alternatius de Transport",
+    "category:walk_amenities": "Serveis",
+    "category:walk_amenities_qa": "Serveis per a peatons",
+    "category:waste": "Deixalles",
+    "category:water": "Cossos d'aigua",
+    "category:wikipedia": "Viquipèdia",
+    "category:works": "Treballs",
+    "category:xmas": "Nadal",
     "category:administrative": "Àrees Administratives",
     "category:agriculture": "Agricultura",
     "category:alternative_amenities": "Serveis",
@@ -47,6 +71,9 @@
     "category:buildings-figure-ground": "Mapa a peu de carrer",
     "category:buildings-height": "Alçada de l'edifici",
     "category:buildings-start_date": "Antiguitat de l'edifici",
+    "category:resources": "Extracció de Recursos",
+    "category:residential": "Àrees Residencials",
+    "category:renewables": "Renovables",
     "category:buildings-type": "Tipologies d'edificació",
     "category:buildings": "Edificis",
     "category:car_amenities": "Serveis",
@@ -76,32 +103,5 @@
     "category:gastro": "Gastronomia",
     "category:health": "Sanitat",
     "category:heritage": "Protecció del Patrimoni",
-    "category:hiking_routes": "Rutes Excursionistes",
-    "category:historic": "Històric",
-    "category:index": "Índex de Categories",
-    "category:leisure_sport_shopping": "Oci, esport i compres",
-    "category:services": "Serveis",
-    "category:transport": "Transport",
-    "category:transport_walk": "Caminar",
-    "category:transport_cycle": "Ciclisme",
-    "category:transport_pt": "Transport Públic",
-    "category:transport_car": "Trànsit Individual",
-    "category:infrastructure": "Infraestructura",
-    "category:developments": "Planificació i Construcció",
-    "category:energy": "Energia",
-    "category:railway": "Via fèrria",
-    "category:special": "Especial",
-    "category:osm-qa": "Control de Qualitat d'OpenStreetMap",
-    "category:internet": "Accés a Internet",
-    "category:kerbs": "Voreres",
-    "category:leisure": "Oci",
-    "category:walk_amenities_qa": "Serveis per a peatons",
-    "category:waste": "Deixalles",
-    "category:water": "Cossos d'aigua",
-    "category:wikipedia": "Viquipèdia",
-    "category:works": "Treballs",
-    "category:xmas": "Nadal",
-    "category:memorial": "Memorials i Monuments",
-    "category:walk_amenities": "Serveis",
-    "category:transport_alternative": "Modes Alternatius de Transport"
+    "category:hiking_routes": "Rutes Excursionistes"
 }
diff --git a/lang/cs.json b/lang/cs.json
index d95b023..900f794 100644
--- a/lang/cs.json
+++ b/lang/cs.json
@@ -1,5 +1,22 @@
 {
+    "category:historic": "Historické",
+    "category:index": "Rejstřík kategorií",
+    "category:leisure_sport_shopping": "Volný čas, sporty a nákupy",
+    "category:services": "Služby",
+    "category:transport": "Doprava",
+    "category:transport_walk": "Turistika",
+    "category:transport_cycle": "Cyklistika",
+    "category:transport_pt": "Veřejná doprava",
+    "category:transport_car": "Individuální doprava",
+    "category:infrastructure": "Infrastruktura",
+    "category:energy": "Energie",
+    "category:railway": "Železnice",
+    "category:special": "Speciální",
+    "category:internet": "Přístup k internetu",
     "category:law": "Právo",
+    "category:leisure": "Volný čas",
+    "category:memorial": "Památníky a pomníky",
+    "category:military": "Vojenské",
     "category:mtb-routes": "Stezky pro horská kola",
     "category:natural": "Přírodní úkazy",
     "category:office": "Úřady",
@@ -10,30 +27,33 @@
     "category:phone": "Telefony",
     "category:places": "Sídla",
     "category:places_geo": "Sídla",
-    "category:military": "Vojenské",
     "category:playgrounds": "Hřiště",
-    "category:power_routes": "Stožáry vysokého napětí",
     "category:post": "Poštovní služby",
+    "category:power_routes": "Stožáry vysokého napětí",
     "category:pt": "Mapa veřejné dopravy",
     "category:pt:stops": "Zastávky & Stanice",
     "category:pt:routes": "Trasy",
     "category:pt_amenities": "Občanská vybavenost",
-    "category:railway-electrification": "Elektrifikovaná železnice",
     "category:public": "Veřejné služby",
+    "category:railway-electrification": "Elektrifikovaná železnice",
     "category:railway-gauge": "Rozchod železnice",
     "category:railway-infrastructure": "Železniční infrastruktura",
     "category:railway-maxspeed": "Maximální rychlost železnice",
     "category:railway-routes": "Železniční trasy",
-    "category:renewables": "Obnovitelné zdroje",
     "category:religion": "Náboženství",
-    "category:residential": "Obytné oblasti",
-    "category:resources": "Těžba surovin",
     "category:roads": "Silnice",
     "category:shop": "Obchody",
     "category:sport": "Sport",
-    "category:tourism_attractions": "Turistika",
     "category:swimming_bathing": "Koupání",
+    "category:tourism_attractions": "Turistika",
     "category:tourism_services": "Turistika",
+    "category:transport_alternative": "Alternativní doprava (Cyklistika, Pěší turistika, ...)",
+    "category:walk_amenities": "Veřejná zařízení",
+    "category:waste": "Nakládání s odpady",
+    "category:water": "Vodní plochy",
+    "category:wikipedia": "Wikipedie",
+    "category:works": "Továrny",
+    "category:xmas": "Vánoce",
     "category:administrative": "Administrativní oblasti",
     "category:agriculture": "Zemědělství",
     "category:alternative_amenities": "Občanská vybavenost",
@@ -42,6 +62,9 @@
     "category:buildings-figure-ground": "Schematický diagram",
     "category:buildings-height": "Výška budovy",
     "category:buildings-start_date": "Stáří budovy",
+    "category:resources": "Těžba surovin",
+    "category:residential": "Obytné oblasti",
+    "category:renewables": "Obnovitelné zdroje",
     "category:buildings-type": "typy budov",
     "category:buildings": "Budovy",
     "category:car_amenities": "Občasnká vybavenost",
@@ -66,29 +89,6 @@
     "category:gastro": "Stravování",
     "category:health": "Zdravotnictví",
     "category:hiking_routes": "Turistické trasy",
-    "category:historic": "Historické",
-    "category:index": "Rejstřík kategorií",
-    "category:leisure_sport_shopping": "Volný čas, sporty a nákupy",
-    "category:services": "Služby",
-    "category:transport": "Doprava",
-    "category:transport_walk": "Turistika",
-    "category:transport_cycle": "Cyklistika",
-    "category:transport_pt": "Veřejná doprava",
-    "category:transport_car": "Individuální doprava",
-    "category:infrastructure": "Infrastruktura",
-    "category:energy": "Energie",
-    "category:railway": "Železnice",
-    "category:special": "Speciální",
-    "category:internet": "Přístup k internetu",
-    "category:leisure": "Volný čas",
-    "category:waste": "Nakládání s odpady",
-    "category:water": "Vodní plochy",
-    "category:wikipedia": "Wikipedie",
-    "category:works": "Továrny",
-    "category:xmas": "Vánoce",
-    "category:memorial": "Památníky a pomníky",
-    "category:walk_amenities": "Veřejná zařízení",
-    "category:transport_alternative": "Alternativní doprava (Cyklistika, Pěší turistika, ...)",
     "category:culture-media": "",
     "category:cycle_directions": "",
     "category:developable_areas": "",
diff --git a/lang/de.json b/lang/de.json
index 217ada4..8ab4679 100644
--- a/lang/de.json
+++ b/lang/de.json
@@ -1,10 +1,4 @@
 {
-    "category:wikipedia": "Wikipedia",
-    "category:gastro-smoking": "Rauchfreie Gastronomie",
-    "category:gastro": "Gastronomie",
-    "category:health": "Gesundheitsdienste",
-    "category:heritage": "Denkmalschutz",
-    "category:hiking_routes": "Wanderrouten",
     "category:historic": "Geschichte",
     "category:leisure_sport_shopping": "Freizeit, Sport und Einkauf",
     "category:services": "Dienste",
@@ -46,12 +40,18 @@
     "category:railway-maxspeed": "Eisenbahn Höchstgeschwindigkeiten",
     "category:railway-routes": "Eisenbahnrouten",
     "category:religion": "Religion",
-    "category:renewables": "Erneuerbare Energien",
-    "category:residential": "Wohngebiete",
-    "category:resources": "Ressourcengewinnung",
     "category:roads": "Straßen",
     "category:shop": "Einkauf",
     "category:sport": "Sport",
+    "category:swimming_bathing": "Schwimmen und Baden",
+    "category:tourism_attractions": "Tourismus",
+    "category:tourism_services": "Tourismus",
+    "category:walk_amenities": "Einrichtungen",
+    "category:waste": "Entsorgung",
+    "category:water": "Gewässer",
+    "category:wikipedia": "Wikipedia",
+    "category:works": "Fabriken",
+    "category:xmas": "Weihnachten",
     "category:administrative": "Administrative Gebiete",
     "category:agriculture": "Landwirtschaft",
     "category:alternative_amenities": "Einrichtungen",
@@ -60,6 +60,9 @@
     "category:buildings-figure-ground": "Schwarzplan",
     "category:buildings-height": "Gebäudehöhen",
     "category:buildings-start_date": "Gebäudealter",
+    "category:resources": "Ressourcengewinnung",
+    "category:residential": "Wohngebiete",
+    "category:renewables": "Erneuerbare Energien",
     "category:buildings-type": "Gebäudearten",
     "category:buildings": "Gebäude",
     "category:car_amenities": "Einrichtungen",
@@ -68,14 +71,6 @@
     "category:car_routes": "Autorouten",
     "category:children": "Einrichtungen für Kinder",
     "category:climbing": "Klettern",
-    "category:tourism_services": "Tourismus",
-    "category:walk_amenities": "Einrichtungen",
-    "category:waste": "Entsorgung",
-    "category:water": "Gewässer",
-    "category:works": "Fabriken",
-    "category:xmas": "Weihnachten",
-    "category:swimming_bathing": "Schwimmen und Baden",
-    "category:tourism_attractions": "Tourismus",
     "category:coal": "Kohle",
     "category:communication": "Kommunikation",
     "category:construction": "Baustellen",
@@ -89,6 +84,11 @@
     "category:electric_power": "Elektrischer Strom",
     "category:emergency": "Notfalldienste",
     "category:financial": "Finanzen",
+    "category:gastro-smoking": "Rauchfreie Gastronomie",
+    "category:gastro": "Gastronomie",
+    "category:health": "Gesundheitsdienste",
+    "category:heritage": "Denkmalschutz",
+    "category:hiking_routes": "Wanderrouten",
     "category:culture-media": "",
     "category:developable_areas": "",
     "category:developments": "",
diff --git a/lang/el.json b/lang/el.json
index 903e5cd..4bf5a34 100644
--- a/lang/el.json
+++ b/lang/el.json
@@ -1,6 +1,4 @@
 {
-    "category:gastro": "Γαστρονομία",
-    "category:health": "Υγεία",
     "category:historic": "Ιστορικά",
     "category:leisure_sport_shopping": "Αναψυχή, Αθλητισμός και Αγορές",
     "category:services": "Υπηρεσίες",
@@ -14,20 +12,22 @@
     "category:pt:stops": "Στάσεις & Σταθμοί",
     "category:public": "Δημόσιες Υπηρεσίες",
     "category:religion": "Θρησκεία",
-    "category:residential": "Περιοχές Κατοικίας",
     "category:shop": "Αγορές",
     "category:sport": "Άθληση",
-    "category:administrative": "Διοικητικά Όρια",
-    "category:agriculture": "Γεωργία",
-    "category:tourism_services": "Τουρισμός",
     "category:tourism_attractions": "Τουρισμός",
+    "category:tourism_services": "Τουρισμός",
     "category:transport_alternative": "Εναλλακτικά (ποδηλασία, ορειβασία,...)",
+    "category:administrative": "Διοικητικά Όρια",
+    "category:agriculture": "Γεωργία",
+    "category:residential": "Περιοχές Κατοικίας",
     "category:communication": "Επικοινωνίες",
     "category:culture": "Πολιτισμός",
     "category:culture_religion": "Πολιτισμός",
     "category:education": "Υπηρεσίες Εκπαίδευσης",
     "category:emergency": "Υπηρεσίες Έκτακτης Ανάγκης",
     "category:financial": "Χρήμα",
+    "category:gastro": "Γαστρονομία",
+    "category:health": "Υγεία",
     "category:alternative_amenities": "",
     "category:alternative_routes": "",
     "category:buildings": "",
diff --git a/lang/en.json b/lang/en.json
index 8278df2..07f7664 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -1,11 +1,4 @@
 {
-    "category:wikipedia": "Wikipedia",
-    "category:footways": "Footways",
-    "category:gastro-smoking": "Smokefree Gastronomy",
-    "category:gastro": "Gastronomy",
-    "category:health": "Health",
-    "category:heritage": "Heritage Protection",
-    "category:hiking_routes": "Hiking routes",
     "category:historic": "Historic",
     "category:index": "Index of Categories",
     "category:leisure_sport_shopping": "Leisure, Sport and Shopping",
@@ -56,13 +49,20 @@
     "category:railway-maxspeed": "Railway Maxspeed",
     "category:railway-routes": "Railway Routes",
     "category:religion": "Religion",
-    "category:renewables": "Renewables",
-    "category:residential": "Residential Areas",
-    "category:resources": "Resource Extraction",
     "category:roads": "Roads",
     "category:shop": "Shopping",
     "category:sport": "Sport",
-    "category:fixme": "Fix Me",
+    "category:swimming_bathing": "Swimming and bathing",
+    "category:tourism_attractions": "Tourism",
+    "category:tourism_services": "Tourism",
+    "category:transport_alternative": "Alternative Transportation modes",
+    "category:walk_amenities": "Amenities",
+    "category:walk_amenities_qa": "Walking Amenities",
+    "category:waste": "Disposal",
+    "category:water": "Waterbodies",
+    "category:wikipedia": "Wikipedia",
+    "category:works": "Works",
+    "category:xmas": "Christmas",
     "category:administrative": "Administrative Areas",
     "category:agriculture": "Agriculture",
     "category:alternative_amenities": "Amenities",
@@ -71,6 +71,9 @@
     "category:buildings-figure-ground": "Figure-ground diagram",
     "category:buildings-height": "Building height",
     "category:buildings-start_date": "Building age",
+    "category:resources": "Resource Extraction",
+    "category:residential": "Residential Areas",
+    "category:renewables": "Renewables",
     "category:buildings-type": "Building types",
     "category:buildings": "Buildings",
     "category:car_amenities": "Amenities",
@@ -79,16 +82,6 @@
     "category:car_routes": "Car routes",
     "category:children": "Children amenities",
     "category:climbing": "Climbing",
-    "category:tourism_services": "Tourism",
-    "category:walk_amenities": "Amenities",
-    "category:walk_amenities_qa": "Walking Amenities",
-    "category:waste": "Disposal",
-    "category:water": "Waterbodies",
-    "category:works": "Works",
-    "category:xmas": "Christmas",
-    "category:swimming_bathing": "Swimming and bathing",
-    "category:tourism_attractions": "Tourism",
-    "category:transport_alternative": "Alternative Transportation modes",
     "category:coal": "Coal",
     "category:communication": "Communication",
     "category:construction": "Construction Sites",
@@ -103,5 +96,12 @@
     "category:education": "Educational Services",
     "category:electric_power": "Electric Power",
     "category:emergency": "Emergency Services",
-    "category:financial": "Financial"
+    "category:financial": "Financial",
+    "category:fixme": "Fix Me",
+    "category:footways": "Footways",
+    "category:gastro-smoking": "Smokefree Gastronomy",
+    "category:gastro": "Gastronomy",
+    "category:health": "Health",
+    "category:heritage": "Heritage Protection",
+    "category:hiking_routes": "Hiking routes"
 }
diff --git a/lang/es.json b/lang/es.json
index 36b7d2e..d6c1e96 100644
--- a/lang/es.json
+++ b/lang/es.json
@@ -1,9 +1,4 @@
 {
-    "category:wikipedia": "Wikipedia",
-    "category:gastro-smoking": "Gastronomía libre de humo",
-    "category:gastro": "Gastronomía",
-    "category:health": "Salud",
-    "category:hiking_routes": "Rutas de senderismo",
     "category:historic": "Histórico",
     "category:index": "Índice de Categorías",
     "category:leisure_sport_shopping": "Ocio, deporte y compras",
@@ -46,12 +41,19 @@
     "category:railway-maxspeed": "Velocidad máxima del ferrocarril",
     "category:railway-routes": "Rutas de ferrocarril",
     "category:religion": "Religión",
-    "category:renewables": "Renovables",
-    "category:residential": "Áreas residenciales",
-    "category:resources": "Extracción de recursos",
     "category:roads": "Carreteras",
     "category:shop": "Compras",
     "category:sport": "Deportes",
+    "category:swimming_bathing": "Natación y baño",
+    "category:tourism_attractions": "Turismo",
+    "category:tourism_services": "Turismo",
+    "category:transport_alternative": "Modos de transporte alternativo",
+    "category:walk_amenities": "Instalaciones",
+    "category:waste": "Basura",
+    "category:water": "Cuerpos de agua",
+    "category:wikipedia": "Wikipedia",
+    "category:works": "Fábricas",
+    "category:xmas": "Navidades",
     "category:administrative": "Áreas Administrativas",
     "category:agriculture": "Agricultura",
     "category:alternative_amenities": "Instalaciones",
@@ -60,6 +62,9 @@
     "category:buildings-figure-ground": "Diagrama figura-fondo",
     "category:buildings-height": "Altura del edificio",
     "category:buildings-start_date": "Edad del edificio",
+    "category:resources": "Extracción de recursos",
+    "category:residential": "Áreas residenciales",
+    "category:renewables": "Renovables",
     "category:buildings-type": "Tipos de edificio",
     "category:buildings": "Edificios",
     "category:car_amenities": "Instalaciones",
@@ -67,15 +72,6 @@
     "category:car_maxspeed": "Velocidad máxima",
     "category:car_routes": "Rutas de coche",
     "category:children": "Instalaciones para niños",
-    "category:tourism_services": "Turismo",
-    "category:walk_amenities": "Instalaciones",
-    "category:waste": "Basura",
-    "category:water": "Cuerpos de agua",
-    "category:works": "Fábricas",
-    "category:xmas": "Navidades",
-    "category:swimming_bathing": "Natación y baño",
-    "category:tourism_attractions": "Turismo",
-    "category:transport_alternative": "Modos de transporte alternativo",
     "category:coal": "Carbón",
     "category:communication": "Comunicación",
     "category:construction": "Sitios de construcción",
@@ -88,6 +84,10 @@
     "category:electric_power": "Energía eléctrica",
     "category:emergency": "Servicios de emergencia",
     "category:financial": "Financiera",
+    "category:gastro-smoking": "Gastronomía libre de humo",
+    "category:gastro": "Gastronomía",
+    "category:health": "Salud",
+    "category:hiking_routes": "Rutas de senderismo",
     "category:climbing": "",
     "category:culture-media": "",
     "category:cycle_directions": "",
diff --git a/lang/et.json b/lang/et.json
index a3feb24..34ca083 100644
--- a/lang/et.json
+++ b/lang/et.json
@@ -12,13 +12,13 @@
     "category:playgrounds": "Mänguväljak",
     "category:public": "Kommunaalteenused",
     "category:religion": "Religioon",
-    "category:residential": "Elamupiirkonnad",
     "category:shop": "Ostmine",
-    "category:administrative": "Administratiivalad",
-    "category:agriculture": "Põllumajandus",
-    "category:tourism_services": "Turism",
     "category:tourism_attractions": "Turism",
+    "category:tourism_services": "Turism",
     "category:transport_alternative": "Alternatiivne (jalgrattasõit, matkamine, ...)",
+    "category:administrative": "Administratiivalad",
+    "category:agriculture": "Põllumajandus",
+    "category:residential": "Elamupiirkonnad",
     "category:communication": "Kommunikatsioon",
     "category:culture": "Kultuur",
     "category:culture_religion": "Kultuur ja religioon",
diff --git a/lang/fr.json b/lang/fr.json
index 26bc193..31fc36e 100644
--- a/lang/fr.json
+++ b/lang/fr.json
@@ -1,11 +1,4 @@
 {
-    "category:wikipedia": "Wikipédia",
-    "category:footways": "Cheminements piétonniers",
-    "category:gastro-smoking": "Restauration sans tabac",
-    "category:gastro": "Restauration",
-    "category:health": "Santé",
-    "category:heritage": "Protection patrimoniale",
-    "category:hiking_routes": "Itinéraires pédestres",
     "category:historic": "Histoire",
     "category:index": "Index des Catégories",
     "category:leisure_sport_shopping": "Vie quotidienne, loisirs et sports",
@@ -56,13 +49,19 @@
     "category:railway-maxspeed": "Limites de vitesse",
     "category:railway-routes": "Lignes ferroviaires",
     "category:religion": "Religion",
-    "category:renewables": "Énergies renouvelables",
-    "category:residential": "Zones résidentielles",
-    "category:resources": "Extraction des ressources",
     "category:roads": "Routes",
     "category:shop": "Magasins/Boutiques",
     "category:sport": "Sports",
-    "category:fixme": "Améliorez-moi",
+    "category:swimming_bathing": "Natation, baignade et bains",
+    "category:tourism_attractions": "Tourisme",
+    "category:tourism_services": "Tourisme",
+    "category:transport_alternative": "Modes de transport alternatifs",
+    "category:walk_amenities": "Équipements piétons",
+    "category:waste": "Déchets et recyclage",
+    "category:water": "Hydrographie",
+    "category:wikipedia": "Wikipédia",
+    "category:works": "Zones industrielles",
+    "category:xmas": "Noël",
     "category:administrative": "Zones administratives",
     "category:agriculture": "Agriculture",
     "category:alternative_amenities": "Équipement",
@@ -71,6 +70,9 @@
     "category:buildings-figure-ground": "Empreintes",
     "category:buildings-height": "Hauteur",
     "category:buildings-start_date": "Date de construction",
+    "category:resources": "Extraction des ressources",
+    "category:residential": "Zones résidentielles",
+    "category:renewables": "Énergies renouvelables",
     "category:buildings-type": "Type",
     "category:buildings": "Bâtiments",
     "category:car_amenities": "Équipements auto",
@@ -79,15 +81,6 @@
     "category:car_routes": "Itinéraires auto",
     "category:children": "Équipements pour enfants",
     "category:climbing": "Escalade",
-    "category:tourism_services": "Tourisme",
-    "category:walk_amenities": "Équipements piétons",
-    "category:waste": "Déchets et recyclage",
-    "category:water": "Hydrographie",
-    "category:works": "Zones industrielles",
-    "category:xmas": "Noël",
-    "category:swimming_bathing": "Natation, baignade et bains",
-    "category:tourism_attractions": "Tourisme",
-    "category:transport_alternative": "Modes de transport alternatifs",
     "category:coal": "Charbon",
     "category:communication": "Communication",
     "category:construction": "Chantiers de construction",
@@ -102,6 +95,13 @@
     "category:electric_power": "Production/transport électrique",
     "category:emergency": "Services d'urgence",
     "category:financial": "Finance",
+    "category:fixme": "Améliorez-moi",
+    "category:footways": "Cheminements piétonniers",
+    "category:gastro-smoking": "Restauration sans tabac",
+    "category:gastro": "Restauration",
+    "category:health": "Santé",
+    "category:heritage": "Protection patrimoniale",
+    "category:hiking_routes": "Itinéraires pédestres",
     "category:cycle_directions": "",
     "category:walk_amenities_qa": ""
 }
diff --git a/lang/gl.json b/lang/gl.json
index 6304ee8..7350bb9 100644
--- a/lang/gl.json
+++ b/lang/gl.json
@@ -1,9 +1,4 @@
 {
-    "category:wikipedia": "Wikipedia",
-    "category:gastro-smoking": "Restauración sen fume",
-    "category:gastro": "Restauración",
-    "category:health": "Saúde",
-    "category:hiking_routes": "Rotas sendeiristas",
     "category:historic": "Histórico",
     "category:index": "Índice de categorías",
     "category:leisure_sport_shopping": "Lecer, deporte e compras",
@@ -46,12 +41,19 @@
     "category:railway-maxspeed": "Velocidade máxima do ferrocarril",
     "category:railway-routes": "Liñas de ferrocarril",
     "category:religion": "Relixión",
-    "category:renewables": "Renovábeis",
-    "category:residential": "Zonas residenciais",
-    "category:resources": "Estracción de recursos",
     "category:roads": "Estradas",
     "category:shop": "Compras",
     "category:sport": "Deporte",
+    "category:swimming_bathing": "Natación e baño",
+    "category:tourism_attractions": "Turismo",
+    "category:tourism_services": "Turismo",
+    "category:transport_alternative": "Modos de transporte alternativo",
+    "category:walk_amenities": "Instalacións",
+    "category:waste": "Lixo",
+    "category:water": "Hidrografía",
+    "category:wikipedia": "Wikipedia",
+    "category:works": "Producións",
+    "category:xmas": "Nadal",
     "category:administrative": "Divisións administrativas",
     "category:agriculture": "Agricultura",
     "category:alternative_amenities": "Instalacións",
@@ -60,6 +62,9 @@
     "category:buildings-figure-ground": "Cheos e baleiros",
     "category:buildings-height": "Altitude do edificio",
     "category:buildings-start_date": "Idade do edificio",
+    "category:resources": "Estracción de recursos",
+    "category:residential": "Zonas residenciais",
+    "category:renewables": "Renovábeis",
     "category:buildings-type": "Tipos de edificios",
     "category:buildings": "Edificios",
     "category:car_amenities": "Instalacións",
@@ -68,15 +73,6 @@
     "category:car_routes": "Rotas automobilísticas",
     "category:children": "Instalacións infantís",
     "category:climbing": "Escalada",
-    "category:tourism_services": "Turismo",
-    "category:walk_amenities": "Instalacións",
-    "category:waste": "Lixo",
-    "category:water": "Hidrografía",
-    "category:works": "Producións",
-    "category:xmas": "Nadal",
-    "category:swimming_bathing": "Natación e baño",
-    "category:tourism_attractions": "Turismo",
-    "category:transport_alternative": "Modos de transporte alternativo",
     "category:coal": "Carbón",
     "category:communication": "Comunicacións",
     "category:construction": "Terreos baixo construción",
@@ -89,6 +85,10 @@
     "category:electric_power": "Enerxía eléctrica",
     "category:emergency": "Servizos de emerxencia",
     "category:financial": "Finanzas",
+    "category:gastro-smoking": "Restauración sen fume",
+    "category:gastro": "Restauración",
+    "category:health": "Saúde",
+    "category:hiking_routes": "Rotas sendeiristas",
     "category:culture-media": "",
     "category:cycle_directions": "",
     "category:developable_areas": "",
diff --git a/lang/hu.json b/lang/hu.json
index 169d324..1940b77 100644
--- a/lang/hu.json
+++ b/lang/hu.json
@@ -1,11 +1,4 @@
 {
-    "category:wikipedia": "Wikipédia",
-    "category:footways": "Gyalogutak",
-    "category:gastro-smoking": "Nem dohányzó vendéglátóhelyek",
-    "category:gastro": "Vendéglátás",
-    "category:health": "Egészségügy",
-    "category:heritage": "Örökségvédelem",
-    "category:hiking_routes": "Turistautak",
     "category:historic": "Történelmi objektumok",
     "category:index": "Kategóriák jegyzéke",
     "category:leisure_sport_shopping": "Szabadidő, sport és vásárlás",
@@ -52,13 +45,19 @@
     "category:railway-maxspeed": "Sebességkorlátozás",
     "category:railway-routes": "Vasútvonalak",
     "category:religion": "Vallás",
-    "category:renewables": "Megújuló energia",
-    "category:residential": "Lakóövezetek",
-    "category:resources": "Bányászat",
     "category:roads": "Utak",
     "category:shop": "Vásárlás",
     "category:sport": "Sport",
-    "category:fixme": "Javíts ki! / Fix me",
+    "category:swimming_bathing": "Fürdőzés, úszás",
+    "category:tourism_attractions": "Látnivalók",
+    "category:tourism_services": "Szálláshelyek, turisztikai információk",
+    "category:transport_alternative": "Alternatív közlekedési módok",
+    "category:walk_amenities": "Gyalogos létesítmények",
+    "category:waste": "Hulladék",
+    "category:water": "Vizek",
+    "category:wikipedia": "Wikipédia",
+    "category:works": "Üzemek",
+    "category:xmas": "Karácsony",
     "category:administrative": "Közigazgatási határok",
     "category:agriculture": "Mezőgazdaság",
     "category:alternative_amenities": "Létesítmények",
@@ -67,6 +66,9 @@
     "category:buildings-figure-ground": "Fekete épületalaprajzok",
     "category:buildings-height": "Épületek magassága",
     "category:buildings-start_date": "Épületek kora",
+    "category:resources": "Bányászat",
+    "category:residential": "Lakóövezetek",
+    "category:renewables": "Megújuló energia",
     "category:buildings-type": "Épületek típusa",
     "category:buildings": "Épületek",
     "category:car_amenities": "Létesítmények",
@@ -75,15 +77,6 @@
     "category:car_routes": "Főútvonalak",
     "category:children": "Gyermekek",
     "category:climbing": "Hegymászás",
-    "category:tourism_services": "Szálláshelyek, turisztikai információk",
-    "category:walk_amenities": "Gyalogos létesítmények",
-    "category:waste": "Hulladék",
-    "category:water": "Vizek",
-    "category:works": "Üzemek",
-    "category:xmas": "Karácsony",
-    "category:swimming_bathing": "Fürdőzés, úszás",
-    "category:tourism_attractions": "Látnivalók",
-    "category:transport_alternative": "Alternatív közlekedési módok",
     "category:coal": "Kőszén",
     "category:communication": "Kommunikácó",
     "category:construction": "Építési terület",
@@ -98,6 +91,13 @@
     "category:electric_power": "Áramellátás",
     "category:emergency": "Vészhelyzet",
     "category:financial": "Pénzügyek",
+    "category:fixme": "Javíts ki! / Fix me",
+    "category:footways": "Gyalogutak",
+    "category:gastro-smoking": "Nem dohányzó vendéglátóhelyek",
+    "category:gastro": "Vendéglátás",
+    "category:health": "Egészségügy",
+    "category:heritage": "Örökségvédelem",
+    "category:hiking_routes": "Turistautak",
     "category:cycle_directions": "",
     "category:paddling": "",
     "category:paddling_amenities": "",
diff --git a/lang/it.json b/lang/it.json
index aad6f23..df619d0 100644
--- a/lang/it.json
+++ b/lang/it.json
@@ -1,11 +1,4 @@
 {
-    "category:wikipedia": "Wikipedia",
-    "category:footways": "Percorsi pedonali",
-    "category:gastro-smoking": "Gastronomia non fumatori",
-    "category:gastro": "Gastronomia",
-    "category:health": "Salute",
-    "category:heritage": "Protezione del patrimonio",
-    "category:hiking_routes": "Percorsi escursionistici",
     "category:historic": "Storia",
     "category:index": "Indice delle Categorie",
     "category:leisure_sport_shopping": "Tempo libero, sport e shopping",
@@ -56,13 +49,20 @@
     "category:railway-maxspeed": "Velocità ferroviaria massima",
     "category:railway-routes": "Percorsi ferroviari",
     "category:religion": "Religione",
-    "category:renewables": "Energie rinnovabili",
-    "category:residential": "Aree residenziali",
-    "category:resources": "Aree estrattive",
     "category:roads": "Strade",
     "category:shop": "Acquisti",
     "category:sport": "Sport",
-    "category:fixme": "Correggimi",
+    "category:swimming_bathing": "Nuoto e balneazione",
+    "category:tourism_attractions": "Turismo",
+    "category:tourism_services": "Turismo",
+    "category:transport_alternative": "Mezzi di trasporto alternativi",
+    "category:walk_amenities": "Servizi",
+    "category:walk_amenities_qa": "Servizi per i pedoni",
+    "category:waste": "Smaltimento",
+    "category:water": "Masse d'acqua",
+    "category:wikipedia": "Wikipedia",
+    "category:works": "Fabbriche",
+    "category:xmas": "Natale",
     "category:administrative": "Suddivisioni amministrative",
     "category:agriculture": "Agricoltura",
     "category:alternative_amenities": "Infrastrutture",
@@ -71,6 +71,9 @@
     "category:buildings-figure-ground": "Schema di Impronta",
     "category:buildings-height": "Altezza dell'edificio",
     "category:buildings-start_date": "Età dell'edificio",
+    "category:resources": "Aree estrattive",
+    "category:residential": "Aree residenziali",
+    "category:renewables": "Energie rinnovabili",
     "category:buildings-type": "Tipi di edificio",
     "category:buildings": "Edifici",
     "category:car_amenities": "Infrastrutture",
@@ -79,16 +82,6 @@
     "category:car_routes": "Tratte automobilistiche",
     "category:children": "Luoghi per bambini",
     "category:climbing": "Arrampicata",
-    "category:tourism_services": "Turismo",
-    "category:walk_amenities": "Servizi",
-    "category:walk_amenities_qa": "Servizi per i pedoni",
-    "category:waste": "Smaltimento",
-    "category:water": "Masse d'acqua",
-    "category:works": "Fabbriche",
-    "category:xmas": "Natale",
-    "category:swimming_bathing": "Nuoto e balneazione",
-    "category:tourism_attractions": "Turismo",
-    "category:transport_alternative": "Mezzi di trasporto alternativi",
     "category:coal": "Carbone",
     "category:communication": "Comunicazione",
     "category:construction": "Cantieri",
@@ -103,5 +96,12 @@
     "category:education": "Servizi d'istruzione",
     "category:electric_power": "Energia elettrica",
     "category:emergency": "Servizi d'emergenza",
-    "category:financial": "Finanziario"
+    "category:financial": "Finanziario",
+    "category:fixme": "Correggimi",
+    "category:footways": "Percorsi pedonali",
+    "category:gastro-smoking": "Gastronomia non fumatori",
+    "category:gastro": "Gastronomia",
+    "category:health": "Salute",
+    "category:heritage": "Protezione del patrimonio",
+    "category:hiking_routes": "Percorsi escursionistici"
 }
diff --git a/lang/ja.json b/lang/ja.json
index b04a773..6baf3c9 100644
--- a/lang/ja.json
+++ b/lang/ja.json
@@ -1,9 +1,4 @@
 {
-    "category:wikipedia": "ウィキペディア",
-    "category:gastro-smoking": "禁煙の飲食店",
-    "category:gastro": "食べ物",
-    "category:health": "健康",
-    "category:hiking_routes": "ハイキングルート",
     "category:historic": "歴史",
     "category:index": "目次(カテゴリ)",
     "category:leisure_sport_shopping": "レジャー",
@@ -48,12 +43,19 @@
     "category:railway-maxspeed": "鉄道の最高速度",
     "category:railway-routes": "鉄道ルート",
     "category:religion": "宗教",
-    "category:renewables": "再生可能エネルギー",
-    "category:residential": "住居エリア",
-    "category:resources": "資源採集",
     "category:roads": "道路",
     "category:shop": "ショッピング",
     "category:sport": "スポーツ",
+    "category:swimming_bathing": "水泳と入浴",
+    "category:tourism_attractions": "観光",
+    "category:tourism_services": "観光",
+    "category:transport_alternative": "その他交通 (サイクリング、ハイキング、...)",
+    "category:walk_amenities": "アメニティ",
+    "category:waste": "処理場",
+    "category:water": "水系",
+    "category:wikipedia": "ウィキペディア",
+    "category:works": "工場",
+    "category:xmas": "クリスマス",
     "category:administrative": "行政界",
     "category:agriculture": "農業",
     "category:alternative_amenities": "生活環境",
@@ -62,6 +64,9 @@
     "category:buildings-figure-ground": "フィギュア-グランド図式",
     "category:buildings-height": "建物の高さ",
     "category:buildings-start_date": "築年数",
+    "category:resources": "資源採集",
+    "category:residential": "住居エリア",
+    "category:renewables": "再生可能エネルギー",
     "category:buildings-type": "建物の種類",
     "category:buildings": "建物",
     "category:car_amenities": "生活環境",
@@ -70,15 +75,6 @@
     "category:car_routes": "車のルート",
     "category:children": "子ども用施設",
     "category:climbing": "登山",
-    "category:tourism_services": "観光",
-    "category:walk_amenities": "アメニティ",
-    "category:waste": "処理場",
-    "category:water": "水系",
-    "category:works": "工場",
-    "category:xmas": "クリスマス",
-    "category:swimming_bathing": "水泳と入浴",
-    "category:tourism_attractions": "観光",
-    "category:transport_alternative": "その他交通 (サイクリング、ハイキング、...)",
     "category:coal": "石炭",
     "category:communication": "情報通信",
     "category:construction": "工事中",
@@ -92,6 +88,10 @@
     "category:electric_power": "電力",
     "category:emergency": "緊急サービス",
     "category:financial": "金融",
+    "category:gastro-smoking": "禁煙の飲食店",
+    "category:gastro": "食べ物",
+    "category:health": "健康",
+    "category:hiking_routes": "ハイキングルート",
     "category:culture-media": "",
     "category:cycle_directions": "",
     "category:fixme": "",
diff --git a/lang/nb.json b/lang/nb.json
index 9dda56a..4b24e64 100644
--- a/lang/nb.json
+++ b/lang/nb.json
@@ -1,9 +1,4 @@
 {
-    "category:wikipedia": "Wikipedia",
-    "category:gastro-smoking": "Røykefritt Gastronomi",
-    "category:gastro": "Gastronomi",
-    "category:health": "Helse",
-    "category:hiking_routes": "Gåruter",
     "category:historic": "Historisk",
     "category:index": "Indeks av kategorier",
     "category:leisure_sport_shopping": "Fritid, sport og shopping",
@@ -46,12 +41,19 @@
     "category:railway-maxspeed": "Jernbane-fartsgrense",
     "category:railway-routes": "Jernbaneruter",
     "category:religion": "Religion",
-    "category:renewables": "Fornybare",
-    "category:residential": "Boligområder",
-    "category:resources": "Ressursutvinning",
     "category:roads": "Veier",
     "category:shop": "Shopping",
     "category:sport": "Sport",
+    "category:swimming_bathing": "Svømming og bading",
+    "category:tourism_attractions": "Turisme",
+    "category:tourism_services": "Turisme",
+    "category:transport_alternative": "Alternative transportmetoder",
+    "category:walk_amenities": "Fasiliteter",
+    "category:waste": "Avfall",
+    "category:water": "Vannflater",
+    "category:wikipedia": "Wikipedia",
+    "category:works": "Industrielt",
+    "category:xmas": "Jul",
     "category:administrative": "Administrative områder",
     "category:agriculture": "Jordbruk",
     "category:alternative_amenities": "Fasiliteter",
@@ -60,6 +62,9 @@
     "category:buildings-figure-ground": "Figur-bakke diagram",
     "category:buildings-height": "Bygningshøyde",
     "category:buildings-start_date": "Bygningsalder",
+    "category:resources": "Ressursutvinning",
+    "category:residential": "Boligområder",
+    "category:renewables": "Fornybare",
     "category:buildings-type": "Bygningstyper",
     "category:buildings": "Bygninger",
     "category:car_amenities": "Fasiliteter",
@@ -68,15 +73,6 @@
     "category:car_routes": "Bilruter",
     "category:children": "Barnefasiliteter",
     "category:climbing": "Klatring",
-    "category:tourism_services": "Turisme",
-    "category:walk_amenities": "Fasiliteter",
-    "category:waste": "Avfall",
-    "category:water": "Vannflater",
-    "category:works": "Industrielt",
-    "category:xmas": "Jul",
-    "category:swimming_bathing": "Svømming og bading",
-    "category:tourism_attractions": "Turisme",
-    "category:transport_alternative": "Alternative transportmetoder",
     "category:coal": "Kull",
     "category:communication": "Kommunikasjon",
     "category:construction": "Konstruksjonsområde",
@@ -89,6 +85,10 @@
     "category:electric_power": "Elektrisk strøm",
     "category:emergency": "Nødtjenester",
     "category:financial": "Finansiell",
+    "category:gastro-smoking": "Røykefritt Gastronomi",
+    "category:gastro": "Gastronomi",
+    "category:health": "Helse",
+    "category:hiking_routes": "Gåruter",
     "category:culture-media": "",
     "category:cycle_directions": "",
     "category:developable_areas": "",
diff --git a/lang/nl.json b/lang/nl.json
index fef8762..e4645d1 100644
--- a/lang/nl.json
+++ b/lang/nl.json
@@ -1,9 +1,4 @@
 {
-    "category:wikipedia": "Wikipedia",
-    "category:gastro-smoking": "Rookvrije gastronomie",
-    "category:gastro": "Gastronomie",
-    "category:health": "Gezondheid",
-    "category:hiking_routes": "Wandelroutes",
     "category:historic": "Historisch",
     "category:leisure_sport_shopping": "Vrije tijd, Sport en Winkelen",
     "category:services": "Dienstverlening",
@@ -44,11 +39,18 @@
     "category:railway-maxspeed": "Spoorweg snelheidslimiet",
     "category:railway-routes": "Spoorwegroutes",
     "category:religion": "Religie",
-    "category:renewables": "Hernieuwbare energie",
-    "category:residential": "Woongebieden",
-    "category:resources": "Grondstoffenwinning",
     "category:shop": "Winkelen",
     "category:sport": "Sport",
+    "category:swimming_bathing": "Zwemmen en baden",
+    "category:tourism_attractions": "Toerisme",
+    "category:tourism_services": "Toerisme",
+    "category:transport_alternative": "Alternatief (Fiets, Wandel, ...)",
+    "category:walk_amenities": "Voorzieningen",
+    "category:waste": "Afvalverwijdering",
+    "category:water": "Oppervlaktewater",
+    "category:wikipedia": "Wikipedia",
+    "category:works": "Fabrieken",
+    "category:xmas": "Kerstmis",
     "category:administrative": "Administratieve gebieden",
     "category:agriculture": "Landbouw",
     "category:alternative_amenities": "Voorzieningen",
@@ -57,6 +59,9 @@
     "category:buildings-figure-ground": "Plattegrond",
     "category:buildings-height": "Bouwhoogte",
     "category:buildings-start_date": "Ouderdom van het gebouw",
+    "category:resources": "Grondstoffenwinning",
+    "category:residential": "Woongebieden",
+    "category:renewables": "Hernieuwbare energie",
     "category:buildings-type": "Gebouwtypes",
     "category:buildings": "Gebouwen",
     "category:car_amenities": "Voorzieningen",
@@ -64,15 +69,6 @@
     "category:car_maxspeed": "Snelheidslimiet",
     "category:car_routes": "Autoroutes",
     "category:children": "Voorzieningen voor kinderen",
-    "category:tourism_services": "Toerisme",
-    "category:walk_amenities": "Voorzieningen",
-    "category:waste": "Afvalverwijdering",
-    "category:water": "Oppervlaktewater",
-    "category:works": "Fabrieken",
-    "category:xmas": "Kerstmis",
-    "category:swimming_bathing": "Zwemmen en baden",
-    "category:tourism_attractions": "Toerisme",
-    "category:transport_alternative": "Alternatief (Fiets, Wandel, ...)",
     "category:coal": "Kolen",
     "category:communication": "Communicatie",
     "category:construction": "Bouwterrein",
@@ -85,6 +81,10 @@
     "category:electric_power": "Stroomvoorziening",
     "category:emergency": "Hulpdiensten",
     "category:financial": "Financieel",
+    "category:gastro-smoking": "Rookvrije gastronomie",
+    "category:gastro": "Gastronomie",
+    "category:health": "Gezondheid",
+    "category:hiking_routes": "Wandelroutes",
     "category:climbing": "",
     "category:culture-media": "",
     "category:cycle_directions": "",
diff --git a/lang/oc.json b/lang/oc.json
index 600e272..63ccb9b 100644
--- a/lang/oc.json
+++ b/lang/oc.json
@@ -1,9 +1,4 @@
 {
-    "category:wikipedia": "Wikipèdia",
-    "category:gastro-smoking": "Restauration sensa tabat",
-    "category:gastro": "Restauracion/ Gastronomia",
-    "category:health": "Santat",
-    "category:hiking_routes": "Itineraris per escorregudas",
     "category:historic": "Istòria",
     "category:index": "Indici dei categorias",
     "category:leisure_sport_shopping": "Vida quotidiana, lesers e espòrts",
@@ -48,12 +43,19 @@
     "category:railway-maxspeed": "Limits de velocitat",
     "category:railway-routes": "Linhas ferroviàrias",
     "category:religion": "Religion",
-    "category:renewables": "Energias renovelablas",
-    "category:residential": "Quartiers residenciaus",
-    "category:resources": "Airau d'extraccion de ressorsas",
     "category:roads": "Rotas",
     "category:shop": "Botigas",
     "category:sport": "Espòrt",
+    "category:swimming_bathing": "Natacion, banhada e banhèra",
+    "category:tourism_attractions": "Torisme",
+    "category:tourism_services": "Torisme",
+    "category:transport_alternative": "Transpòrt alternatiu (ciclisme, caminada, ...)",
+    "category:walk_amenities": "Equipaments pedoniers",
+    "category:waste": "Bordilhas e reciclatge",
+    "category:water": "Aigas e rius",
+    "category:wikipedia": "Wikipèdia",
+    "category:works": "Airaus industriaus",
+    "category:xmas": "Calendas",
     "category:administrative": "Divisions administrativas",
     "category:agriculture": "Agricultura",
     "category:alternative_amenities": "Equipament",
@@ -62,6 +64,9 @@
     "category:buildings-figure-ground": "Marca au sòu",
     "category:buildings-height": "Autor de la bastissa",
     "category:buildings-start_date": "Data de bastison",
+    "category:resources": "Airau d'extraccion de ressorsas",
+    "category:residential": "Quartiers residenciaus",
+    "category:renewables": "Energias renovelablas",
     "category:buildings-type": "Tipe de bastissa",
     "category:buildings": "Bastissas",
     "category:car_amenities": "Equipaments auto",
@@ -70,15 +75,6 @@
     "category:car_routes": "Itineraris auto",
     "category:children": "Luòcs per leis enfants",
     "category:climbing": "Escalada",
-    "category:tourism_services": "Torisme",
-    "category:walk_amenities": "Equipaments pedoniers",
-    "category:waste": "Bordilhas e reciclatge",
-    "category:water": "Aigas e rius",
-    "category:works": "Airaus industriaus",
-    "category:xmas": "Calendas",
-    "category:swimming_bathing": "Natacion, banhada e banhèra",
-    "category:tourism_attractions": "Torisme",
-    "category:transport_alternative": "Transpòrt alternatiu (ciclisme, caminada, ...)",
     "category:coal": "Carbon",
     "category:communication": "Communicacion",
     "category:construction": "Talhiers de construccion",
@@ -92,6 +88,10 @@
     "category:electric_power": "Produccion/ Transpòrt d'Energia",
     "category:emergency": "Servicis d'urgéncia",
     "category:financial": "Finança",
+    "category:gastro-smoking": "Restauration sensa tabat",
+    "category:gastro": "Restauracion/ Gastronomia",
+    "category:health": "Santat",
+    "category:hiking_routes": "Itineraris per escorregudas",
     "category:culture-media": "",
     "category:cycle_directions": "",
     "category:fixme": "",
diff --git a/lang/pl.json b/lang/pl.json
index 960a557..d896bfb 100644
--- a/lang/pl.json
+++ b/lang/pl.json
@@ -1,11 +1,4 @@
 {
-    "category:wikipedia": "Wikipedia",
-    "category:footways": "Chodniki",
-    "category:gastro-smoking": "Gastronomia wolna od papierosów",
-    "category:gastro": "Gastronomia",
-    "category:health": "Zdrowie",
-    "category:heritage": "Ochrona dziedzictwa",
-    "category:hiking_routes": "Trasy turystyczne",
     "category:historic": "Miejsca historyczne",
     "category:index": "Spis kategorii",
     "category:leisure_sport_shopping": "Wypoczynek, sport i zakupy",
@@ -56,13 +49,20 @@
     "category:railway-maxspeed": "Prędkość maksymalna kolei",
     "category:railway-routes": "Trasy kolejowe",
     "category:religion": "Religia",
-    "category:renewables": "Odnawialne",
-    "category:residential": "Obszary zamieszkania",
-    "category:resources": "Wydobycie zasobów naturalnych",
     "category:roads": "Drogi",
     "category:shop": "Zakupy",
     "category:sport": "Sport",
-    "category:fixme": "Popraw mnie",
+    "category:swimming_bathing": "Pływanie i kąpiele",
+    "category:tourism_attractions": "Turystyka",
+    "category:tourism_services": "Turystyka",
+    "category:transport_alternative": "Alternatywne metody transportu",
+    "category:walk_amenities": "Pożyteczne w transporcie pieszym",
+    "category:walk_amenities_qa": "Użyteczne w ruchu pieszym",
+    "category:waste": "Przetwarzanie odpadów",
+    "category:water": "Wodne",
+    "category:wikipedia": "Wikipedia",
+    "category:works": "Przemysł",
+    "category:xmas": "Święta",
     "category:administrative": "Obszary administracyjne",
     "category:agriculture": "Rolnictwo",
     "category:alternative_amenities": "Pożyteczne miejsca",
@@ -71,6 +71,9 @@
     "category:buildings-figure-ground": "Plan zagospodarowania przestrzennego",
     "category:buildings-height": "Wysokości budynków",
     "category:buildings-start_date": "Wiek budynków",
+    "category:resources": "Wydobycie zasobów naturalnych",
+    "category:residential": "Obszary zamieszkania",
+    "category:renewables": "Odnawialne",
     "category:buildings-type": "Rodzaje budynków",
     "category:buildings": "Budynki",
     "category:car_amenities": "Użyteczne w transporcie drogowym",
@@ -79,16 +82,6 @@
     "category:car_routes": "Trasy samochodowe",
     "category:children": "Użyteczne dzieciom",
     "category:climbing": "Wspinaczka",
-    "category:tourism_services": "Turystyka",
-    "category:walk_amenities": "Pożyteczne w transporcie pieszym",
-    "category:walk_amenities_qa": "Użyteczne w ruchu pieszym",
-    "category:waste": "Przetwarzanie odpadów",
-    "category:water": "Wodne",
-    "category:works": "Przemysł",
-    "category:xmas": "Święta",
-    "category:swimming_bathing": "Pływanie i kąpiele",
-    "category:tourism_attractions": "Turystyka",
-    "category:transport_alternative": "Alternatywne metody transportu",
     "category:coal": "Węgiel",
     "category:communication": "Komunikacja",
     "category:construction": "Tereny budowy",
@@ -103,5 +96,12 @@
     "category:education": "Usługi edukacyjne",
     "category:electric_power": "Elektroenergetyka",
     "category:emergency": "Służby ratunkowe",
-    "category:financial": "Finansowe"
+    "category:financial": "Finansowe",
+    "category:fixme": "Popraw mnie",
+    "category:footways": "Chodniki",
+    "category:gastro-smoking": "Gastronomia wolna od papierosów",
+    "category:gastro": "Gastronomia",
+    "category:health": "Zdrowie",
+    "category:heritage": "Ochrona dziedzictwa",
+    "category:hiking_routes": "Trasy turystyczne"
 }
diff --git a/lang/pt-br.json b/lang/pt-br.json
index c5bf31e..51c42c1 100644
--- a/lang/pt-br.json
+++ b/lang/pt-br.json
@@ -1,11 +1,4 @@
 {
-    "category:wikipedia": "Wikipédia",
-    "category:footways": "Vias pedonais",
-    "category:gastro-smoking": "Gastronomia sem fumo",
-    "category:gastro": "Gastronomia",
-    "category:health": "Saúde e assistência",
-    "category:heritage": "Patrimônio histórico",
-    "category:hiking_routes": "Rotas de caminhada",
     "category:historic": "Histórico",
     "category:index": "Índice de Categorias",
     "category:leisure_sport_shopping": "Lazer, esportes e compras",
@@ -56,13 +49,19 @@
     "category:railway-maxspeed": "Velocidade máxima",
     "category:railway-routes": "Rotas ferroviárias",
     "category:religion": "Religião",
-    "category:renewables": "Renováveis",
-    "category:residential": "Áreas residenciais",
-    "category:resources": "Extração de recursos",
     "category:roads": "Vias",
     "category:shop": "Compras",
     "category:sport": "Esportes",
-    "category:fixme": "Corrija-me",
+    "category:swimming_bathing": "Natação e banho",
+    "category:tourism_attractions": "Turismo",
+    "category:tourism_services": "Serviços turísticos",
+    "category:transport_alternative": "Modos de transporte alternativo",
+    "category:walk_amenities": "Equipamentos",
+    "category:waste": "Resíduos",
+    "category:water": "Hidrografia",
+    "category:wikipedia": "Wikipédia",
+    "category:works": "Produção",
+    "category:xmas": "Natal",
     "category:administrative": "Divisão político-administrativa",
     "category:agriculture": "Agricultura",
     "category:alternative_amenities": "Equipamentos",
@@ -71,6 +70,9 @@
     "category:buildings-figure-ground": "Cheios e vazios",
     "category:buildings-height": "Altura",
     "category:buildings-start_date": "Idade",
+    "category:resources": "Extração de recursos",
+    "category:residential": "Áreas residenciais",
+    "category:renewables": "Renováveis",
     "category:buildings-type": "Tipologias",
     "category:buildings": "Edificações",
     "category:car_amenities": "Equipamentos",
@@ -79,15 +81,6 @@
     "category:car_routes": "Rotas rodoviárias",
     "category:children": "Equipamentos infantis",
     "category:climbing": "Escalada",
-    "category:tourism_services": "Serviços turísticos",
-    "category:walk_amenities": "Equipamentos",
-    "category:waste": "Resíduos",
-    "category:water": "Hidrografia",
-    "category:works": "Produção",
-    "category:xmas": "Natal",
-    "category:swimming_bathing": "Natação e banho",
-    "category:tourism_attractions": "Turismo",
-    "category:transport_alternative": "Modos de transporte alternativo",
     "category:coal": "Carvão",
     "category:communication": "Comunicação",
     "category:construction": "Terrenos vazios e obras",
@@ -102,6 +95,13 @@
     "category:electric_power": "Energia elétrica",
     "category:emergency": "Emergência",
     "category:financial": "Finanças e seguros",
+    "category:fixme": "Corrija-me",
+    "category:footways": "Vias pedonais",
+    "category:gastro-smoking": "Gastronomia sem fumo",
+    "category:gastro": "Gastronomia",
+    "category:health": "Saúde e assistência",
+    "category:heritage": "Patrimônio histórico",
+    "category:hiking_routes": "Rotas de caminhada",
     "category:cycle_directions": "",
     "category:walk_amenities_qa": ""
 }
diff --git a/lang/pt.json b/lang/pt.json
index a1fc52f..c168479 100644
--- a/lang/pt.json
+++ b/lang/pt.json
@@ -1,11 +1,4 @@
 {
-    "category:wikipedia": "Wikipédia",
-    "category:footways": "Vias pedonais",
-    "category:gastro-smoking": "Restauração livre de tabaco",
-    "category:gastro": "Restauração",
-    "category:health": "Saúde",
-    "category:heritage": "Património cultural",
-    "category:hiking_routes": "Rotas de caminhada",
     "category:historic": "Histórico",
     "category:index": "Índice de categorias",
     "category:leisure_sport_shopping": "Lazer, desporto e compras",
@@ -52,13 +45,18 @@
     "category:railway-maxspeed": "Velocidade máxima",
     "category:railway-routes": "Rotas ferroviárias",
     "category:religion": "Religião",
-    "category:renewables": "Renováveis",
-    "category:residential": "Áreas residenciais",
-    "category:resources": "Extração de recursos",
     "category:roads": "Vias",
     "category:shop": "Compras",
     "category:sport": "Desporto",
-    "category:fixme": "Corrige-me",
+    "category:swimming_bathing": "Natação e banho",
+    "category:tourism_attractions": "Turismo",
+    "category:tourism_services": "Turismo",
+    "category:transport_alternative": "Modais de transporte alternativo",
+    "category:walk_amenities": "Equipamentos",
+    "category:waste": "Lixo",
+    "category:water": "Massas de água",
+    "category:wikipedia": "Wikipédia",
+    "category:works": "Fábricas",
     "category:administrative": "Regiões administrativas",
     "category:agriculture": "Agricultura",
     "category:alternative_amenities": "Equipamentos",
@@ -67,6 +65,9 @@
     "category:buildings-figure-ground": "Cheios e vazios",
     "category:buildings-height": "Altura dos edifícios",
     "category:buildings-start_date": "Idade dos edifícios",
+    "category:resources": "Extração de recursos",
+    "category:residential": "Áreas residenciais",
+    "category:renewables": "Renováveis",
     "category:buildings-type": "Tipos dos edifícios",
     "category:buildings": "Edifícios",
     "category:car_amenities": "Equipamentos",
@@ -75,14 +76,6 @@
     "category:car_routes": "Rotas rodoviárias",
     "category:children": "Equipamentos infantis",
     "category:climbing": "Escalada",
-    "category:tourism_services": "Turismo",
-    "category:walk_amenities": "Equipamentos",
-    "category:waste": "Lixo",
-    "category:water": "Massas de água",
-    "category:works": "Fábricas",
-    "category:swimming_bathing": "Natação e banho",
-    "category:tourism_attractions": "Turismo",
-    "category:transport_alternative": "Modais de transporte alternativo",
     "category:coal": "Carvão",
     "category:communication": "Comunicação",
     "category:construction": "Locais de construção",
@@ -97,6 +90,13 @@
     "category:electric_power": "Eletricidade",
     "category:emergency": "Emergência",
     "category:financial": "Finanças",
+    "category:fixme": "Corrige-me",
+    "category:footways": "Vias pedonais",
+    "category:gastro-smoking": "Restauração livre de tabaco",
+    "category:gastro": "Restauração",
+    "category:health": "Saúde",
+    "category:heritage": "Património cultural",
+    "category:hiking_routes": "Rotas de caminhada",
     "category:cycle_directions": "",
     "category:paddling": "",
     "category:paddling_amenities": "",
diff --git a/lang/ro.json b/lang/ro.json
index 026024a..43df429 100644
--- a/lang/ro.json
+++ b/lang/ro.json
@@ -1,7 +1,4 @@
 {
-    "category:gastro": "Gastronomie",
-    "category:health": "Sanatate",
-    "category:hiking_routes": "Trasee de drumeție",
     "category:historic": "Istoric",
     "category:leisure_sport_shopping": "Timp liber, Sport si Cumparaturi",
     "category:services": "Servicii",
@@ -22,8 +19,11 @@
     "category:pt:routes": "Rute",
     "category:public": "Servicii publice",
     "category:religion": "Religie",
-    "category:residential": "Zona rezidentiala",
     "category:shop": "Cumpărături",
+    "category:tourism_attractions": "Turism",
+    "category:tourism_services": "Turism",
+    "category:transport_alternative": "Alternativ(Bicicleta,Drumetii)",
+    "category:xmas": "Crăciun",
     "category:administrative": "Zona administrativă",
     "category:agriculture": "Agricultura",
     "category:alternative_amenities": "Facilități",
@@ -31,6 +31,7 @@
     "category:buildings-entrances": "Intrări",
     "category:buildings-height": "Înălțimea clădirii",
     "category:buildings-start_date": "Vârsta clădirii",
+    "category:residential": "Zona rezidentiala",
     "category:buildings-type": "Tipuri de clădiri",
     "category:buildings": "Clădiri",
     "category:car_amenities": "Dotări",
@@ -38,10 +39,6 @@
     "category:car_maxspeed": "Viteza maximă",
     "category:car_routes": "Rute auto",
     "category:children": "Facilități copii",
-    "category:tourism_services": "Turism",
-    "category:xmas": "Crăciun",
-    "category:tourism_attractions": "Turism",
-    "category:transport_alternative": "Alternativ(Bicicleta,Drumetii)",
     "category:coal": "Cărbune",
     "category:communication": "Comunicatii",
     "category:construction": "Șantiere",
@@ -53,6 +50,9 @@
     "category:electric_power": "Energie",
     "category:emergency": "Servicii urgenta",
     "category:financial": "Financiar",
+    "category:gastro": "Gastronomie",
+    "category:health": "Sanatate",
+    "category:hiking_routes": "Trasee de drumeție",
     "category:buildings-figure-ground": "",
     "category:climbing": "",
     "category:craft": "",
diff --git a/lang/ru.json b/lang/ru.json
index 2f21062..a3d7137 100644
--- a/lang/ru.json
+++ b/lang/ru.json
@@ -1,9 +1,4 @@
 {
-    "category:wikipedia": "Википедия",
-    "category:gastro-smoking": "Общественное питание без курения",
-    "category:gastro": "Общепит",
-    "category:health": "Медицина",
-    "category:hiking_routes": "Туристические маршруты",
     "category:historic": "Историческое",
     "category:index": "Индекс категорий",
     "category:leisure_sport_shopping": "Досуг, спорт и магазины",
@@ -46,11 +41,17 @@
     "category:railway-maxspeed": "Максимальная скорость",
     "category:railway-routes": "Железнодорожные маршруты",
     "category:religion": "Религия",
-    "category:renewables": "Возобновляемая",
-    "category:residential": "Жилые районы",
-    "category:resources": "Добыча ресурсов",
     "category:shop": "Покупки",
     "category:sport": "Спорт",
+    "category:swimming_bathing": "Бассейны и сауны",
+    "category:tourism_attractions": "Туризм",
+    "category:tourism_services": "Туризм",
+    "category:transport_alternative": "Альтернативное передвижение",
+    "category:waste": "Переработка отходов",
+    "category:water": "Водоемы",
+    "category:wikipedia": "Википедия",
+    "category:works": "Промышленность",
+    "category:xmas": "Рождество",
     "category:administrative": "Административные границы",
     "category:agriculture": "Сельское хозяйство",
     "category:alternative_amenities": "Полезные места",
@@ -58,20 +59,15 @@
     "category:buildings-entrances": "Входы",
     "category:buildings-height": "Высота здания",
     "category:buildings-start_date": "Возраст здания",
+    "category:resources": "Добыча ресурсов",
+    "category:residential": "Жилые районы",
+    "category:renewables": "Возобновляемая",
     "category:buildings-type": "Типы зданий",
     "category:buildings": "Здания",
     "category:car_amenities": "Обслуживание транспорта",
     "category:car_furniture": "Элементы дороги",
     "category:car_maxspeed": "Максимальная скорость",
     "category:car_routes": "Автомобильные маршруты",
-    "category:tourism_services": "Туризм",
-    "category:waste": "Переработка отходов",
-    "category:water": "Водоемы",
-    "category:works": "Промышленность",
-    "category:xmas": "Рождество",
-    "category:swimming_bathing": "Бассейны и сауны",
-    "category:tourism_attractions": "Туризм",
-    "category:transport_alternative": "Альтернативное передвижение",
     "category:coal": "Уголь",
     "category:communication": "Услуги связи",
     "category:construction": "Места строительства",
@@ -83,6 +79,10 @@
     "category:electric_power": "Электроэнергетика",
     "category:emergency": "Экстренные службы",
     "category:financial": "Финансы",
+    "category:gastro-smoking": "Общественное питание без курения",
+    "category:gastro": "Общепит",
+    "category:health": "Медицина",
+    "category:hiking_routes": "Туристические маршруты",
     "category:buildings-figure-ground": "",
     "category:children": "",
     "category:climbing": "",
diff --git a/lang/sr.json b/lang/sr.json
index 179d2a6..3b6fbc7 100644
--- a/lang/sr.json
+++ b/lang/sr.json
@@ -1,8 +1,4 @@
 {
-    "category:wikipedia": "Википедија",
-    "category:gastro": "Гастрономија",
-    "category:health": "Здравље",
-    "category:hiking_routes": "Трасе за планинарење",
     "category:historic": "Историјско",
     "category:index": "Садржај категорија",
     "category:leisure_sport_shopping": "Разонода, спорт и куповина",
@@ -43,11 +39,19 @@
     "category:railway-infrastructure": "Железничка инфраструктура",
     "category:railway-routes": "Трасе железнице",
     "category:religion": "Религија",
-    "category:renewables": "Обновљива енергија",
-    "category:residential": "Стамбена подручја",
     "category:roads": "Путеви",
     "category:shop": "Куповина",
     "category:sport": "Спорт",
+    "category:swimming_bathing": "Пливање и купање",
+    "category:tourism_attractions": "Туризам",
+    "category:tourism_services": "Туризам",
+    "category:transport_alternative": "Други начини превоза",
+    "category:walk_amenities": "Додаци",
+    "category:waste": "Отпад",
+    "category:water": "Водене површине",
+    "category:wikipedia": "Википедија",
+    "category:works": "Радови",
+    "category:xmas": "Божић",
     "category:administrative": "Административне зоне",
     "category:agriculture": "Пољопривреда",
     "category:alternative_amenities": "Додаци",
@@ -55,6 +59,8 @@
     "category:buildings-entrances": "Улази",
     "category:buildings-height": "Висина зграде",
     "category:buildings-start_date": "Старост зграде",
+    "category:residential": "Стамбена подручја",
+    "category:renewables": "Обновљива енергија",
     "category:buildings-type": "Врста зграде",
     "category:buildings": "Зграде",
     "category:car_amenities": "Додаци",
@@ -62,15 +68,6 @@
     "category:car_routes": "Трасе за возила",
     "category:children": "Додаци за децу",
     "category:climbing": "Пењање",
-    "category:tourism_services": "Туризам",
-    "category:walk_amenities": "Додаци",
-    "category:waste": "Отпад",
-    "category:water": "Водене површине",
-    "category:works": "Радови",
-    "category:xmas": "Божић",
-    "category:swimming_bathing": "Пливање и купање",
-    "category:tourism_attractions": "Туризам",
-    "category:transport_alternative": "Други начини превоза",
     "category:coal": "Угаљ",
     "category:communication": "Комуникација",
     "category:construction": "Градилишта",
@@ -83,6 +80,9 @@
     "category:electric_power": "Електрична енергија",
     "category:emergency": "Хитне службе",
     "category:financial": "Финансије",
+    "category:gastro": "Гастрономија",
+    "category:health": "Здравље",
+    "category:hiking_routes": "Трасе за планинарење",
     "category:buildings-figure-ground": "",
     "category:car_furniture": "",
     "category:culture-media": "",
diff --git a/lang/tr.json b/lang/tr.json
index 1372abd..8c65fc8 100644
--- a/lang/tr.json
+++ b/lang/tr.json
@@ -1,11 +1,4 @@
 {
-    "category:wikipedia": "Wikipedia",
-    "category:footways": "Yaya Yolları",
-    "category:gastro-smoking": "Dumansız Gastronomi",
-    "category:gastro": "Gastronomi",
-    "category:health": "Sağlık",
-    "category:heritage": "Kültürel Miras",
-    "category:hiking_routes": "Yürüyüş Rotaları",
     "category:historic": "Tarihi",
     "category:index": "Kategori İndeksi",
     "category:leisure_sport_shopping": "Eğlence, Spor ve Alışveriş",
@@ -56,13 +49,20 @@
     "category:railway-maxspeed": "Demiryolu Maksimum Hızı",
     "category:railway-routes": "Demiryolu Güzergahları",
     "category:religion": "Din",
-    "category:renewables": "Yenilenebilir kaynaklar",
-    "category:residential": "Yerleşim Alanları",
-    "category:resources": "Yeraltı Kaynağı Çıkarma",
     "category:roads": "Yollar",
     "category:shop": "Alışveriş",
     "category:sport": "Spor",
-    "category:fixme": "Beni Geliştirin",
+    "category:swimming_bathing": "Yüzme ve banyo yapma",
+    "category:tourism_attractions": "Turizm",
+    "category:tourism_services": "Turizm",
+    "category:transport_alternative": "Alternatif Ulaşım modları",
+    "category:walk_amenities": "Olanaklar",
+    "category:walk_amenities_qa": "Yürüyüş Olanakları",
+    "category:waste": "Atık ve Geri Dönüşüm",
+    "category:water": "Su kütleleri",
+    "category:wikipedia": "Wikipedia",
+    "category:works": "Endüstri Bölgeleri",
+    "category:xmas": "Noel",
     "category:administrative": "İdari Alanlar",
     "category:agriculture": "Tarım",
     "category:alternative_amenities": "Tesisler",
@@ -71,6 +71,9 @@
     "category:buildings-figure-ground": "Figür-zemin diyagramı",
     "category:buildings-height": "Bina yüksekliği",
     "category:buildings-start_date": "Bina yaşı",
+    "category:resources": "Yeraltı Kaynağı Çıkarma",
+    "category:residential": "Yerleşim Alanları",
+    "category:renewables": "Yenilenebilir kaynaklar",
     "category:buildings-type": "Bina tipleri",
     "category:buildings": "Binalar",
     "category:car_amenities": "Tesisler",
@@ -79,16 +82,6 @@
     "category:car_routes": "Araba Rotaları",
     "category:children": "Çocuk Malzemeleri",
     "category:climbing": "Tırmanış",
-    "category:tourism_services": "Turizm",
-    "category:walk_amenities": "Olanaklar",
-    "category:walk_amenities_qa": "Yürüyüş Olanakları",
-    "category:waste": "Atık ve Geri Dönüşüm",
-    "category:water": "Su kütleleri",
-    "category:works": "Endüstri Bölgeleri",
-    "category:xmas": "Noel",
-    "category:swimming_bathing": "Yüzme ve banyo yapma",
-    "category:tourism_attractions": "Turizm",
-    "category:transport_alternative": "Alternatif Ulaşım modları",
     "category:coal": "Kömür",
     "category:communication": "İletişim",
     "category:construction": "İnşaat Sahaları",
@@ -103,5 +96,12 @@
     "category:education": "Eğitim Servisleri",
     "category:electric_power": "Elektrik Enerjisi",
     "category:emergency": "Acil Servisler",
-    "category:financial": "Finansal"
+    "category:financial": "Finansal",
+    "category:fixme": "Beni Geliştirin",
+    "category:footways": "Yaya Yolları",
+    "category:gastro-smoking": "Dumansız Gastronomi",
+    "category:gastro": "Gastronomi",
+    "category:health": "Sağlık",
+    "category:heritage": "Kültürel Miras",
+    "category:hiking_routes": "Yürüyüş Rotaları"
 }
diff --git a/lang/uk.json b/lang/uk.json
index ca1122e..c4028a7 100644
--- a/lang/uk.json
+++ b/lang/uk.json
@@ -1,6 +1,4 @@
 {
-    "category:gastro": "Гастрономія",
-    "category:health": "Здоров'я",
     "category:historic": "Історія",
     "category:leisure_sport_shopping": "Дозвілля",
     "category:services": "Послуги",
@@ -17,22 +15,24 @@
     "category:pt_amenities": "Amenities",
     "category:public": "Громадські місця",
     "category:religion": "Релігія",
-    "category:residential": "Житлова зона",
     "category:shop": "Торгівля",
     "category:sport": "Спорт. Інше.",
+    "category:tourism_attractions": "Туризм",
+    "category:tourism_services": "Туризм",
+    "category:transport_alternative": "Інші (Велосипедні, піші, ...)",
     "category:alternative_amenities": "Amenities",
     "category:alternative_routes": "Маршрути",
+    "category:residential": "Житлова зона",
     "category:car_amenities": "Amenities",
     "category:car_furniture": "Street Furniture",
-    "category:tourism_services": "Туризм",
-    "category:tourism_attractions": "Туризм",
-    "category:transport_alternative": "Інші (Велосипедні, піші, ...)",
     "category:communication": "Телекомунікації",
     "category:culture": "Культура ",
     "category:culture_religion": "Культура ",
     "category:education": "Освіта",
     "category:emergency": "Швидка допомога",
     "category:financial": "Фінанси",
+    "category:gastro": "Гастрономія",
+    "category:health": "Здоров'я",
     "category:administrative": "",
     "category:agriculture": "",
     "category:buildings": "",