diff --git a/gastro.json b/gastro.json
index e97c08d..c0c1298 100644
--- a/gastro.json
+++ b/gastro.json
@@ -6,7 +6,7 @@
         "de": "Gastronomie",
         "el": "Γαστρονομία",
         "en": "Gastronomy",
-        "fr": "Gastronomie",
+        "fr": "Restauration",
         "hu": "Gasztronómia",
         "it": "Gastronomia",
         "ja": "食べ物",
diff --git a/index.json b/index.json
index 8826c43..2cda745 100644
--- a/index.json
+++ b/index.json
@@ -284,7 +284,7 @@
                 "en": "Special",
                 "de": "Spezial",
                 "pt-br": "Especial",
-                "fr": "Spécial"
+                "fr": "Catégories spéciales"
             },
             "subCategories": [
                 {
diff --git a/lang/ast.json b/lang/ast.json
index ff08375..3e2809f 100644
--- a/lang/ast.json
+++ b/lang/ast.json
@@ -17,6 +17,7 @@
     "category:education": "Servicios educativos",
     "category:emergency": "Servicios d'emerxencia",
     "category:financial": "Dineru",
+    "category:gastro-smoking": "",
     "category:gastro": "Gastronomía",
     "category:health": "Salú",
     "category:hiking_routes": null,
diff --git a/lang/ca.json b/lang/ca.json
index dd1e674..ab0ea2b 100644
--- a/lang/ca.json
+++ b/lang/ca.json
@@ -17,6 +17,7 @@
     "category:education": null,
     "category:emergency": "Serveis d'emergència",
     "category:financial": null,
+    "category:gastro-smoking": "",
     "category:gastro": null,
     "category:health": null,
     "category:hiking_routes": null,
diff --git a/lang/cs.json b/lang/cs.json
index 9658f81..6cedc0b 100644
--- a/lang/cs.json
+++ b/lang/cs.json
@@ -17,6 +17,7 @@
     "category:education": "Vzdělávací služby",
     "category:emergency": "Pohotovostní služby",
     "category:financial": "Finanční služby",
+    "category:gastro-smoking": "",
     "category:gastro": "Stravování",
     "category:health": "Zdravotnictví",
     "category:hiking_routes": null,
diff --git a/lang/de.json b/lang/de.json
index 702fe3f..65b2751 100644
--- a/lang/de.json
+++ b/lang/de.json
@@ -17,6 +17,7 @@
     "category:education": "Bildungseinrichtungen",
     "category:emergency": "Notfalldienste",
     "category:financial": "Finanzen",
+    "category:gastro-smoking": "Rauchfreie Gastronomie",
     "category:gastro": "Gastronomie",
     "category:health": "Gesundheitsdienste",
     "category:hiking_routes": "Wanderrouten",
diff --git a/lang/el.json b/lang/el.json
index fdd4ea7..9ad636d 100644
--- a/lang/el.json
+++ b/lang/el.json
@@ -17,6 +17,7 @@
     "category:education": "Υπηρεσίες Εκπαίδευσης",
     "category:emergency": "Υπηρεσίες Έκτακτης Ανάγκης",
     "category:financial": "Χρήμα",
+    "category:gastro-smoking": "",
     "category:gastro": "Γαστρονομία",
     "category:health": "Υγεία",
     "category:hiking_routes": null,
diff --git a/lang/en.json b/lang/en.json
index 73fc883..3405835 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -11,12 +11,13 @@
     "category:communication": "Communication",
     "category:construction": "Construction Sites",
     "category:culture": "Culture",
-    "category:culture_religion": "Culture",
+    "category:culture_religion": "Culture and Religion",
     "category:cycle_amenities": "Amenities",
     "category:cycle_routes": "Cycle Routes",
     "category:education": "Educational Services",
     "category:emergency": "Emergency Services",
     "category:financial": "Financial",
+    "category:gastro-smoking": "Smokefree Gastronomy",
     "category:gastro": "Gastronomy",
     "category:health": "Health",
     "category:hiking_routes": "Hiking routes",
diff --git a/lang/es.json b/lang/es.json
index 1929f96..fd4edb1 100644
--- a/lang/es.json
+++ b/lang/es.json
@@ -17,6 +17,7 @@
     "category:education": null,
     "category:emergency": "Servicios de emergencia",
     "category:financial": null,
+    "category:gastro-smoking": "",
     "category:gastro": null,
     "category:health": null,
     "category:hiking_routes": null,
diff --git a/lang/et.json b/lang/et.json
index f7fb354..7a7e53e 100644
--- a/lang/et.json
+++ b/lang/et.json
@@ -17,6 +17,7 @@
     "category:education": "Haridusteenused",
     "category:emergency": "Hädaabi teenused",
     "category:financial": null,
+    "category:gastro-smoking": "",
     "category:gastro": null,
     "category:health": null,
     "category:hiking_routes": null,
diff --git a/lang/fr.json b/lang/fr.json
index fc7cced..c9c8170 100644
--- a/lang/fr.json
+++ b/lang/fr.json
@@ -11,22 +11,20 @@
     "category:communication": "Communication",
     "category:construction": "Constructions",
     "category:culture": "Culture",
-    "category:culture_religion": "Religion",
+    "category:culture_religion": "Culture et Religion",
     "category:cycle_amenities": "Équipements vélo",
-    "category:cycle_infrastructure": "Infrastructures vélo",
     "category:cycle_routes": "Itinéraires vélo",
     "category:education": "Éducation",
     "category:emergency": "Services d'urgence",
     "category:financial": "Finance",
+    "category:gastro-smoking": "",
     "category:gastro": "Restauration",
     "category:health": "Santé",
     "category:hiking_routes": "Itinéraires pédestres",
     "category:historic": "Histoire",
     "category:index": null,
-    "category:infrastructure": "Infrastructures",
     "category:internet": "Internet",
     "category:leisure": "Loisirs",
-    "category:leisure_sport_shopping": "Loisirs",
     "category:military": "Militaire",
     "category:natural": "Éléments naturels",
     "category:other": "Autres",
@@ -40,27 +38,30 @@
     "category:pt_routes": "Lignes",
     "category:pt_stops": "Arrêts/Stops, Stations",
     "category:public": "Services Publics",
-    "category:railway": "Chemins de fer",
     "category:railway-electrification": "Puissance électrique ferroviaire",
     "category:railway-infrastructure": "Infrastructure ferroviaire",
     "category:religion": "Religion",
     "category:residential": "Zones résidentielles",
     "category:resources": "Extraction des ressources",
-    "category:services": "Services",
     "category:shop": "Magasins/Boutiques",
-    "category:special": "Catégories spéciales",
     "category:sport": "Sports",
     "category:tourism_attractions": "Tourisme",
     "category:tourism_services": "Tourisme",
-    "category:transport": "Transports",
     "category:transport_alternative": "Alternatif (Cyclisme, Randonnée, ...)",
-    "category:transport_car": "Transport automobile",
-    "category:transport_cycle": "Cyclisme",
-    "category:transport_pt": "Transports publics",
-    "category:transport_walk": "Marche à pied",
     "category:walk_amenities": "Équipements piétons",
     "category:waste": "Déchets/Recyclage",
     "category:water": "Hydrographie",
     "category:wikipedia": "Wikipédia",
-    "category:works": "Zones industrielles"
+    "category:works": "Zones industrielles",
+    "category:cycle_infrastructure": "Infrastructures vélo",
+    "category:infrastructure": "Infrastructures",
+    "category:leisure_sport_shopping": "Loisirs",
+    "category:railway": "Chemins de fer",
+    "category:services": "Services",
+    "category:special": "Catégories spéciales",
+    "category:transport": "Transports",
+    "category:transport_car": "Transport automobile",
+    "category:transport_cycle": "Cyclisme",
+    "category:transport_pt": "Transports publics",
+    "category:transport_walk": "Marche à pied"
 }
diff --git a/lang/hu.json b/lang/hu.json
index b67026b..baa8011 100644
--- a/lang/hu.json
+++ b/lang/hu.json
@@ -17,6 +17,7 @@
     "category:education": null,
     "category:emergency": null,
     "category:financial": null,
+    "category:gastro-smoking": "",
     "category:gastro": "Gasztronómia",
     "category:health": null,
     "category:hiking_routes": null,
diff --git a/lang/it.json b/lang/it.json
index 6e46050..aec466c 100644
--- a/lang/it.json
+++ b/lang/it.json
@@ -17,6 +17,7 @@
     "category:education": "Istruzione",
     "category:emergency": "Servizi d'emergenza",
     "category:financial": "Finanze",
+    "category:gastro-smoking": "",
     "category:gastro": "Gastronomia",
     "category:health": "Sanità",
     "category:hiking_routes": null,
diff --git a/lang/ja.json b/lang/ja.json
index 78b3036..dc75e8e 100644
--- a/lang/ja.json
+++ b/lang/ja.json
@@ -17,6 +17,7 @@
     "category:education": "教育サービス",
     "category:emergency": "緊急サービス",
     "category:financial": "金融",
+    "category:gastro-smoking": "",
     "category:gastro": "食べ物",
     "category:health": "健康",
     "category:hiking_routes": null,
diff --git a/lang/nl.json b/lang/nl.json
index 06c2e8a..68d6052 100644
--- a/lang/nl.json
+++ b/lang/nl.json
@@ -17,6 +17,7 @@
     "category:education": "Onderwijs",
     "category:emergency": "Hulpdiensten",
     "category:financial": "Financieel",
+    "category:gastro-smoking": "",
     "category:gastro": "Gastronomie",
     "category:health": "Gezondheid",
     "category:hiking_routes": null,
diff --git a/lang/pl.json b/lang/pl.json
index aec05c2..305e715 100644
--- a/lang/pl.json
+++ b/lang/pl.json
@@ -17,6 +17,7 @@
     "category:education": "Edukacyjne",
     "category:emergency": null,
     "category:financial": "Finasowe",
+    "category:gastro-smoking": "",
     "category:gastro": "Gastronomia",
     "category:health": "Zdrowie",
     "category:hiking_routes": null,
diff --git a/lang/pt-br.json b/lang/pt-br.json
index 4536be3..14ffd62 100644
--- a/lang/pt-br.json
+++ b/lang/pt-br.json
@@ -17,6 +17,7 @@
     "category:education": "Educação",
     "category:emergency": "Emergência",
     "category:financial": "Finanças",
+    "category:gastro-smoking": "",
     "category:gastro": "Gastronomia",
     "category:health": "Saúde e Assistência",
     "category:hiking_routes": "Rotas de Caminhada",
diff --git a/lang/ro.json b/lang/ro.json
index 929e130..d344673 100644
--- a/lang/ro.json
+++ b/lang/ro.json
@@ -17,6 +17,7 @@
     "category:education": "Servicii educatie",
     "category:emergency": "Servicii urgenta",
     "category:financial": "Financiar",
+    "category:gastro-smoking": "",
     "category:gastro": "Gastronomie",
     "category:health": "Sanatate",
     "category:hiking_routes": null,
diff --git a/lang/ru.json b/lang/ru.json
index 8dcff00..cf6e2a4 100644
--- a/lang/ru.json
+++ b/lang/ru.json
@@ -17,6 +17,7 @@
     "category:education": "Образование",
     "category:emergency": "Экстренные службы",
     "category:financial": "Финансы",
+    "category:gastro-smoking": "",
     "category:gastro": "Общепит",
     "category:health": "Медицина",
     "category:hiking_routes": null,
diff --git a/lang/template.json b/lang/template.json
index 43abbea..8819bcb 100644
--- a/lang/template.json
+++ b/lang/template.json
@@ -13,20 +13,18 @@
     "category:culture": "",
     "category:culture_religion": "",
     "category:cycle_amenities": "",
-    "category:cycle_infrastructure": "",
     "category:cycle_routes": "",
     "category:education": "",
     "category:emergency": "",
     "category:financial": "",
+    "category:gastro-smoking": "",
     "category:gastro": "",
     "category:health": "",
     "category:hiking_routes": "",
     "category:historic": "",
     "category:index": "",
-    "category:infrastructure": "",
     "category:internet": "",
     "category:leisure": "",
-    "category:leisure_sport_shopping": "",
     "category:military": "",
     "category:natural": "",
     "category:other": "",
@@ -40,27 +38,30 @@
     "category:pt_routes": "",
     "category:pt_stops": "",
     "category:public": "",
-    "category:railway": "",
     "category:railway-electrification": "",
     "category:railway-infrastructure": "",
     "category:religion": "",
     "category:residential": "",
     "category:resources": "",
-    "category:services": "",
     "category:shop": "",
-    "category:special": "",
     "category:sport": "",
     "category:tourism_attractions": "",
     "category:tourism_services": "",
-    "category:transport": "",
     "category:transport_alternative": "",
-    "category:transport_car": "",
-    "category:transport_cycle": "",
-    "category:transport_pt": "",
-    "category:transport_walk": "",
     "category:walk_amenities": "",
     "category:waste": "",
     "category:water": "",
     "category:wikipedia": "",
-    "category:works": ""
+    "category:works": "",
+    "category:cycle_infrastructure": "",
+    "category:infrastructure": "",
+    "category:leisure_sport_shopping": "",
+    "category:railway": "",
+    "category:services": "",
+    "category:special": "",
+    "category:transport": "",
+    "category:transport_car": "",
+    "category:transport_cycle": "",
+    "category:transport_pt": "",
+    "category:transport_walk": ""
 }
