diff --git a/data/presets/build.js b/data/presets/build.js
new file mode 100644
index 000000000..b67a8a183
--- /dev/null
+++ b/data/presets/build.js
@@ -0,0 +1,11 @@
+var fs = require('fs');
+
+var wd = './';
+
+var order = JSON.parse(fs.readFileSync(wd + 'presets/order.json', 'utf8'));
+
+var presets = order.map(function(d) {
+    return JSON.parse(fs.readFileSync(wd + 'presets/' + d + '.json', 'utf8'));
+});
+
+fs.writeFileSync(wd + 'presets.json', JSON.stringify(presets, null, 4), 'utf8');
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 6dce6dd91..a7f49d414 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -442,23 +442,6 @@
             "address"
         ]
     },
-    {
-        "name": "bus stop",
-        "match": {
-            "type": [
-                "point"
-            ],
-            "tags": {
-                "highway": "bus_stop"
-            },
-            "terms": []
-        },
-        "icon": "bus",
-        "form": [
-            "operator",
-            "shelter"
-        ]
-    },
     {
         "name": "cinema",
         "match": {
@@ -1039,24 +1022,6 @@
             "surface"
         ]
     },
-    {
-        "name": "basketball court",
-        "match": {
-            "type": [
-                "point",
-                "area"
-            ],
-            "tags": {
-                "leisure": "pitch",
-                "sport": "basketball"
-            },
-            "terms": []
-        },
-        "icon": "basketball",
-        "form": [
-            "surface"
-        ]
-    },
     {
         "name": "baseball diamond",
         "match": {
@@ -1111,6 +1076,24 @@
             "surface"
         ]
     },
+    {
+        "name": "basketball court",
+        "match": {
+            "type": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "leisure": "pitch",
+                "sport": "basketball"
+            },
+            "terms": []
+        },
+        "icon": "basketball",
+        "form": [
+            "surface"
+        ]
+    },
     {
         "name": "building",
         "match": {
@@ -1128,6 +1111,23 @@
             "address"
         ]
     },
