diff --git a/craft.json b/craft.json
new file mode 100644
index 0000000..9c361fe
--- /dev/null
+++ b/craft.json
@@ -0,0 +1,73 @@
+{
+    "type": "overpass",
+    "name": {
+        "de": "Handwerk",
+        "en": "Craft"
+    },
+    "query": {
+        "15": "(node[craft];way[craft];relation[craft];);"
+    },
+    "feature": {
+        "description": "{{ tagTransList('craft', tags.craft) }}",
+        "markerSign": "{% set craft0 = tags.craft|split(';')[0] %}{% if const.crafts[craft0] %}{% set v = const.crafts[craft0] %}{% else %}{% set v = const.default %}{% endif %}{% if v|slice(0, 3) == 'fa-' %}<i class=\"fa {{ v }}\"></i>{% else %}{{ v|raw }}{% endif %}"
+    },
+    "const": {
+        "default": "",
+        "crafts": {
+            "bakery": "fa-birthday-cake",
+            "beekeeper": "🐝",
+            "blacksmith": "🔨",
+            "boatbuilder": "⛵",
+            "bookbinder": "📕",
+            "brewery": "fa-beer",
+            "builder": "🚧",
+            "carpenter": "",
+            "carpet_layer": "",
+            "caterer": "fa-birthday-cake",
+            "chimney_sweeper": "",
+            "clockmaker": "⌚",
+            "confectionery": "",
+            "distillery": "🍷",
+            "dressmaker": "&#128090;",
+            "electrician": "🔌",
+            "floorer": "",
+            "gardener": "⚘",
+            "glaziery": "",
+            "handicraft": "",
+            "hvac": "",
+            "insulation": "",
+            "jeweller": "💍",
+            "key_cutter": "🔑",
+            "locksmith": "🔑",
+            "metal_construction": "",
+            "optician": "👓",
+            "painter": "🖌",
+            "parquet_layer": "",
+            "photographer": "📷",
+            "photographic_laboratory": "📷",
+            "piano_tuner": "",
+            "plasterer": "",
+            "plumber": "",
+            "pottery": "",
+            "rigger": "",
+            "roofer": "",
+            "saddler": "🐎",
+            "sailmaker": "⛵",
+            "sawmill": "",
+            "scaffolder": "",
+            "sculptor": "",
+            "shoemaker": "👞",
+            "stand_builder": "",
+            "stonemason": "",
+            "sun_protection": "",
+            "tailor": "&#128090;",
+            "tiler": "",
+            "tinsmith": "",
+            "turner": "",
+            "upholsterer": "",
+            "watchmaker": "⌚",
+            "window_construction": "",
+            "winery": "🍷"
+        }
+    }
+}
diff --git a/index.json b/index.json
index 2cda745..1b5b475 100644
--- a/index.json
+++ b/index.json
@@ -31,6 +31,9 @@
                 {
                     "id": "shop"
                 },
+                {
+                    "id": "craft"
+                },
                 {
                     "id": "leisure"
                 },
diff --git a/lang/ast.json b/lang/ast.json
index 3e2809f..827a031 100644
--- a/lang/ast.json
+++ b/lang/ast.json
@@ -10,6 +10,7 @@
     "category:children": null,
     "category:communication": "Comunicaciones",
     "category:construction": "Sitios d'obres",
+    "category:craft": "",
     "category:culture": "Cultura",
     "category:culture_religion": "Cultura",
     "category:cycle_amenities": null,
diff --git a/lang/ca.json b/lang/ca.json
index ab0ea2b..6a797d9 100644
--- a/lang/ca.json
+++ b/lang/ca.json
@@ -10,6 +10,7 @@
     "category:children": null,
     "category:communication": "Comunicacions",
     "category:construction": null,
+    "category:craft": "",
     "category:culture": "Cultura",
     "category:culture_religion": "Cultura i religió",
     "category:cycle_amenities": null,