diff --git a/lang/uk.json b/lang/uk.json
index bb3597f..49de445 100644
--- a/lang/uk.json
+++ b/lang/uk.json
@@ -17,6 +17,7 @@
     "category:education": "Освіта",
     "category:emergency": "Швидка допомога",
     "category:financial": "Фінанси",
+    "category:gastro-smoking": "",
     "category:gastro": "Гастрономія",
     "category:health": "Здоров'я",
     "category:hiking_routes": null,
diff --git a/shop.json b/shop.json
index 53ef5cc..b99c127 100644
--- a/shop.json
+++ b/shop.json
@@ -7,7 +7,7 @@
         "el": "Αγορές",
         "en": "Shopping",
         "et": "Ostmine",
-        "fr": "Magasinage/Shopping",
+        "fr": "Magasins/Boutiques",
         "hu": "Vásárlás",
         "it": "Acquisti",
         "ja": "ショッピング",
diff --git a/sport.json b/sport.json
index 335a626..ef6be0e 100644
--- a/sport.json
+++ b/sport.json
@@ -6,7 +6,7 @@
         "de": "Sport",
         "el": "Άθληση",
         "en": "Sport",
-        "fr": "Autres sports",
+        "fr": "Sports",
         "hu": "Sport",
         "it": "Sport",
         "ja": "スポーツ",