+    {
+        "name": "bus stop",
+        "match": {
+            "type": [
+                "point"
+            ],
+            "tags": {
+                "highway": "bus_stop"
+            },
+            "terms": []
+        },
+        "icon": "bus",
+        "form": [
+            "operator",
+            "shelter"
+        ]
+    },
     {
         "name": "turning circle",
         "match": {
diff --git a/data/presets/presets/amenity/bank.json b/data/presets/presets/amenity/bank.json
new file mode 100644
index 000000000..0fe34acb3
--- /dev/null
+++ b/data/presets/presets/amenity/bank.json
@@ -0,0 +1,41 @@
+{
+    "name": "bank",
+    "match": {
+        "type": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "coffer",
+            "countinghouse",
+            "credit union",
+            "depository",
+            "exchequer",
+            "fund",
+            "hoard",
+            "investment firm",
+            "repository",
+            "reserve",
+            "reservoir",
+            "safe",
+            "savings",
+            "stock",
+            "stockpile",
+            "store",
+            "storehouse",
+            "thrift",
+            "treasury",
+            "trust company",
+            "vault"
+        ],
+        "tags": {
+            "amenity": "bank"
+        }
+    },
+    "icon": "bank",
+    "form": [
+        "atm",
+        "building_area",
+        "address"
+    ]
+}
\ No newline at end of file
diff --git a/data/presets/presets/amenity/bar.json b/data/presets/presets/amenity/bar.json
new file mode 100644
index 000000000..770a6263c
--- /dev/null
+++ b/data/presets/presets/amenity/bar.json
@@ -0,0 +1,18 @@
+{
+    "name": "bar",
+    "match": {
+        "type": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "amenity": "bar"
+        },
+        "terms": []
+    },
+    "icon": "bar",
+    "form": [
+        "building_area",
+        "address"
+    ]
+}
\ No newline at end of file
diff --git a/data/presets/presets/amenity/cafe.json b/data/presets/presets/amenity/cafe.json
new file mode 100644
index 000000000..033724dfb
--- /dev/null
+++ b/data/presets/presets/amenity/cafe.json
@@ -0,0 +1,24 @@
+{
+    "name": "cafe",
+    "match": {
+        "type": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "coffee",
+            "tea",
+            "coffee shop"
+        ],
+        "tags": {
+            "amenity": "cafe"
+        }
+    },
+    "icon": "cafe",
+    "form": [
+        "cuisine",
+        "internet_access",
+        "building_area",
+        "address"
+    ]
+}
\ No newline at end of file
diff --git a/data/presets/presets/amenity/cinema.json b/data/presets/presets/amenity/cinema.json
new file mode 100644
index 000000000..88f829539
--- /dev/null
+++ b/data/presets/presets/amenity/cinema.json
@@ -0,0 +1,36 @@
+{
+    "name": "cinema",
+    "match": {
+        "type": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "big screen",
+            "bijou",
+            "cine",
+            "drive-in",
+            "film",
+            "flicks",
+            "motion pictures",
+            "movie house",
+            "movie theater",
+            "moving pictures",
+            "nabes",
+            "photoplay",
+            "picture show",
+            "pictures",
+            "playhouse",
+            "show",
+            "silver screen"
+        ],
+        "tags": {
+            "amenity": "cinema"
+        }
+    },
+    "icon": "cinema",
+    "form": [
+        "building_area",
+        "address"
+    ]
+}
\ No newline at end of file
diff --git a/data/presets/presets/amenity/fast_food.json b/data/presets/presets/amenity/fast_food.json
new file mode 100644
index 000000000..1af60bfa0
--- /dev/null
+++ b/data/presets/presets/amenity/fast_food.json
@@ -0,0 +1,19 @@
+{
+    "name": "fast food",
+    "match": {
+        "type": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "amenity": "fast_food"
+        },
+        "terms": []
+    },
+    "icon": "fast-food",
+    "form": [
+        "cuisine",
+        "building_area",
+        "address"
+    ]
+}
\ No newline at end of file
diff --git a/data/presets/presets/amenity/fire_station.json b/data/presets/presets/amenity/fire_station.json
new file mode 100644
index 000000000..f257dd629
--- /dev/null
+++ b/data/presets/presets/amenity/fire_station.json
@@ -0,0 +1,19 @@
+{
+    "name": "fire station",
+    "match": {
+        "type": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "amenity": "fire_station"
+        },
+        "terms": []
+    },
+    "icon": "fire-station",
+    "form": [
+        "operator",
+        "building_area",
+        "address"
+    ]
+}
\ No newline at end of file
diff --git a/data/presets/presets/amenity/hospital.json b/data/presets/presets/amenity/hospital.json
new file mode 100644
index 000000000..ae98d309e
--- /dev/null
+++ b/data/presets/presets/amenity/hospital.json
@@ -0,0 +1,33 @@
+{
+    "name": "hospital",
+    "match": {
+        "type": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "clinic",
+            "emergency room",
+            "health service",
+            "hospice",
+            "infirmary",
+            "institution",
+            "nursing home",
+            "rest home",
+            "sanatorium",
+            "sanitarium",
+            "sick bay",
+            "surgery",
+            "ward"
+        ],
+        "tags": {
+            "amenity": "hospital"
+        }
+    },
+    "icon": "hospital",
+    "form": [
+        "emergency",
+        "building_area",
+        "address"
+    ]
+}
\ No newline at end of file
diff --git a/data/presets/presets/amenity/library.json b/data/presets/presets/amenity/library.json
new file mode 100644
index 000000000..673235d7f
--- /dev/null
+++ b/data/presets/presets/amenity/library.json
@@ -0,0 +1,19 @@
+{
+    "name": "library",
+    "match": {
+        "type": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "amenity": "library"
+        },
+        "terms": []
+    },
+    "icon": "library",
+    "form": [
+        "operator",
+        "building_area",
+        "address"
+    ]
+}
\ No newline at end of file
diff --git a/data/presets/presets/amenity/parking.json b/data/presets/presets/amenity/parking.json
new file mode 100644
index 000000000..6c5accd7c
--- /dev/null
+++ b/data/presets/presets/amenity/parking.json
@@ -0,0 +1,19 @@
+{
+    "name": "parking",
+    "match": {
+        "type": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "amenity": "parking"
+        },
+        "terms": []
+    },
+    "icon": "parking",
+    "form": [
+        "fee",
+        "access",
+        "address"
+    ]
+}
\ No newline at end of file
diff --git a/data/presets/presets/amenity/pharmacy.json b/data/presets/presets/amenity/pharmacy.json
new file mode 100644
index 000000000..4d70d81c7
--- /dev/null
+++ b/data/presets/presets/amenity/pharmacy.json
@@ -0,0 +1,20 @@
+{
+    "name": "pharmacy",
+    "match": {
+        "type": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "amenity": "pharmacy"
+        },
+        "terms": []
+    },
+    "icon": "pharmacy",
+    "form": [
+        "dispensing",
+        "operator",
+        "building_area",
+        "address"
+    ]
+}
\ No newline at end of file
diff --git a/data/presets/presets/amenity/place_of_worship.json b/data/presets/presets/amenity/place_of_worship.json
new file mode 100644
index 000000000..f105dcc7d
--- /dev/null
+++ b/data/presets/presets/amenity/place_of_worship.json
@@ -0,0 +1,44 @@
+{
+    "name": "place of worship",
+    "match": {
+        "type": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "abbey",
+            "basilica",
+            "bethel",
+            "cathedral",
+            "chancel",
+            "chantry",
+            "chapel",
+            "church",
+            "fold",
+            "house of God",
+            "house of prayer",
+            "house of worship",
+            "minster",
+            "mission",
+            "mosque",
+            "oratory",
+            "parish",
+            "sacellum",
+            "sanctuary",
+            "shrine",
+            "synagogue",
+            "tabernacle",
+            "temple"
+        ],
+        "tags": {
+            "amenity": "place_of_worship"
+        }
+    },
+    "icon": "place-of-worship",
+    "form": [
+        "religion",
+        "denomination",
+        "building_area",
+        "address"
+    ]
+}
\ No newline at end of file
diff --git a/data/presets/presets/amenity/police.json b/data/presets/presets/amenity/police.json
new file mode 100644
index 000000000..51f9c931b
--- /dev/null
+++ b/data/presets/presets/amenity/police.json
@@ -0,0 +1,48 @@
+{
+    "name": "police",
+    "match": {
+        "type": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "badge",
+            "bear",
+            "blue",
+            "bluecoat",
+            "bobby",
+            "boy scout",
+            "bull",
+            "constable",
+            "constabulary",
+            "cop",
+            "copper",
+            "corps",
+            "county mounty",
+            "detective",
+            "fed",
+            "flatfoot",
+            "force",
+            "fuzz",
+            "gendarme",
+            "gumshoe",
+            "heat",
+            "law",
+            "law enforcement",
+            "man",
+            "narc",
+            "officers",
+            "patrolman",
+            "police"
+        ],
+        "tags": {
+            "amenity": "police"
+        }
+    },
+    "icon": "police",
+    "form": [
+        "operator",
+        "building_area",
+        "address"
+    ]
+}
\ No newline at end of file
diff --git a/data/presets/presets/amenity/pub.json b/data/presets/presets/amenity/pub.json
new file mode 100644
index 000000000..248ae57ed
--- /dev/null
+++ b/data/presets/presets/amenity/pub.json
@@ -0,0 +1,18 @@
+{
+    "name": "pub",
+    "match": {
+        "type": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "amenity": "pub"
+        },
+        "terms": []
+    },
+    "icon": "beer",
+    "form": [
+        "building_area",
+        "address"
+    ]
+}
\ No newline at end of file
diff --git a/data/presets/presets/amenity/restaurant.json b/data/presets/presets/amenity/restaurant.json
new file mode 100644
index 000000000..ae92a8b2a
--- /dev/null
+++ b/data/presets/presets/amenity/restaurant.json
@@ -0,0 +1,51 @@
+{
+    "name": "restaurant",
+    "match": {
+        "type": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "bar",
+            "cafeteria",
+            "café",
+            "canteen",
+            "chophouse",
+            "coffee shop",
+            "diner",
+            "dining room",
+            "dive*",
+            "doughtnut shop",
+            "drive-in",
+            "eatery",
+            "eating house",
+            "eating place",
+            "fast-food place",
+            "greasy spoon",
+            "grill",
+            "hamburger stand",
+            "hashery",
+            "hideaway",
+            "hotdog stand",
+            "inn",
+            "joint*",
+            "luncheonette",
+            "lunchroom",
+            "night club",
+            "outlet*",
+            "pizzeria",
+            "saloon",
+            "soda fountain",
+            "watering hole"
+        ],
+        "tags": {
+            "amenity": "restaurant"
+        }
+    },
+    "icon": "restaurant",
+    "form": [
+        "cuisine",
+        "building_area",
+        "address"
+    ]
+}
\ No newline at end of file
diff --git a/data/presets/presets/amenity/school.json b/data/presets/presets/amenity/school.json
new file mode 100644
index 000000000..b3d4ddd72
--- /dev/null
+++ b/data/presets/presets/amenity/school.json
@@ -0,0 +1,36 @@
+{
+    "name": "school",
+    "match": {
+        "type": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "academy",
+            "alma mater",
+            "blackboard",
+            "college",
+            "department",
+            "discipline",
+            "establishment",
+            "faculty",
+            "hall",
+            "halls of ivy",
+            "institute",
+            "institution",
+            "jail*",
+            "schoolhouse",
+            "seminary",
+            "university"
+        ],
+        "tags": {
+            "amenity": "school"
+        }
+    },
+    "icon": "school",
+    "form": [
+        "operator",
+        "building",
+        "address"
+    ]
+}
\ No newline at end of file
diff --git a/data/presets/presets/amenity/townhall.json b/data/presets/presets/amenity/townhall.json
new file mode 100644
index 000000000..15e87c278
--- /dev/null
+++ b/data/presets/presets/amenity/townhall.json
@@ -0,0 +1,24 @@
+{
+    "name": "town hall",
+    "match": {
+        "type": [
+            "point",
+            "areea"
+        ],
+        "terms": [
+            "village hall",
+            "city government",
+            "courthouse",
+            "municipal building",
+            "municipal center"
+        ],
+        "tags": {
+            "amenity": "townhall"
+        }
+    },
+    "icon": "town-hall",
+    "form": [
+        "building_area",
+        "address"
+    ]
+}
\ No newline at end of file
diff --git a/data/presets/presets/amenity/university.json b/data/presets/presets/amenity/university.json
new file mode 100644
index 000000000..45ebf8679
--- /dev/null
+++ b/data/presets/presets/amenity/university.json
@@ -0,0 +1,18 @@
+{
+    "name": "university",
+    "match": {
+        "type": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "amenity": "university"
+        },
+        "terms": []
+    },
+    "icon": "college",
+    "form": [
+        "operator",
+        "address"
+    ]
+}
\ No newline at end of file
diff --git a/data/presets/presets/building/*.json b/data/presets/presets/building/*.json
new file mode 100644
index 000000000..e2b62e8fe
--- /dev/null
+++ b/data/presets/presets/building/*.json
@@ -0,0 +1,17 @@
+{
+    "name": "building",
+    "match": {
+        "type": [
+            "area"
+        ],
+        "tags": {
+            "building": "*"
+        },
+        "terms": []
+    },
+    "icon": "warehouse",
+    "form": [
+        "building_yes",
+        "address"
+    ]
+}
\ No newline at end of file
diff --git a/data/presets/presets/highway/bus_stop.json b/data/presets/presets/highway/bus_stop.json
new file mode 100644
index 000000000..60a5f2587
--- /dev/null
+++ b/data/presets/presets/highway/bus_stop.json
@@ -0,0 +1,17 @@
+{
+    "name": "bus stop",
+    "match": {
+        "type": [
+            "point"
+        ],
+        "tags": {
+            "highway": "bus_stop"
+        },
+        "terms": []
+    },
+    "icon": "bus",
+    "form": [
+        "operator",
+        "shelter"
+    ]
+}
\ No newline at end of file
diff --git a/data/presets/presets/highway/cycleway.json b/data/presets/presets/highway/cycleway.json
new file mode 100644
index 000000000..abb24dfe3
--- /dev/null
+++ b/data/presets/presets/highway/cycleway.json
@@ -0,0 +1,20 @@
+{
+    "name": "cycle path",
+    "match": {
+        "type": [
+            "line"
+        ],
+        "tags": {
+            "highway": "cycleway"
+        },
+        "terms": []
+    },
+    "icon": "highway-cycleway",
+    "form": [
+        "oneway",
+        "bridge",
+        "tunnel",
+        "access",
+        "maxspeed"
+    ]
+}
\ No newline at end of file
diff --git a/data/presets/presets/highway/footway.json b/data/presets/presets/highway/footway.json
new file mode 100644
index 000000000..6de986292
--- /dev/null
+++ b/data/presets/presets/highway/footway.json
@@ -0,0 +1,38 @@
+{
+    "name": "foot path",
+    "match": {
+        "type": [
+            "line"
+        ],
+        "terms": [
+            "beaten path",
+            "boulevard",
+            "clearing",
+            "course",
+            "cut*",
+            "drag*",
+            "footpath",
+            "highway",
+            "lane",
+            "line",
+            "orbit",
+            "passage",
+            "pathway",
+            "rail",
+            "rails",
+            "road",
+            "roadway",
+            "route",
+            "street",
+            "thoroughfare",
+            "trackway",
+            "trail",
+            "trajectory",
+            "walk"
+        ],
+        "tags": {
+            "highway": "footway"
+        }
+    },
+    "icon": "highway-footway"
+}
\ No newline at end of file
diff --git a/data/presets/presets/highway/motorway.json b/data/presets/presets/highway/motorway.json
new file mode 100644
index 000000000..a3a946122
--- /dev/null
+++ b/data/presets/presets/highway/motorway.json
@@ -0,0 +1,20 @@
+{
+    "name": "motorway",
+    "match": {
+        "type": [
+            "line"
+        ],
+        "tags": {
+            "highway": "motorway"
+        },
+        "terms": []
+    },
+    "icon": "highway-motorway",
+    "form": [
+        "oneway",
+        "bridge",
+        "tunnel",
+        "access",
+        "maxspeed"
+    ]
+}
\ No newline at end of file
diff --git a/data/presets/presets/highway/primary.json b/data/presets/presets/highway/primary.json
new file mode 100644
index 000000000..6b97512ca
--- /dev/null
+++ b/data/presets/presets/highway/primary.json
@@ -0,0 +1,20 @@
+{
+    "name": "primary road",
+    "match": {
+        "type": [
+            "line"
+        ],
+        "tags": {
+            "highway": "primary"
+        },
+        "terms": []
+    },
+    "icon": "highway-primary",
+    "form": [
+        "oneway",
+        "bridge",
+        "tunnel",
+        "access",
+        "maxspeed"
+    ]
+}
\ No newline at end of file
diff --git a/data/presets/presets/highway/residential.json b/data/presets/presets/highway/residential.json
new file mode 100644
index 000000000..678029e98
--- /dev/null
+++ b/data/presets/presets/highway/residential.json
@@ -0,0 +1,20 @@
+{
+    "name": "residential road",
+    "match": {
+        "type": [
+            "line"
+        ],
+        "tags": {
+            "highway": "residential"
+        },
+        "terms": []
+    },
+    "icon": "highway-residential",
+    "form": [
+        "oneway",
+        "bridge",
+        "tunnel",
+        "access",
+        "maxspeed"
+    ]
+}
\ No newline at end of file
diff --git a/data/presets/presets/highway/secondary.json b/data/presets/presets/highway/secondary.json
new file mode 100644
index 000000000..77996d64d
--- /dev/null
+++ b/data/presets/presets/highway/secondary.json
@@ -0,0 +1,20 @@
+{
+    "name": "secondary road",
+    "match": {
+        "type": [
+            "line"
+        ],
+        "tags": {
+            "highway": "secondary"
+        },
+        "terms": []
+    },
+    "icon": "highway-secondary",
+    "form": [
+        "oneway",
+        "bridge",
+        "tunnel",
+        "access",
+        "maxspeed"
+    ]
+}
\ No newline at end of file
diff --git a/data/presets/presets/highway/service.json b/data/presets/presets/highway/service.json
new file mode 100644
index 000000000..abcd32f4f
--- /dev/null
+++ b/data/presets/presets/highway/service.json
@@ -0,0 +1,20 @@
+{
+    "name": "service road",
+    "match": {
+        "type": [
+            "line"
+        ],
+        "tags": {
+            "highway": "service"
+        },
+        "terms": []
+    },
+    "icon": "highway-service",
+    "form": [
+        "oneway",
+        "bridge",
+        "tunnel",
+        "access",
+        "maxspeed"
+    ]
+}
\ No newline at end of file
diff --git a/data/presets/presets/highway/tertiary.json b/data/presets/presets/highway/tertiary.json
new file mode 100644
index 000000000..ead60bb48
--- /dev/null
+++ b/data/presets/presets/highway/tertiary.json
@@ -0,0 +1,20 @@
+{
+    "name": "tertiary road",
+    "match": {
+        "type": [
+            "line"
+        ],
+        "tags": {
+            "highway": "tertiary"
+        },
+        "terms": []
+    },
+    "icon": "highway-tertiary",
+    "form": [
+        "oneway",
+        "bridge",
+        "tunnel",
+        "access",
+        "maxspeed"
+    ]
+}
\ No newline at end of file
diff --git a/data/presets/presets/highway/track.json b/data/presets/presets/highway/track.json
new file mode 100644
index 000000000..53450f873
--- /dev/null
+++ b/data/presets/presets/highway/track.json
@@ -0,0 +1,20 @@
+{
+    "name": "track",
+    "match": {
+        "type": [
+            "line"
+        ],
+        "tags": {
+            "highway": "track"
+        },
+        "terms": []
+    },
+    "icon": "highway-track",
+    "form": [
+        "oneway",
+        "bridge",
+        "tunnel",
+        "access",
+        "maxspeed"
+    ]
+}
\ No newline at end of file
diff --git a/data/presets/presets/highway/trunk.json b/data/presets/presets/highway/trunk.json
new file mode 100644
index 000000000..d6bfbadac
--- /dev/null
+++ b/data/presets/presets/highway/trunk.json
@@ -0,0 +1,20 @@
+{
+    "name": "trunk highway",
+    "match": {
+        "type": [
+            "line"
+        ],
+        "tags": {
+            "highway": "trunk"
+        },
+        "terms": []
+    },
+    "icon": "highway-trunk",
+    "form": [
+        "oneway",
+        "bridge",
+        "tunnel",
+        "access",
+        "maxspeed"
+    ]
+}
\ No newline at end of file
diff --git a/data/presets/presets/highway/turning_circle.json b/data/presets/presets/highway/turning_circle.json
new file mode 100644
index 000000000..ab5db3a37
--- /dev/null
+++ b/data/presets/presets/highway/turning_circle.json
@@ -0,0 +1,13 @@
+{
+    "name": "turning circle",
+    "match": {
+        "type": [
+            "vertex"
+        ],
+        "tags": {
+            "highway": "turning_circle"
+        },
+        "terms": []
+    },
+    "icon": "circle"
+}
\ No newline at end of file
diff --git a/data/presets/presets/leisure/golf_course.json b/data/presets/presets/leisure/golf_course.json
new file mode 100644
index 000000000..1bccee40d
--- /dev/null
+++ b/data/presets/presets/leisure/golf_course.json
@@ -0,0 +1,18 @@
+{
+    "name": "golf course",
+    "match": {
+        "type": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "leisure": "golf_course"
+        },
+        "terms": []
+    },
+    "icon": "golf",
+    "form": [
+        "operator",
+        "address"
+    ]
+}
\ No newline at end of file
diff --git a/data/presets/presets/leisure/park.json b/data/presets/presets/leisure/park.json
new file mode 100644
index 000000000..7616510ab
--- /dev/null
+++ b/data/presets/presets/leisure/park.json
@@ -0,0 +1,35 @@
+{
+    "name": "park",
+    "match": {
+        "type": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "esplanade",
+            "estate",
+            "forest",
+            "garden",
+            "grass",
+            "green",
+            "grounds",
+            "lawn",
+            "lot",
+            "meadow",
+            "parkland",
+            "place",
+            "playground",
+            "plaza",
+            "pleasure garden",
+            "recreation area",
+            "square",
+            "tract",
+            "village green",
+            "woodland"
+        ],
+        "tags": {
+            "leisure": "park"
+        }
+    },
+    "icon": "park"
+}
\ No newline at end of file
diff --git a/data/presets/presets/leisure/pitch.json b/data/presets/presets/leisure/pitch.json
new file mode 100644
index 000000000..42a790af8
--- /dev/null
+++ b/data/presets/presets/leisure/pitch.json
@@ -0,0 +1,17 @@
+{
+    "name": "sport pitch",
+    "match": {
+        "type": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "leisure": "pitch"
+        },
+        "terms": []
+    },
+    "icon": "pitch",
+    "form": [
+        "surface"
+    ]
+}
diff --git a/data/presets/presets/leisure/pitch_baseball.json b/data/presets/presets/leisure/pitch_baseball.json
new file mode 100644
index 000000000..da32ce8a7
--- /dev/null
+++ b/data/presets/presets/leisure/pitch_baseball.json
@@ -0,0 +1,18 @@
+{
+    "name": "baseball diamond",
+    "match": {
+        "type": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "leisure": "pitch",
+            "sport": "baseball"
+        },
+        "terms": []
+    },
+    "icon": "baseball",
+    "form": [
+        "surface"
+    ]
+}
diff --git a/data/presets/presets/leisure/pitch_basketball.json b/data/presets/presets/leisure/pitch_basketball.json
new file mode 100644
index 000000000..862bf44b0
--- /dev/null
+++ b/data/presets/presets/leisure/pitch_basketball.json
@@ -0,0 +1,18 @@
+{
+    "name": "basketball court",
+    "match": {
+        "type": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "leisure": "pitch",
+            "sport": "basketball"
+        },
+        "terms": []
+    },
+    "icon": "basketball",
+    "form": [
+        "surface"
+    ]
+}
diff --git a/data/presets/presets/leisure/pitch_soccer.json b/data/presets/presets/leisure/pitch_soccer.json
new file mode 100644
index 000000000..650624f07
--- /dev/null
+++ b/data/presets/presets/leisure/pitch_soccer.json
@@ -0,0 +1,18 @@
+{
+    "name": "soccer field",
+    "match": {
+        "type": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "leisure": "pitch",
+            "sport": "soccer"
+        },
+        "terms": []
+    },
+    "icon": "soccer",
+    "form": [
+        "surface"
+    ]
+}
diff --git a/data/presets/presets/leisure/pitch_tennis.json b/data/presets/presets/leisure/pitch_tennis.json
new file mode 100644
index 000000000..119021c20
--- /dev/null
+++ b/data/presets/presets/leisure/pitch_tennis.json
@@ -0,0 +1,18 @@
+{
+    "name": "tennis court",
+    "match": {
+        "type": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "leisure": "pitch",
+            "sport": "tennis"
+        },
+        "terms": []
+    },
+    "icon": "tennis",
+    "form": [
+        "surface"
+    ]
+}
\ No newline at end of file
diff --git a/data/presets/presets/natural/coastline.json b/data/presets/presets/natural/coastline.json
new file mode 100644
index 000000000..7436f9059
--- /dev/null
+++ b/data/presets/presets/natural/coastline.json
@@ -0,0 +1,15 @@
+{
+    "name": "coastline",
+    "match": {
+        "type": [
+            "line"
+        ],
+        "terms": [
+            "shore"
+        ],
+        "tags": {
+            "natural": "coastline"
+        }
+    },
+    "icon": ""
+}
\ No newline at end of file
diff --git a/data/presets/presets/natural/water.json b/data/presets/presets/natural/water.json
new file mode 100644
index 000000000..3fbc96e5d
--- /dev/null
+++ b/data/presets/presets/natural/water.json
@@ -0,0 +1,14 @@
+{
+    "name": "water",
+    "match": {
+        "type": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "natural": "water"
+        },
+        "terms": []
+    },
+    "icon": ""
+}
\ No newline at end of file
diff --git a/data/presets/presets/natural/wetland.json b/data/presets/presets/natural/wetland.json
new file mode 100644
index 000000000..795a27001
--- /dev/null
+++ b/data/presets/presets/natural/wetland.json
@@ -0,0 +1,14 @@
+{
+    "name": "wetland",
+    "match": {
+        "type": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "natural": "wetland"
+        },
+        "terms": []
+    },
+    "icon": ""
+}
\ No newline at end of file
diff --git a/data/presets/presets/natural/wood.json b/data/presets/presets/natural/wood.json
new file mode 100644
index 000000000..816adb3c9
--- /dev/null
+++ b/data/presets/presets/natural/wood.json
@@ -0,0 +1,14 @@
+{
+    "name": "wood",
+    "match": {
+        "type": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "natural": "wood"
+        },
+        "terms": []
+    },
+    "icon": "park2"
+}
\ No newline at end of file
diff --git a/data/presets/presets/order.json b/data/presets/presets/order.json
new file mode 100644
index 000000000..4e2a05329
--- /dev/null
+++ b/data/presets/presets/order.json
@@ -0,0 +1,50 @@
+[
+    "amenity/cafe",
+    "leisure/park",
+    "natural/water",
+    "natural/wetland",
+    "natural/wood",
+    "natural/coastline",
+    "place/island",
+    "shop/supermarket",
+    "amenity/restaurant",
+    "amenity/place_of_worship",
+    "amenity/school",
+    "amenity/university",
+    "amenity/parking",
+    "amenity/bank",
+    "amenity/fast_food",
+    "amenity/bar",
+    "amenity/pub",
+    "amenity/cinema",
+    "amenity/hospital",
+    "amenity/pharmacy",
+    "amenity/fire_station",
+    "amenity/police",
+    "amenity/library",
+    "tourism/museum",
+    "amenity/townhall",
+    "leisure/golf_course",
+    "waterway/river",
+    "waterway/stream",
+    "highway/motorway",
+    "highway/residential",
+    "highway/primary",
+    "highway/secondary",
+    "highway/tertiary",
+    "highway/service",
+    "highway/track",
+    "railway/rail",
+    "railway/subway",
+    "highway/trunk",
+    "highway/footway",
+    "highway/cycleway",
+    "leisure/pitch",
+    "leisure/pitch_baseball",
+    "leisure/pitch_soccer",
+    "leisure/pitch_tennis",
+    "leisure/pitch_basketball",
+    "building/*",
+    "highway/bus_stop",
+    "highway/turning_circle"
+]
diff --git a/data/presets/presets/place/island.json b/data/presets/presets/place/island.json
new file mode 100644
index 000000000..27b83214e
--- /dev/null
+++ b/data/presets/presets/place/island.json
@@ -0,0 +1,23 @@
+{
+    "name": "island",
+    "match": {
+        "type": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "archipelago",
+            "atoll",
+            "bar",
+            "cay",
+            "isle",
+            "islet",
+            "key",
+            "reef"
+        ],
+        "tags": {
+            "place": "island"
+        }
+    },
+    "icon": ""
+}
\ No newline at end of file
diff --git a/data/presets/presets/railway/rail.json b/data/presets/presets/railway/rail.json
new file mode 100644
index 000000000..a90c18e99
--- /dev/null
+++ b/data/presets/presets/railway/rail.json
@@ -0,0 +1,13 @@
+{
+    "name": "rail",
+    "match": {
+        "type": [
+            "line"
+        ],
+        "tags": {
+            "railway": "rail"
+        },
+        "terms": []
+    },
+    "icon": "railway-rail"
+}
\ No newline at end of file
diff --git a/data/presets/presets/railway/subway.json b/data/presets/presets/railway/subway.json
new file mode 100644
index 000000000..db770b294
--- /dev/null
+++ b/data/presets/presets/railway/subway.json
@@ -0,0 +1,13 @@
+{
+    "name": "subway",
+    "match": {
+        "type": [
+            "line"
+        ],
+        "tags": {
+            "railway": "subway"
+        },
+        "terms": []
+    },
+    "icon": "railway-rail"
+}
\ No newline at end of file
diff --git a/data/presets/presets/shop/supermarket.json b/data/presets/presets/shop/supermarket.json
new file mode 100644
index 000000000..66efada36
--- /dev/null
+++ b/data/presets/presets/shop/supermarket.json
@@ -0,0 +1,40 @@
+{
+    "name": "supermarket",
+    "match": {
+        "type": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "bazaar",
+            "boutique",
+            "chain",
+            "co-op",
+            "cut-rate store",
+            "discount store",
+            "five-and-dime",
+            "flea market",
+            "galleria",
+            "mall",
+            "mart",
+            "outlet",
+            "outlet store",
+            "shop",
+            "shopping center",
+            "shopping plaza",
+            "stand",
+            "store",
+            "supermarket",
+            "thrift shop"
+        ],
+        "tags": {
+            "shop": "supermarket"
+        }
+    },
+    "icon": "grocery",
+    "form": [
+        "operator",
+        "building_area",
+        "address"
+    ]
+}
\ No newline at end of file
diff --git a/data/presets/presets/tourism/museum.json b/data/presets/presets/tourism/museum.json
new file mode 100644
index 000000000..396711959
--- /dev/null
+++ b/data/presets/presets/tourism/museum.json
@@ -0,0 +1,33 @@
+{
+    "name": "museum",
+    "match": {
+        "type": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "exhibition",
+            "exhibits archive",
+            "foundation",
+            "gallery",
+            "hall",
+            "institution",
+            "library",
+            "menagerie",
+            "repository",
+            "salon",
+            "storehouse",
+            "treasury",
+            "vault"
+        ],
+        "tags": {
+            "tourism": "museum"
+        }
+    },
+    "icon": "museum",
+    "form": [
+        "operator",
+        "building_area",
+        "address"
+    ]
+}
\ No newline at end of file
diff --git a/data/presets/presets/waterway/river.json b/data/presets/presets/waterway/river.json
new file mode 100644
index 000000000..fff05840b
--- /dev/null
+++ b/data/presets/presets/waterway/river.json
@@ -0,0 +1,27 @@
+{
+    "name": "river",
+    "match": {
+        "type": [
+            "line"
+        ],
+        "terms": [
+            "beck",
+            "branch",
+            "brook",
+            "course",
+            "creek",
+            "estuary",
+            "rill",
+            "rivulet",
+            "run",
+            "runnel",
+            "stream",
+            "tributary",
+            "watercourse"
+        ],
+        "tags": {
+            "waterway": "river"
+        }
+    },
+    "icon": "waterway-river"
+}
\ No newline at end of file
diff --git a/data/presets/presets/waterway/stream.json b/data/presets/presets/waterway/stream.json
new file mode 100644
index 000000000..7a3be3f0c
--- /dev/null
+++ b/data/presets/presets/waterway/stream.json
@@ -0,0 +1,42 @@
+{
+    "name": "stream",
+    "match": {
+        "type": [
+            "line"
+        ],
+        "terms": [
+            "beck",
+            "branch",
+            "brook",
+            "burn",
+            "course",
+            "creek",
+            "current",
+            "drift",
+            "flood",
+            "flow",
+            "freshet",
+            "race",
+            "rill",
+            "rindle",
+            "rivulet",
+            "run",
+            "runnel",
+            "rush",
+            "spate",
+            "spritz",
+            "surge",
+            "tide",
+            "torrent",
+            "tributary",
+            "watercourse"
+        ],
+        "tags": {
+            "waterway": "stream"
+        }
+    },
+    "icon": "waterway-river",
+    "form": [
+        "layer"
+    ]
+}
\ No newline at end of file