diff --git a/lang/cs.json b/lang/cs.json
index 6cedc0b..92078a4 100644
--- a/lang/cs.json
+++ b/lang/cs.json
@@ -10,6 +10,7 @@
     "category:children": null,
     "category:communication": "Komunikace",
     "category:construction": "Staveniště",
+    "category:craft": "",
     "category:culture": "Kultura",
     "category:culture_religion": "Kultura",
     "category:cycle_amenities": null,
diff --git a/lang/de.json b/lang/de.json
index 65b2751..ba51927 100644
--- a/lang/de.json
+++ b/lang/de.json
@@ -10,6 +10,7 @@
     "category:children": "Einrichtungen für Kinder",
     "category:communication": "Kommunikation",
     "category:construction": "Baustellen",
+    "category:craft": "Handwerk",
     "category:culture": "Kultur",
     "category:culture_religion": "Kultur und Religion",
     "category:cycle_amenities": "Einrichtungen",
diff --git a/lang/el.json b/lang/el.json
index 9ad636d..a8b68ee 100644
--- a/lang/el.json
+++ b/lang/el.json
@@ -10,6 +10,7 @@
     "category:children": null,
     "category:communication": "Επικοινωνίες",
     "category:construction": null,
+    "category:craft": "",
     "category:culture": "Πολιτισμός",
     "category:culture_religion": "Πολιτισμός",
     "category:cycle_amenities": null,
diff --git a/lang/en.json b/lang/en.json
index 3405835..2b8fc3c 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -10,6 +10,7 @@
     "category:children": "Children amenities",
     "category:communication": "Communication",
     "category:construction": "Construction Sites",
+    "category:craft": "Craft",
     "category:culture": "Culture",
     "category:culture_religion": "Culture and Religion",
     "category:cycle_amenities": "Amenities",
diff --git a/lang/es.json b/lang/es.json
index fd4edb1..f82052d 100644
--- a/lang/es.json
+++ b/lang/es.json
@@ -10,6 +10,7 @@
     "category:children": null,
     "category:communication": null,
     "category:construction": null,
+    "category:craft": "",
     "category:culture": "Cultura",
     "category:culture_religion": "Cultura y religión",
     "category:cycle_amenities": null,
diff --git a/lang/et.json b/lang/et.json
index 7a7e53e..a325cf5 100644
--- a/lang/et.json
+++ b/lang/et.json
@@ -10,6 +10,7 @@
     "category:children": null,
     "category:communication": "Kommunikatsioon",
     "category:construction": null,
+    "category:craft": "",
     "category:culture": "Kultuur",
     "category:culture_religion": "Kultuur ja religioon",
     "category:cycle_amenities": null,
diff --git a/lang/fr.json b/lang/fr.json
index f533ed6..d4ca096 100644
--- a/lang/fr.json
+++ b/lang/fr.json
@@ -10,6 +10,7 @@
     "category:children": "Équipements pour enfants",
     "category:communication": "Communication",
     "category:construction": "Constructions",
+    "category:craft": "",
     "category:culture": "Culture",
     "category:culture_religion": "Culture et Religion",
     "category:cycle_amenities": "Équipements vélo",
@@ -37,7 +38,7 @@
     "category:pt_amenities": "Équipements",
     "category:pt_routes": "Lignes",
     "category:pt_stops": "Arrêts/Stops, Stations",
-    "category:public": "Services publics",
+    "category:public": "Services Publics",
     "category:railway-electrification": "Puissance électrique ferroviaire",
     "category:railway-infrastructure": "Infrastructure ferroviaire",
     "category:religion": "Religion",
diff --git a/lang/hu.json b/lang/hu.json
index baa8011..7cb807f 100644
--- a/lang/hu.json
+++ b/lang/hu.json
@@ -10,6 +10,7 @@
     "category:children": null,
     "category:communication": "Kommunikácó",
     "category:construction": null,
+    "category:craft": "",
     "category:culture": "Kultúra",
     "category:culture_religion": "Kultúra",
     "category:cycle_amenities": null,
