diff --git a/data/presets.yaml b/data/presets.yaml
index 19072b911..356113197 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -639,6 +639,141 @@ en:
       building/residential: 
         name: Residential Building
         terms: "<translate with synonyms or related terms for 'Residential Building', separated by commas>"
+      craft/basket_maker: 
+        name: Basket Maker
+        terms: "<translate with synonyms or related terms for 'Basket Maker', separated by commas>"
+      craft/beekeeper: 
+        name: Beekeeper
+        terms: "<translate with synonyms or related terms for 'Beekeeper', separated by commas>"
+      craft/blacksmith: 
+        name: Blacksmith
+        terms: "<translate with synonyms or related terms for 'Blacksmith', separated by commas>"
+      craft/boatbuilder: 
+        name: Boat Builder
+        terms: "<translate with synonyms or related terms for 'Boat Builder', separated by commas>"
+      craft/bookbinder: 
+        name: Bookbinder
+        terms: "<translate with synonyms or related terms for 'Bookbinder', separated by commas>"
+      craft/brewery: 
+        name: Brewery
+        terms: "<translate with synonyms or related terms for 'Brewery', separated by commas>"
+      craft/carpenter: 
+        name: Carpenter
+        terms: "<translate with synonyms or related terms for 'Carpenter', separated by commas>"
+      craft/carpet_layer: 
+        name: Carpet Layer
+        terms: "<translate with synonyms or related terms for 'Carpet Layer', separated by commas>"
+      craft/caterer: 
+        name: Caterer
+        terms: "<translate with synonyms or related terms for 'Caterer', separated by commas>"
+      craft/clockmaker: 
+        name: Clockmaker
+        terms: "<translate with synonyms or related terms for 'Clockmaker', separated by commas>"
+      craft/confectionary: 
+        name: Confectionary
+        terms: "<translate with synonyms or related terms for 'Confectionary', separated by commas>"
+      craft/dressmaker: 
+        name: Dressmaker
+        terms: "<translate with synonyms or related terms for 'Dressmaker', separated by commas>"
+      craft/electrician: 
+        name: Electrician
+        terms: "<translate with synonyms or related terms for 'Electrician', separated by commas>"
+      craft/gardener: 
+        name: Gardener
+        terms: "<translate with synonyms or related terms for 'Gardener', separated by commas>"
+      craft/glaziery: 
+        name: Glaziery
+        terms: "<translate with synonyms or related terms for 'Glaziery', separated by commas>"
+      craft/handicraft: 
+        name: Handicraft
+        terms: "<translate with synonyms or related terms for 'Handicraft', separated by commas>"
+      craft/hvac: 
+        name: HVAC
+        terms: "<translate with synonyms or related terms for 'HVAC', separated by commas>"
+      craft/insulator: 
+        name: Insulator
+        terms: "<translate with synonyms or related terms for 'Insulator', separated by commas>"
+      craft/jeweler: 
+        name: Jeweler
+        terms: "<translate with synonyms or related terms for 'Jeweler', separated by commas>"
+      craft/key_cutter: 
+        name: Key Cutter
+        terms: "<translate with synonyms or related terms for 'Key Cutter', separated by commas>"
+      craft/locksmith: 
+        name: Locksmith
+        terms: "<translate with synonyms or related terms for 'Locksmith', separated by commas>"
+      craft/metal_construction: 
+        name: Metal Construction
+        terms: "<translate with synonyms or related terms for 'Metal Construction', separated by commas>"
+      craft/optician: 
+        name: Optician
+        terms: "<translate with synonyms or related terms for 'Optician', separated by commas>"
+      craft/painter: 
+        name: painter
+        terms: "<translate with synonyms or related terms for 'painter', separated by commas>"
+      craft/photographer: 
+        name: Photographer
+        terms: "<translate with synonyms or related terms for 'Photographer', separated by commas>"
+      craft/photographic_labratory: 
+        name: Photographic Labratory
+        terms: "<translate with synonyms or related terms for 'Photographic Labratory', separated by commas>"
+      craft/plasterer: 
+        name: Plasterer
+        terms: "<translate with synonyms or related terms for 'Plasterer', separated by commas>"
+      craft/plumber: 
+        name: Plumber
+        terms: "<translate with synonyms or related terms for 'Plumber', separated by commas>"
+      craft/pottery: 
+        name: Pottery
+        terms: "<translate with synonyms or related terms for 'Pottery', separated by commas>"
+      craft/rigger: 
+        name: Rigger
+        terms: "<translate with synonyms or related terms for 'Rigger', separated by commas>"
+      craft/roofer: 
+        name: Roofer
+        terms: "<translate with synonyms or related terms for 'Roofer', separated by commas>"
+      craft/saddler: 
+        name: Saddler
+        terms: "<translate with synonyms or related terms for 'Saddler', separated by commas>"
+      craft/sailmaker: 
+        name: Sailmaker
+        terms: "<translate with synonyms or related terms for 'Sailmaker', separated by commas>"
+      craft/sawmill: 
+        name: Sawmill
+        terms: "<translate with synonyms or related terms for 'Sawmill', separated by commas>"
+      craft/scaffolder: 
+        name: Scaffolder
+        terms: "<translate with synonyms or related terms for 'Scaffolder', separated by commas>"
+      craft/sculpter: 
+        name: Sculpter
+        terms: "<translate with synonyms or related terms for 'Sculpter', separated by commas>"
+      craft/shoemaker: 
+        name: Shoemaker
+        terms: "<translate with synonyms or related terms for 'Shoemaker', separated by commas>"
+      craft/stonemason: 
+        name: Stonemason
+        terms: "<translate with synonyms or related terms for 'Stonemason', separated by commas>"
+      craft/sweep: 
+        name: Chimney Sweep
+        terms: "<translate with synonyms or related terms for 'Chimney Sweep', separated by commas>"
+      craft/tailor: 
+        name: Tailor
+        terms: "<translate with synonyms or related terms for 'Tailor', separated by commas>"
+      craft/tiler: 
+        name: Tiler
+        terms: "<translate with synonyms or related terms for 'Tiler', separated by commas>"
+      craft/tinsmith: 
+        name: Tinsmith
+        terms: "<translate with synonyms or related terms for 'Tinsmith', separated by commas>"
+      craft/upholsterer: 
+        name: Upholsterer
+        terms: "<translate with synonyms or related terms for 'Upholsterer', separated by commas>"
+      craft/watchmaker: 
+        name: Watchmaker
+        terms: "<translate with synonyms or related terms for 'Watchmaker', separated by commas>"
+      craft/window_construction: 
+        name: Window Construction
+        terms: "<translate with synonyms or related terms for 'Window Construction', separated by commas>"
       embankment: 
         name: Embankment
         terms: "<translate with synonyms or related terms for 'Embankment', separated by commas>"
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 0992963c5..3b0e2d358 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -1897,6 +1897,945 @@
         },
         "name": "Residential Building"
     },
