diff --git a/data/fields/subject.json b/data/fields/subject.json
new file mode 100644
index 00000000..6793936a
--- /dev/null
+++ b/data/fields/subject.json
@@ -0,0 +1,5 @@
+{
+    "key": "subject",
+    "type": "text",
+    "label": "Subject"
+}
diff --git a/data/fields/subject/wikidata.json b/data/fields/subject/wikidata.json
new file mode 100644
index 00000000..40789bd6
--- /dev/null
+++ b/data/fields/subject/wikidata.json
@@ -0,0 +1,9 @@
+{
+    "key": "subject:wikidata",
+    "keys": [
+        "subject:wikidata",
+        "subject:wikipedia"
+    ],
+    "type": "wikidata",
+    "label": "Subject Wikidata"
+}
diff --git a/data/presets/leisure/pitch/four_square.json b/data/presets/leisure/pitch/four_square.json
index 5480e842..4fc54ea4 100644
--- a/data/presets/leisure/pitch/four_square.json
+++ b/data/presets/leisure/pitch/four_square.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-pitch",
+    "icon": "fas-border-all",
     "geometry": [
         "area",
         "point"
diff --git a/data/presets/leisure/pitch/funnel_ball.json b/data/presets/leisure/pitch/funnel_ball.json
new file mode 100644
index 00000000..dc612f54
--- /dev/null
+++ b/data/presets/leisure/pitch/funnel_ball.json
@@ -0,0 +1,16 @@
+{
+    "icon": "maki-pitch",
+    "geometry": [
+        "area",
+        "point"
+    ],
+    "tags": {
+        "leisure": "pitch",
+        "sport": "funnel_ball"
+    },
+    "reference": {
+        "key": "sport",
+        "value": "funnel_ball"
+    },
+    "name": "Funnel Ball Court"
+}
diff --git a/data/presets/leisure/pitch/gaga.json b/data/presets/leisure/pitch/gaga.json
new file mode 100644
index 00000000..f78bea62
--- /dev/null
+++ b/data/presets/leisure/pitch/gaga.json
@@ -0,0 +1,19 @@
+{
+    "icon": "maki-pitch",
+    "geometry": [
+        "area",
+        "point"
+    ],
+    "tags": {
+        "leisure": "pitch",
+        "sport": "gaga"
+    },
+    "reference": {
+        "key": "sport",
+        "value": "gaga"
+    },
+    "terms": [
+        "gaga ball"
+    ],
+    "name": "Gaga Pit"
+}
diff --git a/data/presets/playground/activitypanel.json b/data/presets/playground/activitypanel.json
new file mode 100644
index 00000000..8a43061a
--- /dev/null
+++ b/data/presets/playground/activitypanel.json
@@ -0,0 +1,12 @@
+{
+    "icon": "maki-playground",
+    "geometry": [
+        "point",
+        "line",
+        "area"
+    ],
+    "tags": {
+        "playground": "activitypanel"
+    },
+    "name": "Play Activity Panel"
+}
diff --git a/data/presets/playground/aerialrotator.json b/data/presets/playground/aerialrotator.json
new file mode 100644
index 00000000..04528d22
--- /dev/null
+++ b/data/presets/playground/aerialrotator.json
@@ -0,0 +1,15 @@
+{
+    "icon": "maki-playground",
+    "geometry": [
+        "point"
+    ],
+    "tags": {
+        "playground": "aerialrotator"
+    },
+    "name": "Hanging Spinner",
+    "aliases": [
+        "Aerial Rotator",
+        "Aerial Spinner",
+        "Hanging Roundabout"
+    ]
+}
diff --git a/data/presets/playground/bridge.json b/data/presets/playground/bridge.json
new file mode 100644
index 00000000..0ad07258
--- /dev/null
+++ b/data/presets/playground/bridge.json
@@ -0,0 +1,17 @@
+{
+    "icon": "maki-playground",
+    "geometry": [
+        "point",
+        "line",
+        "area"
+    ],
+    "moreFields": [
+        "{playground}",
+        "length",
+        "width"
+    ],
+    "tags": {
+        "playground": "bridge"
+    },
+    "name": "Play Bridge"
+}
diff --git a/data/presets/playground/climbingwall.json b/data/presets/playground/climbingwall.json
new file mode 100644
index 00000000..8e38f064
--- /dev/null
+++ b/data/presets/playground/climbingwall.json
@@ -0,0 +1,12 @@
+{
+    "icon": "maki-playground",
+    "geometry": [
+        "point",
+        "line",
+        "area"
+    ],
+    "tags": {
+        "playground": "climbingwall"
+    },
+    "name": "Play Climbing Wall"
+}
diff --git a/data/presets/playground/funnel_ball.json b/data/presets/playground/funnel_ball.json
new file mode 100644
index 00000000..49f807a7
--- /dev/null
+++ b/data/presets/playground/funnel_ball.json
@@ -0,0 +1,10 @@
+{
+    "icon": "maki-playground",
+    "geometry": [
+        "point"
+    ],
+    "tags": {
+        "playground": "funnel_ball"
+    },
+    "name": "Funnel Ball Funnel"
+}
diff --git a/data/presets/playground/map.json b/data/presets/playground/map.json
new file mode 100644
index 00000000..8130e66b
--- /dev/null
+++ b/data/presets/playground/map.json
@@ -0,0 +1,19 @@
+{
+    "icon": "temaki-compass",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "fields": [
+        "subject/wikidata",
+        "surface"
+    ],
+    "moreFields": [
+        "colour",
+        "subject"
+    ],
+    "tags": {
+        "playground": "map"
+    },
+    "name": "Painted Playground Map"
+}
diff --git a/data/presets/playground/sledding.json b/data/presets/playground/sledding.json
new file mode 100644
index 00000000..332fa220
--- /dev/null
+++ b/data/presets/playground/sledding.json
@@ -0,0 +1,10 @@
+{
+    "icon": "temaki-sledding",
+    "geometry": [
+        "point"
+    ],
+    "tags": {
+        "playground": "sledding"
+    },
+    "name": "Play Sledding Hill"
+}
diff --git a/data/presets/playground/splash_pad.json b/data/presets/playground/splash_pad.json
new file mode 100644
index 00000000..e96e2bad
--- /dev/null
+++ b/data/presets/playground/splash_pad.json
@@ -0,0 +1,11 @@
+{
+    "icon": "temaki-fountain",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "playground": "splash_pad"
+    },
+    "name": "Play Splash Pad"
+}
diff --git a/data/presets/playground/teenshelter.json b/data/presets/playground/teenshelter.json
new file mode 100644
index 00000000..f3813e38
--- /dev/null
+++ b/data/presets/playground/teenshelter.json
@@ -0,0 +1,11 @@
+{
+    "icon": "maki-shelter",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "playground": "teenshelter"
+    },
+    "name": "Teen Shelter"
+}
diff --git a/data/presets/playground/tetherball.json b/data/presets/playground/tetherball.json
new file mode 100644
index 00000000..f78989fe
--- /dev/null
+++ b/data/presets/playground/tetherball.json
@@ -0,0 +1,10 @@
+{
+    "icon": "maki-playground",
+    "geometry": [
+        "point"
+    ],
+    "tags": {
+        "playground": "tetherball"
+    },
+    "name": "Tetherball Pole"
+}
diff --git a/data/presets/playground/trampoline.json b/data/presets/playground/trampoline.json
new file mode 100644
index 00000000..4a283811
--- /dev/null
+++ b/data/presets/playground/trampoline.json
@@ -0,0 +1,11 @@
+{
+    "icon": "maki-playground",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "playground": "trampoline"
+    },
+    "name": "Trampoline"
+}
diff --git a/data/presets/playground/tunnel_tube.json b/data/presets/playground/tunnel_tube.json
new file mode 100644
index 00000000..9bfdf041
--- /dev/null
+++ b/data/presets/playground/tunnel_tube.json
@@ -0,0 +1,12 @@
+{
+    "icon": "maki-playground",
+    "geometry": [
+        "point",
+        "line",
+        "area"
+    ],
+    "tags": {
+        "playground": "tunnel_tube"
+    },
+    "name": "Play Tunnel"
+}
diff --git a/data/presets/playground/water.json b/data/presets/playground/water.json
new file mode 100644
index 00000000..2399309e
--- /dev/null
+++ b/data/presets/playground/water.json
@@ -0,0 +1,12 @@
+{
+    "icon": "temaki-water",
+    "geometry": [
+        "point",
+        "line",
+        "area"
+    ],
+    "tags": {
+        "playground": "water"
+    },
+    "name": "Play Water Pump/Screw"
+}