diff --git a/assets/layers/nature_reserve/nature_reserve.json b/assets/layers/nature_reserve/nature_reserve.json
index a0fd58df80..11bd7c027c 100644
--- a/assets/layers/nature_reserve/nature_reserve.json
+++ b/assets/layers/nature_reserve/nature_reserve.json
@@ -6,9 +6,13 @@
   "minzoom": 12,
   "source": {
     "osmTags": {
-      "or": [
-        "leisure=nature_reserve",
-        "boundary=protected_area"
+      "and": [
+        {
+          "or": [
+            "leisure=nature_reserve",
+            "boundary=protected_area"
+          ]
+        }
       ]
     }
   },
diff --git a/assets/layers/trails/trails.json b/assets/layers/trails/trails.json
new file mode 100644
index 0000000000..aacc71e510
--- /dev/null
+++ b/assets/layers/trails/trails.json
@@ -0,0 +1,217 @@
+{
+  "id": "trails",
+  "name": {
+    "nl": "paden"
+  },
+  "minzoom": 12,
+  "source": {
+    "osmTags": {
+      "and": [
+        "route=hiking"
+      ]
+    }
+  },
+  "title": {
+    "render": {
+      "nl": "Paden"
+    },
+    "mappings": [
+      {
+        "if": {
+          "and": [
+            "name:nl~*"
+          ]
+        },
+        "then": {
+          "nl": "{name:nl}"
+        }
+      },
+      {
+        "if": {
+          "and": [
+            "name~*"
+          ]
+        },
+        "then": {
+          "nl": "{name}"
+        }
+      }
+    ]
+  },
+  "description": {
+    "nl": "Paden waarlangs kan gewandeld worden"
+  },
+  "tagRenderings": [
+    "images",
+    {
+      "#": "Access tag",
+      "render": {
+        "nl": "De toegankelijkheid van dit gebied is: {access:description}"
+      },
+      "question": {
+        "nl": "Is dit gebied toegankelijk?"
+      },
+      "freeform": {
+        "key": "access:description"
+      },
+      "mappings": [
+        {
+          "if": {
+            "and": [
+              "access=yes",
+              "fee="
+            ]
+          },
+          "then": {
+            "nl": "Vrij toegankelijk"
+          }
+        },
+        {
+          "if": {
+            "and": [
+              "access=no",
+              "fee="
+            ]
+          },
+          "then": {
+            "nl": "Niet toegankelijk"
+          }
+        },
+        {
+          "if": {
+            "and": [
+              "access=private",
+              "fee="
+            ]
+          },
+          "then": {
+            "nl": "Niet toegankelijk, want privégebied"
+          }
+        },
+        {
+          "if": {
+            "and": [
+              "access=permissive",
+              "fee="
+            ]
+          },
+          "then": {
+            "nl": "Toegankelijk, ondanks dat het privegebied is"
+          }
+        },
+        {
+          "if": {
+            "and": [
+              "access=guided",
+              "fee="
+            ]
+          },
+          "then": {
+            "nl": "Enkel toegankelijk met een gids of tijdens een activiteit"
+          }
+        },
+        {
+          "if": {
+            "and": [
+              "access=yes",
+              "fee=yes"
+            ]
+          },
+          "then": {
+            "nl": "Toegankelijk mits betaling"
+          }
+        }
+      ]
+    },
+    {
+      "#": "Operator tag",
+      "render": {
+        "nl": "Beheer door {operator}"
+      },
+      "question": {
+        "nl": "Wie beheert dit pad?"
+      },
+      "freeform": {
+        "key": "operator"
+      },
+      "mappings": [
+        {
+          "if": {
+            "and": [
+              "operator=Natuurpunt"
+            ]
+          },
+          "then": {
+            "nl": "<img src=\"./assets/themes/buurtnatuur/Natuurpunt.jpg\" style=\"width:1.5em\">Dit gebied wordt beheerd door Natuurpunt"
+          }
+        },
+        {
+          "if": {
+            "and": [
+              "operator~(n|N)atuurpunt.*"
+            ]
+          },
+          "then": {
+            "nl": "<img src=\"./assets/themes/buurtnatuur/Natuurpunt.jpg\" style=\"width:1.5em\">Dit gebied wordt beheerd door {operator}"
+          },
+          "hideInAnswer": true
+        },
+        {
+          "if": {
+            "and": [
+              "operator=Agentschap Natuur en Bos"
+            ]
+          },
+          "then": {
+            "nl": "<img src=\"./assets/themes/buurtnatuur/ANB.jpg\" style=\"width:1.5em\">Dit gebied wordt beheerd door het Agentschap Natuur en Bos"
+          }
+        }
+      ]
+    },
+    {
+      "#": "Name:nl-tag",
+      "render": {
+        "nl": "Dit gebied heet {name:nl}"
+      },
+      "question": {
+        "nl": "Wat is de Nederlandstalige naam van dit gebied?"
+      },
+      "freeform": {
+        "key": "name:nl"
+      },
+      "condition": {
+        "and": [
+          "name:nl~*"
+        ]
+      }
+    }
+  ],
+  "hideUnderlayingFeaturesMinPercentage": 10,
+  "wayHandling": 2,
+  "icon": {
+    "render": "./assets/themes/buurtnatuur/nature_reserve.svg"
+  },
+  "width": {
+    "render": "5"
+  },
+  "iconSize": {
+    "render": "50,50,center"
+  },
+  "color": {
+    "render": "#3c3"
+  },
+  "presets": [
+    {
+      "tags": [
+        "leisure=nature_reserve",
+        "fixme=Toegevoegd met MapComplete, geometry nog uit te tekenen"
+      ],
+      "title": {
+        "nl": "Paden"
+      },
+      "description": {
+        "nl": "Voeg een ontbrekend, erkend pad toe."
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/assets/themes/natuurpunt/natuurpunt.json b/assets/themes/natuurpunt/natuurpunt.json
index 4ce6ff0e92..84500aec1d 100644
--- a/assets/themes/natuurpunt/natuurpunt.json
+++ b/assets/themes/natuurpunt/natuurpunt.json
@@ -21,15 +21,32 @@
   "startZoom": 12,
   "widenFactor": 0.05,
   "socialImage": "",
+
   "layers": [
-    "nature_reserve",
-    "drinking_water",
-    "bench",
-    "bench_at_pt",
-    "picnic_table",
-    "birdhide",
-    "toilet",
-    "visitor_information_centre"
+    {
+      "builtin": "nature_reserve",
+      "override": {
+        "source": {
+          "osmTags": {
+            "+and": [
+              "operator~.*[nN]atuurpunt.*"
+            ]
+          }
+        }
+      }
+    },
+    {
+      "builtin": "trails",
+      "override": {
+        "source": {
+          "osmTags": {
+            "+and": [
+              "operator~.*[nN]atuurpunt.*"
+            ]
+          }
+        }
+      }
+    }
   ],
   "roamingRenderings": []
 }
diff --git a/assets/themes/waste_basket/license_info.json b/assets/themes/waste_basket/license_info.json
deleted file mode 100644
index 21871efc03..0000000000
--- a/assets/themes/waste_basket/license_info.json
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-    {
-      "authors": [],
-      "path": "waste_basket.svg",
-      "license": "CC0",
-      "sources": [
-        "https://wiki.openstreetmap.org/wiki/File:Waste-basket-12.svg"
-      ]
-    }
-  ]
\ No newline at end of file
diff --git a/assets/themes/waste_basket/waste_basket.json b/assets/themes/waste_basket/waste_basket.json
deleted file mode 100644
index bcf368c06a..0000000000
--- a/assets/themes/waste_basket/waste_basket.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-    "id": "waste_basket",
-    "title": {
-      "en": "Waste Basket",
-      "nl": "Vuilnisbak"
-    },
-    "shortDescription": {
-      "en": "Throw away waste",
-      "nl": "Afval weggooien"
-    },
-    "description": {
-      "en": "This is a public waste basket, thrash can, where you can throw away your thrash.",
-      "nl": "Dit is een publieke vuilnisbak waar je je afval kan weggooien."
-    },
-    "language": [
-      "en",
-      "nl"
-    ],
-    "maintainer": "",
-    "icon": "./assets/themes/waste_basket/waste_basket.svg",
-    "version": "7/7/2021",
-    "startLat": 0,
-    "startLon": 0,
-    "startZoom": 1,
-    "widenFactor": 0.05,
-    "socialImage": "",
-    "layers": [
-      {
-        "id": "waste_basket",
-        "name": {
-          "en": "Waste Basket",
-          "nl": "Vuilnisbak"
-        },
-        "minzoom": 12,
-        "overpassTags": {
-          "and": [
-            "amenity=waste_basket"
-          ]
-        },
-        "title": {
-          "render": {
-            "en": "Waste Basket",
-            "nl": "Vuilnisbak"
-          },
-          "mappings": [
-            {
-              "if": {
-                "and": [
-                  "amenity=waste_basket"
-                ]
-              },
-              "then": {
-                "en": "Waste Basket",
-                "nl": "Vuilnisbak"
-              }
-            }
-          ]
-        },
-        "description": {
-          "en": "This is a public waste basket, thrash can, where you can throw away your thrash.",
-          "nl": "Dit is een publieke vuilnisbak waar je je afval kan weggooien."
-        },
-        "tagRenderings": [],
-        "hideUnderlayingFeaturesMinPercentage": 0,
-        "icon": {
-          "render": "./assets/themes/waste_basket/waste_basket.svg",
-          "mappings": [
-            {
-              "if": {
-                "and": [
-                  "amenity=waste_basket"
-                ]
-              },
-              "then": {
-                "en": "Waste Basket",
-                "nl": "Vuilnisbak"
-              }
-            }
-          ]
-        },
-        "width": {
-          "render": "8"
-        },
-        "iconSize": {
-          "render": "40,40,center",
-          "mappings": [
-            {
-              "if": {
-                "and": [
-                  "amenity=waste_basket"
-                ]
-              },
-              "then": {
-                "en": "Waste Basket",
-                "nl": "Vuilnisbak"
-              }
-            }
-          ]
-        },
-        "color": {
-          "render": "#00f"
-        },
-        "presets": [
-          {
-            "tags": [
-              "amenity=waste_basket"
-            ],
-            "title": {
-              "en": "Waste Basket",
-              "nl": "Vuilnisbak"
-            },
-            "description": {
-              "en": "Throw away waste",
-              "nl": "Afval weggooien"
-            }
-          }
-        ]
-      }
-    ],
-    "roamingRenderings": []
-  }
\ No newline at end of file
diff --git a/assets/themes/waste_basket/waste_basket.svg b/assets/themes/waste_basket/waste_basket.svg
deleted file mode 100644
index f9fb4b29c4..0000000000
--- a/assets/themes/waste_basket/waste_basket.svg
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="12"
-   height="12"
-   viewBox="0 0 12 12"
-   id="svg2">
-  <metadata id="metadata8">
-    <rdf:RDF>
-      <cc:Work rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs id="defs6"/>
-  <rect width="12" height="12" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/>
-  <path d="M 4,2 3,2 2,3 8,3 7,2 6,2 5,1 z M 2,4 3,9 7,9 8,4 z" 
-  id="waste-basket" style="fill:#666666;fill-opacity:1" transform="translate(1,1)"/>
-</svg>