+    "craft/basket_maker": {
+        "name": "Basket Maker",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "basket",
+            "basketry",
+            "basket maker",
+            "basket weaver"
+        ],
+        "tags": {
+            "craft": "basket_maker"
+        },
+        "icon": "art-gallery",
+        "fields": [
+            "building_area",
+            "address",
+            "operator",
+            "opening_hours"
+        ]
+    },
+    "craft/beekeeper": {
+        "name": "Beekeeper",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "bees",
+            "beekeeper",
+            "bee box"
+        ],
+        "tags": {
+            "craft": "beekeeper"
+        },
+        "icon": "farm",
+        "fields": [
+            "building_area",
+            "address",
+            "operator",
+            "opening_hours"
+        ]
+    },
+    "craft/blacksmith": {
+        "name": "Blacksmith",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "blacksmith"
+        ],
+        "tags": {
+            "craft": "blacksmith"
+        },
+        "icon": "farm",
+        "fields": [
+            "building_area",
+            "address",
+            "operator",
+            "opening_hours"
+        ]
+    },
+    "craft/boatbuilder": {
+        "name": "Boat Builder",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "boat builder"
+        ],
+        "tags": {
+            "craft": "boatbuilder"
+        },
+        "icon": "marker-stroked",
+        "fields": [
+            "building_area",
+            "address",
+            "operator",
+            "opening_hours"
+        ]
+    },
+    "craft/bookbinder": {
+        "name": "Bookbinder",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "bookbinder",
+            "book repair"
+        ],
+        "tags": {
+            "craft": "bookbinder"
+        },
+        "icon": "library",
+        "fields": [
+            "building_area",
+            "address",
+            "operator",
+            "opening_hours"
+        ]
+    },
+    "craft/brewery": {
+        "name": "Brewery",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "brewery"
+        ],
+        "tags": {
+            "craft": "brewery"
+        },
+        "icon": "beer",
+        "fields": [
+            "building_area",
+            "address",
+            "operator",
+            "opening_hours"
+        ]
+    },
+    "craft/carpenter": {
+        "name": "Carpenter",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "carpenter",
+            "woodworker"
+        ],
+        "tags": {
+            "craft": "carpenter"
+        },
+        "icon": "logging",
+        "fields": [
+            "building_area",
+            "address",
+            "operator",
+            "opening_hours"
+        ]
+    },
+    "craft/carpet_layer": {
+        "name": "Carpet Layer",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "carpet layer"
+        ],
+        "tags": {
+            "craft": "carpet_layer"
+        },
+        "icon": "square",
+        "fields": [
+            "building_area",
+            "address",
+            "operator",
+            "opening_hours"
+        ]
+    },
+    "craft/caterer": {
+        "name": "Caterer",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "Caterer",
+            "Catering"
+        ],
+        "tags": {
+            "craft": "caterer"
+        },
+        "icon": "bakery",
+        "fields": [
+            "cuisine",
+            "building_area",
+            "address",
+            "operator",
+            "opening_hours"
+        ]
+    },
+    "craft/clockmaker": {
+        "name": "Clockmaker",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "clock",
+            "clockmaker",
+            "clock repair"
+        ],
+        "tags": {
+            "craft": "clockmaker"
+        },
+        "icon": "circle-stroked",
+        "fields": [
+            "building_area",
+            "address",
+            "operator",
+            "opening_hours"
+        ]
+    },
+    "craft/confectionary": {
+        "name": "Confectionary",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "confectionary",
+            "sweets",
+            "candy"
+        ],
+        "tags": {
+            "craft": "confectionary"
+        },
+        "icon": "bakery",
+        "fields": [
+            "building_area",
+            "address",
+            "operator",
+            "opening_hours"
+        ]
+    },
+    "craft/dressmaker": {
+        "name": "Dressmaker",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "dress",
+            "dressmaker"
+        ],
+        "tags": {
+            "craft": "dressmaker"
+        },
+        "icon": "clothing-store",
+        "fields": [
+            "building_area",
+            "address",
+            "operator",
+            "opening_hours"
+        ]
+    },
+    "craft/electrician": {
+        "name": "Electrician",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "electrician"
+        ],
+        "tags": {
+            "craft": "electrician"
+        },
+        "icon": "marker-stroked",
+        "fields": [
+            "building_area",
+            "address",
+            "operator",
+            "opening_hours"
+        ]
+    },
+    "craft/gardener": {
+        "name": "Gardener",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "gardener",
+            "landscaper",
+            "grounds keeper"
+        ],
+        "tags": {
+            "craft": "gardener"
+        },
+        "icon": "garden",
+        "fields": [
+            "building_area",
+            "address",
+            "operator",
+            "opening_hours"
+        ]
+    },
+    "craft/glaziery": {
+        "name": "Glaziery",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "glass",
+            "glass foundry",
+            "stained-glass",
+            "window"
+        ],
+        "tags": {
+            "craft": "glaziery"
+        },
+        "icon": "fire-station",
+        "fields": [
+            "building_area",
+            "address",
+            "operator",
+            "opening_hours"
+        ]
+    },
+    "craft/handicraft": {
+        "name": "Handicraft",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "handicraft"
+        ],
+        "tags": {
+            "craft": "handicraft"
+        },
+        "icon": "art-gallery",
+        "fields": [
+            "building_area",
+            "address",
+            "operator",
+            "opening_hours"
+        ]
+    },
+    "craft/hvac": {
+        "name": "HVAC",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "heating",
+            "ventilating",
+            "air-conditioning",
+            "air conditioning"
+        ],
+        "tags": {
+            "craft": "hvac"
+        },
+        "icon": "marker-stroked",
+        "fields": [
+            "building_area",
+            "address",
+            "operator",
+            "opening_hours"
+        ]
+    },
+    "craft/insulator": {
+        "name": "Insulator",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "insulation",
+            "insulator"
+        ],
+        "tags": {
+            "craft": "insulation"
+        },
+        "icon": "marker-stroked",
+        "fields": [
+            "building_area",
+            "address",
+            "operator",
+            "opening_hours"
+        ]
+    },
+    "craft/jeweler": {
+        "name": "Jeweler",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "jeweler",
+            "gem",
+            "diamond"
+        ],
+        "tags": {
+            "craft": "jeweler"
+        },
+        "icon": "marker-stroked",
+        "fields": [
+            "building_area",
+            "address",
+            "operator",
+            "opening_hours"
+        ]
+    },
+    "craft/key_cutter": {
+        "name": "Key Cutter",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "key",
+            "key cutter"
+        ],
+        "tags": {
+            "craft": "key_cutter"
+        },
+        "icon": "marker-stroked",
+        "fields": [
+            "building_area",
+            "address",
+            "operator",
+            "opening_hours"
+        ]
+    },
+    "craft/locksmith": {
+        "name": "Locksmith",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "locksmith",
+            "lock"
+        ],
+        "tags": {
+            "craft": "locksmith"
+        },
+        "icon": "marker-stroked",
+        "fields": [
+            "building_area",
+            "address",
+            "operator",
+            "opening_hours"
+        ]
+    },
+    "craft/metal_construction": {
+        "name": "Metal Construction",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "metal construction"
+        ],
+        "tags": {
+            "craft": "metal_construction"
+        },
+        "icon": "marker-stroked",
+        "fields": [
+            "building_area",
+            "address",
+            "operator",
+            "opening_hours"
+        ]
+    },
+    "craft/optician": {
+        "name": "Optician",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "glasses",
+            "optician"
+        ],
+        "tags": {
+            "craft": "optician"
+        },
+        "icon": "marker-stroked",
+        "fields": [
+            "building_area",
+            "address",
+            "operator",
+            "opening_hours"
+        ]
+    },
+    "craft/painter": {
+        "name": "painter",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "painter"
+        ],
+        "tags": {
+            "craft": "painter"
+        },
+        "icon": "art-gallery",
+        "fields": [
+            "building_area",
+            "address",
+            "operator",
+            "opening_hours"
+        ]
+    },
+    "craft/photographer": {
+        "name": "Photographer",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "photographer"
+        ],
+        "tags": {
+            "craft": "photographer"
+        },
+        "icon": "camera",
+        "fields": [
+            "building_area",
+            "address",
+            "operator",
+            "opening_hours"
+        ]
+    },
+    "craft/photographic_labratory": {
+        "name": "Photographic Labratory",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "photographic labratory",
+            "film developer"
+        ],
+        "tags": {
+            "craft": "photographic_labratory"
+        },
+        "icon": "camera",
+        "fields": [
+            "building_area",
+            "address",
+            "operator",
+            "opening_hours"
+        ]
+    },
+    "craft/plasterer": {
+        "name": "Plasterer",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "plasterer"
+        ],
+        "tags": {
+            "craft": "plasterer"
+        },
+        "icon": "marker-stroked",
+        "fields": [
+            "building_area",
+            "address",
+            "operator",
+            "opening_hours"
+        ]
+    },
+    "craft/plumber": {
+        "name": "Plumber",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "pumber"
+        ],
+        "tags": {
+            "craft": "plumber"
+        },
+        "icon": "marker-stroked",
+        "fields": [
+            "building_area",
+            "address",
+            "operator",
+            "opening_hours"
+        ]
+    },
+    "craft/pottery": {
+        "name": "Pottery",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "pottery",
+            "potter"
+        ],
+        "tags": {
+            "craft": "pottery"
+        },
+        "icon": "art-gallery",
+        "fields": [
+            "building_area",
+            "address",
+            "operator",
+            "opening_hours"
+        ]
+    },
+    "craft/rigger": {
+        "name": "Rigger",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "rigger"
+        ],
+        "tags": {
+            "craft": "rigger"
+        },
+        "icon": "marker-stroked",
+        "fields": [
+            "building_area",
+            "address",
+            "operator",
+            "opening_hours"
+        ]
+    },
+    "craft/roofer": {
+        "name": "Roofer",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "roofer"
+        ],
+        "tags": {
+            "craft": "roofer"
+        },
+        "icon": "marker-stroked",
+        "fields": [
+            "building_area",
+            "address",
+            "operator",
+            "opening_hours"
+        ]
+    },
+    "craft/saddler": {
+        "name": "Saddler",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "saddler"
+        ],
+        "tags": {
+            "craft": "saddler"
+        },
+        "icon": "marker-stroked",
+        "fields": [
+            "building_area",
+            "address",
+            "operator",
+            "opening_hours"
+        ]
+    },
+    "craft/sailmaker": {
+        "name": "Sailmaker",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "sailmaker"
+        ],
+        "tags": {
+            "craft": "sailmaker"
+        },
+        "icon": "marker-stroked",
+        "fields": [
+            "building_area",
+            "address",
+            "operator",
+            "opening_hours"
+        ]
+    },
+    "craft/sawmill": {
+        "name": "Sawmill",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "sawmill",
+            "lumber"
+        ],
+        "tags": {
+            "craft": "sawmill"
+        },
+        "icon": "park",
+        "fields": [
+            "building_area",
+            "address",
+            "operator",
+            "opening_hours"
+        ]
+    },
+    "craft/scaffolder": {
+        "name": "Scaffolder",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "scaffolder"
+        ],
+        "tags": {
+            "craft": "scaffolder"
+        },
+        "icon": "marker-stroked",
+        "fields": [
+            "building_area",
+            "address",
+            "operator",
+            "opening_hours"
+        ]
+    },
+    "craft/sculpter": {
+        "name": "Sculpter",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "sculpter"
+        ],
+        "tags": {
+            "craft": "sculpter"
+        },
+        "icon": "art-gallery",
+        "fields": [
+            "building_area",
+            "address",
+            "operator",
+            "opening_hours"
+        ]
+    },
+    "craft/shoemaker": {
+        "name": "Shoemaker",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "shoe repair",
+            "shoemaker"
+        ],
+        "tags": {
+            "craft": "shoemaker"
+        },
+        "icon": "marker-stroked",
+        "fields": [
+            "building_area",
+            "address",
+            "operator",
+            "opening_hours"
+        ]
+    },
+    "craft/stonemason": {
+        "name": "Stonemason",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "stonemason",
+            "masonry"
+        ],
+        "tags": {
+            "craft": "stonemason"
+        },
+        "icon": "marker-stroked",
+        "fields": [
+            "building_area",
+            "address",
+            "operator",
+            "opening_hours"
+        ]
+    },
+    "craft/sweep": {
+        "name": "Chimney Sweep",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "sweep",
+            "chimney sweep"
+        ],
+        "tags": {
+            "craft": "sweep"
+        },
+        "icon": "marker-stroked",
+        "fields": [
+            "building_area",
+            "address",
+            "operator",
+            "opening_hours"
+        ]
+    },
+    "craft/tailor": {
+        "name": "Tailor",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "tailor",
+            "clothes"
+        ],
+        "tags": {
+            "craft": "tailor"
+        },
+        "icon": "clothing-store",
+        "fields": [
+            "building_area",
+            "address",
+            "operator",
+            "opening_hours"
+        ]
+    },
+    "craft/tiler": {
+        "name": "Tiler",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "tiler"
+        ],
+        "tags": {
+            "craft": "tiler"
+        },
+        "icon": "marker-stroked",
+        "fields": [
+            "building_area",
+            "address",
+            "operator",
+            "opening_hours"
+        ]
+    },
+    "craft/tinsmith": {
+        "name": "Tinsmith",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "tinsmith"
+        ],
+        "tags": {
+            "craft": "tinsmith"
+        },
+        "icon": "marker-stroked",
+        "fields": [
+            "building_area",
+            "address",
+            "operator",
+            "opening_hours"
+        ]
+    },
+    "craft/upholsterer": {
+        "name": "Upholsterer",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "upholsterer"
+        ],
+        "tags": {
+            "craft": "upholsterer"
+        },
+        "icon": "marker-stroked",
+        "fields": [
+            "building_area",
+            "address",
+            "operator",
+            "opening_hours"
+        ]
+    },
+    "craft/watchmaker": {
+        "name": "Watchmaker",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "watch",
+            "watchmaker",
+            "watch repair"
+        ],
+        "tags": {
+            "craft": "watchmaker"
+        },
+        "icon": "circle-stroked",
+        "fields": [
+            "building_area",
+            "address",
+            "operator",
+            "opening_hours"
+        ]
+    },
+    "craft/window_construction": {
+        "name": "Window Construction",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "window",
+            "window maker",
+            "window construction"
+        ],
+        "tags": {
+            "craft": "window_construction"
+        },
+        "icon": "marker-stroked",
+        "fields": [
+            "building_area",
+            "address",
+            "operator",
+            "opening_hours"
+        ]
+    },
     "embankment": {
         "geometry": [
             "line"
diff --git a/data/presets/presets/craft/basket_maker.json b/data/presets/presets/craft/basket_maker.json
new file mode 100644
index 000000000..fb5979f61
--- /dev/null
+++ b/data/presets/presets/craft/basket_maker.json
@@ -0,0 +1,23 @@
+{
+    "name": "Basket Maker",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "basket",
+        "basketry",
+        "basket maker",
+        "basket weaver"
+    ],
+    "tags": {
+        "craft": "basket_maker"
+    },
+    "icon": "art-gallery",
+    "fields": [
+        "building_area",
+        "address",
+        "operator",
+        "opening_hours"
+    ]
+}
diff --git a/data/presets/presets/craft/beekeeper.json b/data/presets/presets/craft/beekeeper.json
new file mode 100644
index 000000000..cf7c9eda6
--- /dev/null
+++ b/data/presets/presets/craft/beekeeper.json
@@ -0,0 +1,22 @@
+{
+    "name": "Beekeeper",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "bees",
+        "beekeeper",
+        "bee box"
+    ],
+    "tags": {
+        "craft": "beekeeper"
+    },
+    "icon": "farm",
+    "fields": [
+        "building_area",
+        "address",
+        "operator",
+        "opening_hours"
+    ]
+}
diff --git a/data/presets/presets/craft/blacksmith.json b/data/presets/presets/craft/blacksmith.json
new file mode 100644
index 000000000..4bf0086af
--- /dev/null
+++ b/data/presets/presets/craft/blacksmith.json
@@ -0,0 +1,20 @@
+{
+    "name": "Blacksmith",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "blacksmith"
+    ],
+    "tags": {
+        "craft": "blacksmith"
+    },
+    "icon": "farm",
+    "fields": [
+        "building_area",
+        "address",
+        "operator",
+        "opening_hours"
+    ]
+}
diff --git a/data/presets/presets/craft/boatbuilder.json b/data/presets/presets/craft/boatbuilder.json
new file mode 100644
index 000000000..aeaf0898d
--- /dev/null
+++ b/data/presets/presets/craft/boatbuilder.json
@@ -0,0 +1,20 @@
+{
+    "name": "Boat Builder",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "boat builder"
+    ],
+    "tags": {
+        "craft": "boatbuilder"
+    },
+    "icon": "marker-stroked",
+    "fields": [
+        "building_area",
+        "address",
+        "operator",
+        "opening_hours"
+    ]
+}
diff --git a/data/presets/presets/craft/bookbinder.json b/data/presets/presets/craft/bookbinder.json
new file mode 100644
index 000000000..03eaea88c
--- /dev/null
+++ b/data/presets/presets/craft/bookbinder.json
@@ -0,0 +1,21 @@
+{
+    "name": "Bookbinder",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "bookbinder",
+        "book repair"
+    ],
+    "tags": {
+        "craft": "bookbinder"
+    },
+    "icon": "library",
+    "fields": [
+        "building_area",
+        "address",
+        "operator",
+        "opening_hours"
+    ]
+}
diff --git a/data/presets/presets/craft/brewery.json b/data/presets/presets/craft/brewery.json
new file mode 100644
index 000000000..4f6f95be6
--- /dev/null
+++ b/data/presets/presets/craft/brewery.json
@@ -0,0 +1,20 @@
+{
+    "name": "Brewery",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "brewery"
+    ],
+    "tags": {
+        "craft": "brewery"
+    },
+    "icon": "beer",
+    "fields": [
+        "building_area",
+        "address",
+        "operator",
+        "opening_hours"
+    ]
+}
diff --git a/data/presets/presets/craft/carpenter.json b/data/presets/presets/craft/carpenter.json
new file mode 100644
index 000000000..e2eb6ab5b
--- /dev/null
+++ b/data/presets/presets/craft/carpenter.json
@@ -0,0 +1,21 @@
+{
+    "name": "Carpenter",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "carpenter",
+        "woodworker"
+    ],
+    "tags": {
+        "craft": "carpenter"
+    },
+    "icon": "logging",
+    "fields": [
+        "building_area",
+        "address",
+        "operator",
+        "opening_hours"
+    ]
+}
diff --git a/data/presets/presets/craft/carpet_layer.json b/data/presets/presets/craft/carpet_layer.json
new file mode 100644
index 000000000..6130d0408
--- /dev/null
+++ b/data/presets/presets/craft/carpet_layer.json
@@ -0,0 +1,20 @@
+{
+    "name": "Carpet Layer",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "carpet layer"
+    ],
+    "tags": {
+        "craft": "carpet_layer"
+    },
+    "icon": "square",
+    "fields": [
+        "building_area",
+        "address",
+        "operator",
+        "opening_hours"
+    ]
+}
diff --git a/data/presets/presets/craft/caterer.json b/data/presets/presets/craft/caterer.json
new file mode 100644
index 000000000..e838433a5
--- /dev/null
+++ b/data/presets/presets/craft/caterer.json
@@ -0,0 +1,22 @@
+{
+    "name": "Caterer",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "Caterer",
+        "Catering"
+    ],
+    "tags": {
+        "craft": "caterer"
+    },
+    "icon": "bakery",
+    "fields": [
+        "cuisine",
+        "building_area",
+        "address",
+        "operator",
+        "opening_hours"
+    ]
+}
diff --git a/data/presets/presets/craft/clockmaker.json b/data/presets/presets/craft/clockmaker.json
new file mode 100644
index 000000000..10b6b1b70
--- /dev/null
+++ b/data/presets/presets/craft/clockmaker.json
@@ -0,0 +1,22 @@
+{
+    "name": "Clockmaker",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "clock",
+        "clockmaker",
+        "clock repair"
+    ],
+    "tags": {
+        "craft": "clockmaker"
+    },
+    "icon": "circle-stroked",
+    "fields": [
+        "building_area",
+        "address",
+        "operator",
+        "opening_hours"
+    ]
+}
diff --git a/data/presets/presets/craft/confectionary.json b/data/presets/presets/craft/confectionary.json
new file mode 100644
index 000000000..a9f4f046c
--- /dev/null
+++ b/data/presets/presets/craft/confectionary.json
@@ -0,0 +1,22 @@
+{
+    "name": "Confectionary",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "confectionary",
+        "sweets",
+        "candy"
+    ],
+    "tags": {
+        "craft": "confectionary"
+    },
+    "icon": "bakery",
+    "fields": [
+        "building_area",
+        "address",
+        "operator",
+        "opening_hours"
+    ]
+}
diff --git a/data/presets/presets/craft/dressmaker.json b/data/presets/presets/craft/dressmaker.json
new file mode 100644
index 000000000..7f938d926
--- /dev/null
+++ b/data/presets/presets/craft/dressmaker.json
@@ -0,0 +1,21 @@
+{
+    "name": "Dressmaker",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "dress",
+        "dressmaker"
+    ],
+    "tags": {
+        "craft": "dressmaker"
+    },
+    "icon": "clothing-store",
+    "fields": [
+        "building_area",
+        "address",
+        "operator",
+        "opening_hours"
+    ]
+}
diff --git a/data/presets/presets/craft/electrician.json b/data/presets/presets/craft/electrician.json
new file mode 100644
index 000000000..dce2361bd
--- /dev/null
+++ b/data/presets/presets/craft/electrician.json
@@ -0,0 +1,20 @@
+{
+    "name": "Electrician",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "electrician"
+    ],
+    "tags": {
+        "craft": "electrician"
+    },
+    "icon": "marker-stroked",
+    "fields": [
+        "building_area",
+        "address",
+        "operator",
+        "opening_hours"
+    ]
+}
diff --git a/data/presets/presets/craft/gardener.json b/data/presets/presets/craft/gardener.json
new file mode 100644
index 000000000..9aeece182
--- /dev/null
+++ b/data/presets/presets/craft/gardener.json
@@ -0,0 +1,22 @@
+{
+    "name": "Gardener",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "gardener",
+        "landscaper",
+        "grounds keeper"
+    ],
+    "tags": {
+        "craft": "gardener"
+    },
+    "icon": "garden",
+    "fields": [
+        "building_area",
+        "address",
+        "operator",
+        "opening_hours"
+    ]
+}
diff --git a/data/presets/presets/craft/glaziery.json b/data/presets/presets/craft/glaziery.json
new file mode 100644
index 000000000..9d12af920
--- /dev/null
+++ b/data/presets/presets/craft/glaziery.json
@@ -0,0 +1,23 @@
+{
+    "name": "Glaziery",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "glass",
+        "glass foundry",
+        "stained-glass",
+        "window"
+    ],
+    "tags": {
+        "craft": "glaziery"
+    },
+    "icon": "fire-station",
+    "fields": [
+        "building_area",
+        "address",
+        "operator",
+        "opening_hours"
+    ]
+}
diff --git a/data/presets/presets/craft/handicraft.json b/data/presets/presets/craft/handicraft.json
new file mode 100644
index 000000000..9e46b1e98
--- /dev/null
+++ b/data/presets/presets/craft/handicraft.json
@@ -0,0 +1,20 @@
+{
+    "name": "Handicraft",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "handicraft"
+    ],
+    "tags": {
+        "craft": "handicraft"
+    },
+    "icon": "art-gallery",
+    "fields": [
+        "building_area",
+        "address",
+        "operator",
+        "opening_hours"
+    ]
+}
diff --git a/data/presets/presets/craft/hvac.json b/data/presets/presets/craft/hvac.json
new file mode 100644
index 000000000..a9cd533b5
--- /dev/null
+++ b/data/presets/presets/craft/hvac.json
@@ -0,0 +1,24 @@
+{
+    "name": "HVAC",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "heating",
+        "ventilating",
+        "air-conditioning",
+        "air conditioning"
+        
+    ],
+    "tags": {
+        "craft": "hvac"
+    },
+    "icon": "marker-stroked",
+    "fields": [
+        "building_area",
+        "address",
+        "operator",
+        "opening_hours"
+    ]
+}
diff --git a/data/presets/presets/craft/insulator.json b/data/presets/presets/craft/insulator.json
new file mode 100644
index 000000000..c51a429dd
--- /dev/null
+++ b/data/presets/presets/craft/insulator.json
@@ -0,0 +1,22 @@
+{
+    "name": "Insulator",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "insulation",
+        "insulator"
+        
+    ],
+    "tags": {
+        "craft": "insulation"
+    },
+    "icon": "marker-stroked",
+    "fields": [
+        "building_area",
+        "address",
+        "operator",
+        "opening_hours"
+    ]
+}
diff --git a/data/presets/presets/craft/jeweler.json b/data/presets/presets/craft/jeweler.json
new file mode 100644
index 000000000..42faa9ade
--- /dev/null
+++ b/data/presets/presets/craft/jeweler.json
@@ -0,0 +1,22 @@
+{
+    "name": "Jeweler",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "jeweler",
+        "gem",
+        "diamond"
+    ],
+    "tags": {
+        "craft": "jeweler"
+    },
+    "icon": "marker-stroked",
+    "fields": [
+        "building_area",
+        "address",
+        "operator",
+        "opening_hours"
+    ]
+}
diff --git a/data/presets/presets/craft/key_cutter.json b/data/presets/presets/craft/key_cutter.json
new file mode 100644
index 000000000..b62c713a5
--- /dev/null
+++ b/data/presets/presets/craft/key_cutter.json
@@ -0,0 +1,21 @@
+{
+    "name": "Key Cutter",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "key",
+        "key cutter"
+    ],
+    "tags": {
+        "craft": "key_cutter"
+    },
+    "icon": "marker-stroked",
+    "fields": [
+        "building_area",
+        "address",
+        "operator",
+        "opening_hours"
+    ]
+}
diff --git a/data/presets/presets/craft/locksmith.json b/data/presets/presets/craft/locksmith.json
new file mode 100644
index 000000000..333f0408e
--- /dev/null
+++ b/data/presets/presets/craft/locksmith.json
@@ -0,0 +1,21 @@
+{
+    "name": "Locksmith",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "locksmith",
+        "lock"
+    ],
+    "tags": {
+        "craft": "locksmith"
+    },
+    "icon": "marker-stroked",
+    "fields": [
+        "building_area",
+        "address",
+        "operator",
+        "opening_hours"
+    ]
+}
diff --git a/data/presets/presets/craft/metal_construction.json b/data/presets/presets/craft/metal_construction.json
new file mode 100644
index 000000000..0ef5c64d7
--- /dev/null
+++ b/data/presets/presets/craft/metal_construction.json
@@ -0,0 +1,20 @@
+{
+    "name": "Metal Construction",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "metal construction"
+    ],
+    "tags": {
+        "craft": "metal_construction"
+    },
+    "icon": "marker-stroked",
+    "fields": [
+        "building_area",
+        "address",
+        "operator",
+        "opening_hours"
+    ]
+}
diff --git a/data/presets/presets/craft/optician.json b/data/presets/presets/craft/optician.json
new file mode 100644
index 000000000..b85d4b280
--- /dev/null
+++ b/data/presets/presets/craft/optician.json
@@ -0,0 +1,21 @@
+{
+    "name": "Optician",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "glasses",
+        "optician"
+    ],
+    "tags": {
+        "craft": "optician"
+    },
+    "icon": "marker-stroked",
+    "fields": [
+        "building_area",
+        "address",
+        "operator",
+        "opening_hours"
+    ]
+}
diff --git a/data/presets/presets/craft/painter.json b/data/presets/presets/craft/painter.json
new file mode 100644
index 000000000..8bcffb87e
--- /dev/null
+++ b/data/presets/presets/craft/painter.json
@@ -0,0 +1,20 @@
+{
+    "name": "painter",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "painter"
+    ],
+    "tags": {
+        "craft": "painter"
+    },
+    "icon": "art-gallery",
+    "fields": [
+        "building_area",
+        "address",
+        "operator",
+        "opening_hours"
+    ]
+}
diff --git a/data/presets/presets/craft/photographer.json b/data/presets/presets/craft/photographer.json
new file mode 100644
index 000000000..502c170b9
--- /dev/null
+++ b/data/presets/presets/craft/photographer.json
@@ -0,0 +1,20 @@
+{
+    "name": "Photographer",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "photographer"
+    ],
+    "tags": {
+        "craft": "photographer"
+    },
+    "icon": "camera",
+    "fields": [
+        "building_area",
+        "address",
+        "operator",
+        "opening_hours"
+    ]
+}
diff --git a/data/presets/presets/craft/photographic_labratory.json b/data/presets/presets/craft/photographic_labratory.json
new file mode 100644
index 000000000..b30917adb
--- /dev/null
+++ b/data/presets/presets/craft/photographic_labratory.json
@@ -0,0 +1,21 @@
+{
+    "name": "Photographic Labratory",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "photographic labratory",
+        "film developer"
+    ],
+    "tags": {
+        "craft": "photographic_labratory"
+    },
+    "icon": "camera",
+    "fields": [
+        "building_area",
+        "address",
+        "operator",
+        "opening_hours"
+    ]
+}
diff --git a/data/presets/presets/craft/plasterer.json b/data/presets/presets/craft/plasterer.json
new file mode 100644
index 000000000..40cda760d
--- /dev/null
+++ b/data/presets/presets/craft/plasterer.json
@@ -0,0 +1,20 @@
+{
+    "name": "Plasterer",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "plasterer"
+    ],
+    "tags": {
+        "craft": "plasterer"
+    },
+    "icon": "marker-stroked",
+    "fields": [
+        "building_area",
+        "address",
+        "operator",
+        "opening_hours"
+    ]
+}
diff --git a/data/presets/presets/craft/plumber.json b/data/presets/presets/craft/plumber.json
new file mode 100644
index 000000000..9bddd3e44
--- /dev/null
+++ b/data/presets/presets/craft/plumber.json
@@ -0,0 +1,20 @@
+{
+    "name": "Plumber",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "pumber"
+    ],
+    "tags": {
+        "craft": "plumber"
+    },
+    "icon": "marker-stroked",
+    "fields": [
+        "building_area",
+        "address",
+        "operator",
+        "opening_hours"
+    ]
+}
diff --git a/data/presets/presets/craft/pottery.json b/data/presets/presets/craft/pottery.json
new file mode 100644
index 000000000..da8b245ab
--- /dev/null
+++ b/data/presets/presets/craft/pottery.json
@@ -0,0 +1,21 @@
+{
+    "name": "Pottery",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "pottery",
+        "potter"
+    ],
+    "tags": {
+        "craft": "pottery"
+    },
+    "icon": "art-gallery",
+    "fields": [
+        "building_area",
+        "address",
+        "operator",
+        "opening_hours"
+    ]
+}
diff --git a/data/presets/presets/craft/rigger.json b/data/presets/presets/craft/rigger.json
new file mode 100644
index 000000000..2bd3427e9
--- /dev/null
+++ b/data/presets/presets/craft/rigger.json
@@ -0,0 +1,20 @@
+{
+    "name": "Rigger",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "rigger"
+    ],
+    "tags": {
+        "craft": "rigger"
+    },
+    "icon": "marker-stroked",
+    "fields": [
+        "building_area",
+        "address",
+        "operator",
+        "opening_hours"
+    ]
+}
diff --git a/data/presets/presets/craft/roofer.json b/data/presets/presets/craft/roofer.json
new file mode 100644
index 000000000..6e671d3e4
--- /dev/null
+++ b/data/presets/presets/craft/roofer.json
@@ -0,0 +1,20 @@
+{
+    "name": "Roofer",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "roofer"
+    ],
+    "tags": {
+        "craft": "roofer"
+    },
+    "icon": "marker-stroked",
+    "fields": [
+        "building_area",
+        "address",
+        "operator",
+        "opening_hours"
+    ]
+}
diff --git a/data/presets/presets/craft/saddler.json b/data/presets/presets/craft/saddler.json
new file mode 100644
index 000000000..66dc08320
--- /dev/null
+++ b/data/presets/presets/craft/saddler.json
@@ -0,0 +1,20 @@
+{
+    "name": "Saddler",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "saddler"
+    ],
+    "tags": {
+        "craft": "saddler"
+    },
+    "icon": "marker-stroked",
+    "fields": [
+        "building_area",
+        "address",
+        "operator",
+        "opening_hours"
+    ]
+}
diff --git a/data/presets/presets/craft/sailmaker.json b/data/presets/presets/craft/sailmaker.json
new file mode 100644
index 000000000..a6b46868e
--- /dev/null
+++ b/data/presets/presets/craft/sailmaker.json
@@ -0,0 +1,20 @@
+{
+    "name": "Sailmaker",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "sailmaker"
+    ],
+    "tags": {
+        "craft": "sailmaker"
+    },
+    "icon": "marker-stroked",
+    "fields": [
+        "building_area",
+        "address",
+        "operator",
+        "opening_hours"
+    ]
+}
diff --git a/data/presets/presets/craft/sawmill.json b/data/presets/presets/craft/sawmill.json
new file mode 100644
index 000000000..6bb9b89e4
--- /dev/null
+++ b/data/presets/presets/craft/sawmill.json
@@ -0,0 +1,21 @@
+{
+    "name": "Sawmill",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "sawmill",
+        "lumber"
+    ],
+    "tags": {
+        "craft": "sawmill"
+    },
+    "icon": "park",
+    "fields": [
+        "building_area",
+        "address",
+        "operator",
+        "opening_hours"
+    ]
+}
diff --git a/data/presets/presets/craft/scaffolder.json b/data/presets/presets/craft/scaffolder.json
new file mode 100644
index 000000000..317fef411
--- /dev/null
+++ b/data/presets/presets/craft/scaffolder.json
@@ -0,0 +1,20 @@
+{
+    "name": "Scaffolder",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "scaffolder"
+    ],
+    "tags": {
+        "craft": "scaffolder"
+    },
+    "icon": "marker-stroked",
+    "fields": [
+        "building_area",
+        "address",
+        "operator",
+        "opening_hours"
+    ]
+}
diff --git a/data/presets/presets/craft/sculpter.json b/data/presets/presets/craft/sculpter.json
new file mode 100644
index 000000000..04e55c8b3
--- /dev/null
+++ b/data/presets/presets/craft/sculpter.json
@@ -0,0 +1,20 @@
+{
+    "name": "Sculpter",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "sculpter"
+    ],
+    "tags": {
+        "craft": "sculpter"
+    },
+    "icon": "art-gallery",
+    "fields": [
+        "building_area",
+        "address",
+        "operator",
+        "opening_hours"
+    ]
+}
diff --git a/data/presets/presets/craft/shoemaker.json b/data/presets/presets/craft/shoemaker.json
new file mode 100644
index 000000000..2ba956c69
--- /dev/null
+++ b/data/presets/presets/craft/shoemaker.json
@@ -0,0 +1,21 @@
+{
+    "name": "Shoemaker",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "shoe repair",
+        "shoemaker"
+    ],
+    "tags": {
+        "craft": "shoemaker"
+    },
+    "icon": "marker-stroked",
+    "fields": [
+        "building_area",
+        "address",
+        "operator",
+        "opening_hours"
+    ]
+}
diff --git a/data/presets/presets/craft/stonemason.json b/data/presets/presets/craft/stonemason.json
new file mode 100644
index 000000000..3f2bde5cc
--- /dev/null
+++ b/data/presets/presets/craft/stonemason.json
@@ -0,0 +1,21 @@
+{
+    "name": "Stonemason",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "stonemason",
+        "masonry"
+    ],
+    "tags": {
+        "craft": "stonemason"
+    },
+    "icon": "marker-stroked",
+    "fields": [
+        "building_area",
+        "address",
+        "operator",
+        "opening_hours"
+    ]
+}
diff --git a/data/presets/presets/craft/sweep.json b/data/presets/presets/craft/sweep.json
new file mode 100644
index 000000000..479a5cb65
--- /dev/null
+++ b/data/presets/presets/craft/sweep.json
@@ -0,0 +1,21 @@
+{
+    "name": "Chimney Sweep",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "sweep",
+        "chimney sweep"
+    ],
+    "tags": {
+        "craft": "sweep"
+    },
+    "icon": "marker-stroked",
+    "fields": [
+        "building_area",
+        "address",
+        "operator",
+        "opening_hours"
+    ]
+}
diff --git a/data/presets/presets/craft/tailor.json b/data/presets/presets/craft/tailor.json
new file mode 100644
index 000000000..7fb43924a
--- /dev/null
+++ b/data/presets/presets/craft/tailor.json
@@ -0,0 +1,21 @@
+{
+    "name": "Tailor",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "tailor",
+        "clothes"
+    ],
+    "tags": {
+        "craft": "tailor"
+    },
+    "icon": "clothing-store",
+    "fields": [
+        "building_area",
+        "address",
+        "operator",
+        "opening_hours"
+    ]
+}
diff --git a/data/presets/presets/craft/tiler.json b/data/presets/presets/craft/tiler.json
new file mode 100644
index 000000000..3d73c6be0
--- /dev/null
+++ b/data/presets/presets/craft/tiler.json
@@ -0,0 +1,20 @@
+{
+    "name": "Tiler",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "tiler"
+    ],
+    "tags": {
+        "craft": "tiler"
+    },
+    "icon": "marker-stroked",
+    "fields": [
+        "building_area",
+        "address",
+        "operator",
+        "opening_hours"
+    ]
+}
diff --git a/data/presets/presets/craft/tinsmith b/data/presets/presets/craft/tinsmith
new file mode 100644
index 000000000..ee471afde
--- /dev/null
+++ b/data/presets/presets/craft/tinsmith
@@ -0,0 +1,20 @@
+{
+    "name": "Tinsmith",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "tinsmith"
+    ],
+    "tags": {
+        "craft": "tinsmith"
+    },
+    "icon": "marker-stroked",
+    "fields": [
+        "building_area",
+        "address",
+        "operator",
+        "opening_hours"
+    ]
+}
diff --git a/data/presets/presets/craft/tinsmith.json b/data/presets/presets/craft/tinsmith.json
new file mode 100644
index 000000000..ee471afde
--- /dev/null
+++ b/data/presets/presets/craft/tinsmith.json
@@ -0,0 +1,20 @@
+{
+    "name": "Tinsmith",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "tinsmith"
+    ],
+    "tags": {
+        "craft": "tinsmith"
+    },
+    "icon": "marker-stroked",
+    "fields": [
+        "building_area",
+        "address",
+        "operator",
+        "opening_hours"
+    ]
+}
diff --git a/data/presets/presets/craft/upholsterer.json b/data/presets/presets/craft/upholsterer.json
new file mode 100644
index 000000000..c6e5dee00
--- /dev/null
+++ b/data/presets/presets/craft/upholsterer.json
@@ -0,0 +1,20 @@
+{
+    "name": "Upholsterer",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "upholsterer"
+    ],
+    "tags": {
+        "craft": "upholsterer"
+    },
+    "icon": "marker-stroked",
+    "fields": [
+        "building_area",
+        "address",
+        "operator",
+        "opening_hours"
+    ]
+}
diff --git a/data/presets/presets/craft/watchmaker.json b/data/presets/presets/craft/watchmaker.json
new file mode 100644
index 000000000..091f04d9d
--- /dev/null
+++ b/data/presets/presets/craft/watchmaker.json
@@ -0,0 +1,22 @@
+{
+    "name": "Watchmaker",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "watch",
+        "watchmaker",
+        "watch repair"
+    ],
+    "tags": {
+        "craft": "watchmaker"
+    },
+    "icon": "circle-stroked",
+    "fields": [
+        "building_area",
+        "address",
+        "operator",
+        "opening_hours"
+    ]
+}
diff --git a/data/presets/presets/craft/window_construction.json b/data/presets/presets/craft/window_construction.json
new file mode 100644
index 000000000..ccc4ae031
--- /dev/null
+++ b/data/presets/presets/craft/window_construction.json
@@ -0,0 +1,22 @@
+{
+    "name": "Window Construction",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "window",
+        "window maker",
+        "window construction"
+    ],
+    "tags": {
+        "craft": "window_construction"
+    },
+    "icon": "marker-stroked",
+    "fields": [
+        "building_area",
+        "address",
+        "operator",
+        "opening_hours"
+    ]
+}
diff --git a/dist/locales/en.json b/dist/locales/en.json
index a6a8fc270..e46c6457f 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1277,6 +1277,186 @@
                 "name": "Residential Building",
                 "terms": ""
             },