diff --git a/lang/it.json b/lang/it.json
index aec466c..7478533 100644
--- a/lang/it.json
+++ b/lang/it.json
@@ -10,6 +10,7 @@
     "category:children": null,
     "category:communication": "Communicazioni",
     "category:construction": "Cantieri",
+    "category:craft": "",
     "category:culture": "Cultura",
     "category:culture_religion": "Cultura",
     "category:cycle_amenities": null,
diff --git a/lang/ja.json b/lang/ja.json
index dc75e8e..173f467 100644
--- a/lang/ja.json
+++ b/lang/ja.json
@@ -10,6 +10,7 @@
     "category:children": null,
     "category:communication": "交流",
     "category:construction": "工事中",
+    "category:craft": "",
     "category:culture": "文化",
     "category:culture_religion": "文化",
     "category:cycle_amenities": null,
diff --git a/lang/nl.json b/lang/nl.json
index 68d6052..e542067 100644
--- a/lang/nl.json
+++ b/lang/nl.json
@@ -10,6 +10,7 @@
     "category:children": null,
     "category:communication": "Communicatie",
     "category:construction": "Bouwterrein",
+    "category:craft": "",
     "category:culture": "Cultuur",
     "category:culture_religion": "Cultuur",
     "category:cycle_amenities": null,
diff --git a/lang/pl.json b/lang/pl.json
index 305e715..251dc1d 100644
--- a/lang/pl.json
+++ b/lang/pl.json
@@ -10,6 +10,7 @@
     "category:children": null,
     "category:communication": null,
     "category:construction": null,
+    "category:craft": "",
     "category:culture": "Kultura",
     "category:culture_religion": "Kultura",
     "category:cycle_amenities": null,
diff --git a/lang/pt-br.json b/lang/pt-br.json
index 14ffd62..9497502 100644
--- a/lang/pt-br.json
+++ b/lang/pt-br.json
@@ -10,6 +10,7 @@
     "category:children": "Equipamentos Infantis",
     "category:communication": "Comunicação",
     "category:construction": "Canteiros de Obras",
+    "category:craft": "",
     "category:culture": "Cultura",
     "category:culture_religion": "Cultura",
     "category:cycle_amenities": "Equipamentos",
diff --git a/lang/ro.json b/lang/ro.json
index d344673..d726a6c 100644
--- a/lang/ro.json
+++ b/lang/ro.json
@@ -10,6 +10,7 @@
     "category:children": null,
     "category:communication": "Comunicatii",
     "category:construction": null,
+    "category:craft": "",
     "category:culture": "Cultura",
     "category:culture_religion": "Cultura",
     "category:cycle_amenities": null,
diff --git a/lang/ru.json b/lang/ru.json
index cf6e2a4..9985ae0 100644
--- a/lang/ru.json
+++ b/lang/ru.json
@@ -10,6 +10,7 @@
     "category:children": null,
     "category:communication": "Услуги связи",
     "category:construction": "Места строительства",
+    "category:craft": "",
     "category:culture": "Культура",
     "category:culture_religion": "Культура",
     "category:cycle_amenities": null,
diff --git a/lang/template.json b/lang/template.json
index 8819bcb..54044bd 100644
--- a/lang/template.json
+++ b/lang/template.json
@@ -10,6 +10,7 @@
     "category:children": "",
     "category:communication": "",
     "category:construction": "",
+    "category:craft": "",
     "category:culture": "",
     "category:culture_religion": "",
     "category:cycle_amenities": "",
diff --git a/lang/uk.json b/lang/uk.json
index 49de445..f8e7d1d 100644
--- a/lang/uk.json
+++ b/lang/uk.json
@@ -10,6 +10,7 @@
     "category:children": null,
     "category:communication": "Телекомунікації",
     "category:construction": null,
+    "category:craft": "",
     "category:culture": "Культура ",
     "category:culture_religion": "Культура ",
     "category:cycle_amenities": null,