diff --git a/data/presets/fields.json b/data/presets/fields.json
index 7d19a2c54..b28b4b18b 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -57,6 +57,10 @@
         "key": "construction",
         "type": "combo"
     },
+    "country": {
+        "key": "country",
+        "type": "combo"
+    },
     "crossing": {
         "key": "crossing",
         "type": "combo"
@@ -150,8 +154,8 @@
     "note": {
         "key": "note",
         "type": "textarea",
-        "icon": "note",
-        "universal": true
+        "universal": true,
+        "icon": "note"
     },
     "office": {
         "key": "office",
@@ -260,6 +264,17 @@
         "key": "wetland",
         "type": "combo"
     },
+    "wheelchair": {
+        "key": "wheelchair",
+        "type": "radio",
+        "options": [
+            "yes",
+            "limited",
+            "no"
+        ],
+        "icon": "wheelchair",
+        "universal": "true"
+    },
     "wikipedia": {
         "key": "wikipedia",
         "type": "text",
diff --git a/data/presets/fields/note.json b/data/presets/fields/note.json
index 25b078920..7bc9af9ce 100644
--- a/data/presets/fields/note.json
+++ b/data/presets/fields/note.json
@@ -1,5 +1,6 @@
 {
     "key": "note",
     "type": "textarea",
-    "universal": true
+    "universal": true,
+    "icon": "note"
 }
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 72335af6c..9a894aeeb 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -209,6 +209,34 @@
             "amenity": "cinema"
         }
     },
+    "amenity/courthouse": {
+        "fields": [
+            "operator",
+            "building_area",
+            "address"
+        ],
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "tags": {
+            "amenity": "courthouse"
+        }
+    },
+    "amenity/embassy": {
+        "geometry": [
+            "area",
+            "point"
+        ],
+        "tags": {
+            "amenity": "embassy"
+        },
+        "fields": [
+            "country"
+        ],
+        "icon": "embassy"
+    },
     "amenity/fast_food": {
         "icon": "fast-food",
         "fields": [
@@ -670,6 +698,27 @@
             "amenity": "telephone"
         }
     },
+    "amenity/theatre": {
+        "icon": "theatre",
+        "fields": [
+            "operator",
+            "building_area",
+            "address"
+        ],
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "terms": [
+            "performance",
+            "play",
+            "musical"
+        ],
+        "tags": {
+            "amenity": "theatre"
+        }
+    },
     "amenity/toilets": {
         "fields": [
             "operator",
@@ -1417,6 +1466,18 @@
             "leisure": "playground"
         }
     },
+    "leisure/stadium": {
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "leisure": "stadium"
+        },
+        "fields": [
+            "sport"
+        ]
+    },
     "man_made": {
         "fields": [
             "man_made"
diff --git a/data/presets/presets/amenity/courthouse.json b/data/presets/presets/amenity/courthouse.json
new file mode 100644
index 000000000..3aec2ed5d
--- /dev/null
+++ b/data/presets/presets/amenity/courthouse.json
@@ -0,0 +1,15 @@
+{
+    "fields": [
+        "operator",
+        "building_area",
+        "address"
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "area"
+    ],
+    "tags": {
+        "amenity": "courthouse"
+    }
+}
diff --git a/data/presets/presets/amenity/embassy.json b/data/presets/presets/amenity/embassy.json
new file mode 100644
index 000000000..d6b20f7d3
--- /dev/null
+++ b/data/presets/presets/amenity/embassy.json
@@ -0,0 +1,13 @@
+{
+    "geometry": [
+        "area",
+        "point"
+    ],
+    "tags": {
+        "amenity": "embassy"
+    },
+    "fields": [
+        "country"
+    ],
+    "icon": "embassy"
+}
diff --git a/data/presets/presets/amenity/theatre.json b/data/presets/presets/amenity/theatre.json
new file mode 100644
index 000000000..8420dc103
--- /dev/null
+++ b/data/presets/presets/amenity/theatre.json
@@ -0,0 +1,21 @@
+{
+    "icon": "theatre",
+    "fields": [
+        "operator",
+        "building_area",
+        "address"
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "area"
+    ],
+    "terms": [
+        "performance",
+        "play",
+        "musical"
+    ],
+    "tags": {
+        "amenity": "theatre"
+    }
+}
diff --git a/data/presets/presets/leisure/stadium.json b/data/presets/presets/leisure/stadium.json
new file mode 100644
index 000000000..dac748444
--- /dev/null
+++ b/data/presets/presets/leisure/stadium.json
@@ -0,0 +1,12 @@
+{
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "leisure": "stadium"
+    },
+    "fields": [
+        "sport"
+    ]
+}