+            "craft/basket_maker": {
+                "name": "Basket Maker",
+                "terms": "basket,basketry,basket maker,basket weaver"
+            },
+            "craft/beekeeper": {
+                "name": "Beekeeper",
+                "terms": "bees,beekeeper,bee box"
+            },
+            "craft/blacksmith": {
+                "name": "Blacksmith",
+                "terms": "blacksmith"
+            },
+            "craft/boatbuilder": {
+                "name": "Boat Builder",
+                "terms": "boat builder"
+            },
+            "craft/bookbinder": {
+                "name": "Bookbinder",
+                "terms": "bookbinder,book repair"
+            },
+            "craft/brewery": {
+                "name": "Brewery",
+                "terms": "brewery"
+            },
+            "craft/carpenter": {
+                "name": "Carpenter",
+                "terms": "carpenter,woodworker"
+            },
+            "craft/carpet_layer": {
+                "name": "Carpet Layer",
+                "terms": "carpet layer"
+            },
+            "craft/caterer": {
+                "name": "Caterer",
+                "terms": "Caterer,Catering"
+            },
+            "craft/clockmaker": {
+                "name": "Clockmaker",
+                "terms": "clock,clockmaker,clock repair"
+            },
+            "craft/confectionary": {
+                "name": "Confectionary",
+                "terms": "confectionary,sweets,candy"
+            },
+            "craft/dressmaker": {
+                "name": "Dressmaker",
+                "terms": "dress,dressmaker"
+            },
+            "craft/electrician": {
+                "name": "Electrician",
+                "terms": "electrician"
+            },
+            "craft/gardener": {
+                "name": "Gardener",
+                "terms": "gardener,landscaper,grounds keeper"
+            },
+            "craft/glaziery": {
+                "name": "Glaziery",
+                "terms": "glass,glass foundry,stained-glass,window"
+            },
+            "craft/handicraft": {
+                "name": "Handicraft",
+                "terms": "handicraft"
+            },
+            "craft/hvac": {
+                "name": "HVAC",
+                "terms": "heating,ventilating,air-conditioning,air conditioning"
+            },
+            "craft/insulator": {
+                "name": "Insulator",
+                "terms": "insulation,insulator"
+            },
+            "craft/jeweler": {
+                "name": "Jeweler",
+                "terms": "jeweler,gem,diamond"
+            },
+            "craft/key_cutter": {
+                "name": "Key Cutter",
+                "terms": "key,key cutter"
+            },
+            "craft/locksmith": {
+                "name": "Locksmith",
+                "terms": "locksmith,lock"
+            },
+            "craft/metal_construction": {
+                "name": "Metal Construction",
+                "terms": "metal construction"
+            },
+            "craft/optician": {
+                "name": "Optician",
+                "terms": "glasses,optician"
+            },
+            "craft/painter": {
+                "name": "painter",
+                "terms": "painter"
+            },
+            "craft/photographer": {
+                "name": "Photographer",
+                "terms": "photographer"
+            },
+            "craft/photographic_labratory": {
+                "name": "Photographic Labratory",
+                "terms": "photographic labratory,film developer"
+            },
+            "craft/plasterer": {
+                "name": "Plasterer",
+                "terms": "plasterer"
+            },
+            "craft/plumber": {
+                "name": "Plumber",
+                "terms": "pumber"
+            },
+            "craft/pottery": {
+                "name": "Pottery",
+                "terms": "pottery,potter"
+            },
+            "craft/rigger": {
+                "name": "Rigger",
+                "terms": "rigger"
+            },
+            "craft/roofer": {
+                "name": "Roofer",
+                "terms": "roofer"
+            },
+            "craft/saddler": {
+                "name": "Saddler",
+                "terms": "saddler"
+            },
+            "craft/sailmaker": {
+                "name": "Sailmaker",
+                "terms": "sailmaker"
+            },
+            "craft/sawmill": {
+                "name": "Sawmill",
+                "terms": "sawmill,lumber"
+            },
+            "craft/scaffolder": {
+                "name": "Scaffolder",
+                "terms": "scaffolder"
+            },
+            "craft/sculpter": {
+                "name": "Sculpter",
+                "terms": "sculpter"
+            },
+            "craft/shoemaker": {
+                "name": "Shoemaker",
+                "terms": "shoe repair,shoemaker"
+            },
+            "craft/stonemason": {
+                "name": "Stonemason",
+                "terms": "stonemason,masonry"
+            },
+            "craft/sweep": {
+                "name": "Chimney Sweep",
+                "terms": "sweep,chimney sweep"
+            },
+            "craft/tailor": {
+                "name": "Tailor",
+                "terms": "tailor,clothes"
+            },
+            "craft/tiler": {
+                "name": "Tiler",
+                "terms": "tiler"
+            },
+            "craft/tinsmith": {
+                "name": "Tinsmith",
+                "terms": "tinsmith"
+            },
+            "craft/upholsterer": {
+                "name": "Upholsterer",
+                "terms": "upholsterer"
+            },
+            "craft/watchmaker": {
+                "name": "Watchmaker",
+                "terms": "watch,watchmaker,watch repair"
+            },
+            "craft/window_construction": {
+                "name": "Window Construction",
+                "terms": "window,window maker,window construction"
+            },
             "embankment": {
                 "name": "Embankment",
                 "terms": ""
diff --git a/js/id/core/area_keys.js b/js/id/core/area_keys.js
index e98251063..191f84e8b 100644
--- a/js/id/core/area_keys.js
+++ b/js/id/core/area_keys.js
@@ -29,6 +29,7 @@ iD.areaKeys = {
     "building": {
         "entrance": true
     },
+    "craft": {},
     "emergency": {
         "fire_hydrant": true,
         "phone": true