diff --git a/assets/layers/watermill/watermill.json b/assets/layers/watermill/watermill.json
index 029c14b759..c0111e207d 100644
--- a/assets/layers/watermill/watermill.json
+++ b/assets/layers/watermill/watermill.json
@@ -1,186 +1,159 @@
 {
-  "id": "watermill",
-  "name": {
-    "nl": "watermolens"
-  },
-  "minzoom": 12,
-  "source": {
-    "osmTags": {
-      "and": [
-        "man_made=watermill"
-      ]
-    }
-  },
-  "title": {
-    "render": {
-      "nl": "Watermolens"
+    "id": "watermill",
+    "name": {
+        "nl": "Watermolens",
+        "en": "Watermill"
     },
-    "mappings": [
-      {
-        "if": {
-          "and": [
-            "name:nl~*"
-          ]
-        },
-        "then": {
-          "nl": "{name:nl}"
+    "minzoom": 12,
+    "source": {
+        "osmTags": {
+            "and": ["man_made=watermill"]
         }
-      },
-      {
-        "if": {
-          "and": [
-            "name~*"
-          ]
+    },
+    "title": {
+        "render": {
+            "nl": "Watermolens"
         },
-        "then": {
-          "nl": "{name}"
+        "mappings": [
+            {
+                "if": {
+                    "and": ["name:nl~*"]
+                },
+                "then": {
+                    "nl": "{name:nl}"
+                }
+            },
+            {
+                "if": {
+                    "and": ["name~*"]
+                },
+                "then": {
+                    "nl": "{name}"
+                }
+            }
+        ]
+    },
+    "description": {
+        "nl": "Watermolens"
+    },
+    "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
+                }
+            ]
+        }
+    ],
+    "wayHandling": 1,
+    "icon": {
+        "render": "./assets/layers/watermill/watermill.svg"
+    },
+    "iconSize": {
+        "render": "50,50,center"
+    },
+    "color": {
+        "render": "#FFC0CB"
+    },
+    "presets": [
+        {
+            "tags": [
+                "man_made=watermill",
+                "fixme=Toegevoegd met MapComplete, geometry nog uit te tekenen"
+            ],
+            "title": {
+                "nl": "Paden"
+            },
+            "description": {
+                "nl": "Voeg een ontbrekend, erkend pad toe."
+            }
         }
-      }
     ]
-  },
-  "description": {
-    "nl": "Watermolens"
-  },
-  "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
-        }
-      ]
-    }
-  ],
-  "wayHandling": 1,
-  "icon": {
-    "render": "./assets/layers/watermill/watermill.svg"
-  },
-  "iconSize": {
-    "render": "50,50,center"
-  },
-  "color": {
-    "render": "#FFC0CB"
-  },
-  "presets": [
-    {
-      "tags": [
-        "man_made=watermill",
-        "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 2170969e8a..9e23830302 100644
--- a/assets/themes/natuurpunt/natuurpunt.json
+++ b/assets/themes/natuurpunt/natuurpunt.json
@@ -1,334 +1,328 @@
 {
-  "id": "natuurpunt",
-  "customCss": "./assets/themes/natuurpunt/natuurpunt.css",
-  "title": {
-    "nl": "Natuurgebieden",
-    "en": "Nature Reserves"
-  },
-  "shortDescription": {
-    "nl": "Deze kaart toont de natuurgebieden van Natuurpunt",
-    "en": "This map shows the nature reserves of Natuurpunt"
-  },
-  "description": {
-    "nl": "Op deze kaart vind je alle natuurgebieden die Natuurpunt ter beschikking stelt",
-    "en": "On this map you can find all the nature reserves that Natuurpunt offers "
-  },
-  "language": [
-    "nl",
-    "en"
-  ],
-  "maintainer": "",
-  "icon": "./assets/themes/natuurpunt/natuurpunt.png",
-  "version": "0",
-  "startLat": 51.20875,
-  "startLon": 3.22435,
-  "startZoom": 15,
-  "widenFactor": 0.05,
-  "socialImage": "",
-  "defaultBackgroundId": "CartoDB.Positron",
-  "layers": [{
-      "#": "Nature reserve with geometry, z>=13",
-      "builtin": "nature_reserve",
-      "override": {
-        "name": null,
-        "source": {
-          "osmTags": {
-            "+and": [
-              "operator~.*[nN]atuurpunt.*"
-            ]
-          },
-          "geoJson": "https://pietervdvn.github.io/natuurpunt_cache/natuurpunt_{layer}_{z}_{x}_{y}.geojson",
-          "geoJsonZoomLevel": 12,
-          "isOsmCache": true
-        },
-        "minzoom": 13,
-        "minzoomVisible": 0,
-        "icon": {
-          "render": "circle:#FE6F32;./assets/themes/natuurpunt/nature_reserve.svg"
-        },
-        "deletion": {
-          "hardDeletionTags": {
-            "and": [
-              "leisure=nature_reserve",
-              "boundary=protected_area"
-            ]
-          }
-        }
-      }
+    "id": "natuurpunt",
+    "customCss": "./assets/themes/natuurpunt/natuurpunt.css",
+    "title": {
+        "nl": "Natuurgebieden",
+        "en": "Nature Reserves"
     },
-    {
-      "#": "Nature reserve overview from cache, points only, z < 13",
-      "builtin": "nature_reserve",
-      "override": {
-        "source": {
-          "osmTags": {
-            "+and": [
-              "operator~.*[nN]atuurpunt.*"
-            ]
-          },
-          "geoJson": "https://pietervdvn.github.io/natuurpunt_cache/natuurpunt_nature_reserve_points.geojson",
-          "isOsmCache": "duplicate"
-        },
-        "minzoom": 1,
-        "icon": {
-          "render": "circle:#FE6F32;./assets/themes/natuurpunt/nature_reserve.svg"
-        },
-        "deletion": {
-          "hardDeletionTags": {
-            "and": [
-              "leisure=nature_reserve",
-              "boundary=protected_area"
-            ]
-          }
-        }
-      }
+    "shortDescription": {
+        "nl": "Deze kaart toont de natuurgebieden van Natuurpunt",
+        "en": "This map shows the nature reserves of Natuurpunt"
     },
-    {
-      "builtin": "visitor_information_centre",
-      "override": {
-        "source": {
-          "osmTags": {
-            "+and": [
-              "operator~.*[nN]atuurpunt.*"
-            ]
-          },
-          "geoJson": "https://pietervdvn.github.io/natuurpunt_cache/natuurpunt_{layer}_{z}_{x}_{y}.geojson",
-          "geoJsonZoomLevel": 1,
-          "isOsmCache": true
-        },
-        "minzoom": "10",
-        "icon": {
-          "render": "circle:#FE6F32;./assets/themes/natuurpunt/information.svg"
-        },
-        "deletion": {
-          "hardDeletionTags": {
-            "and": [
-              "information=visitor_centre",
-              "information=office"
-            ]
-          }
-        }
-      }
+    "description": {
+        "nl": "Op deze kaart vind je alle natuurgebieden die Natuurpunt ter beschikking stelt",
+        "en": "On this map you can find all the nature reserves that Natuurpunt offers "
     },
-    {
-      "builtin": "trail",
-      "override": {
-        "source": {
-          "osmTags": {
-            "+and": [
-              "operator~.*[nN]atuurpunt.*"
-            ]
-          },
-          "geoJson": "https://pietervdvn.github.io/natuurpunt_cache/natuurpunt_{layer}_{z}_{x}_{y}.geojson",
-          "geoJsonZoomLevel": 12,
-          "isOsmCache": true
-        },
-        "minzoom": "13",
-        "icon": {
-          "render": "circle:#FE6F32;./assets/themes/natuurpunt/trail.svg",
-          "mappings": [{
-              "if": "wheelchair=yes",
-              "then": "circle:#FE6F32;./assets/themes/natuurpunt/walk_wheelchair.svg"
-            },
-            {
-              "if": "pushchair=yes",
-              "then": "circle:#FE6F32;./assets/themes/natuurpunt/pushchair.svg"
+    "language": ["nl"],
+    "maintainer": "",
+    "icon": "./assets/themes/natuurpunt/natuurpunt.png",
+    "version": "0",
+    "startLat": 51.20875,
+    "startLon": 3.22435,
+    "startZoom": 15,
+    "widenFactor": 0.05,
+    "socialImage": "",
+    "defaultBackgroundId": "CartoDB.Positron",
+    "layers": [
+        {
+            "#": "Nature reserve with geometry, z>=13",
+            "builtin": "nature_reserve",
+            "override": {
+                "name": null,
+                "source": {
+                    "osmTags": {
+                        "+and": ["operator~.*[nN]atuurpunt.*"]
+                    },
+                    "geoJson": "https://pietervdvn.github.io/natuurpunt_cache/natuurpunt_{layer}_{z}_{x}_{y}.geojson",
+                    "geoJsonZoomLevel": 12,
+                    "isOsmCache": true
+                },
+                "minzoom": 13,
+                "minzoomVisible": 0,
+                "icon": {
+                    "render": "circle:#FE6F32;./assets/themes/natuurpunt/nature_reserve.svg"
+                },
+                "deletion": {
+                    "hardDeletionTags": {
+                        "and": [
+                            "leisure=nature_reserve",
+                            "boundary=protected_area"
+                        ]
+                    }
+                }
             }
-          ]
         },
-        "deletion": {
-          "hardDeletionTags": {
-            "and": [
-              "route=hiking",
-              "route=bycicle",
-              "route=horse"
-            ]
-          }
-        }
-      }
-    },
-    {
-      "builtin": "toilet",
-      "override": {
-        "minzoom": "15",
-        "source": {
-          "geoJson": "https://pietervdvn.github.io/natuurpunt_cache/natuurpunt_{layer}_{z}_{x}_{y}.geojson",
-          "geoJsonZoomLevel": 12,
-          "isOsmCache": true
-        },
-        "icon": {
-          "render": "circle:#FE6F32;./assets/themes/natuurpunt/toilets.svg",
-          "mappings": [{
-              "if": "wheelchair=yes",
-              "then": "circle:#FE6F32;./assets/themes/natuurpunt/wheelchair.svg"
-            },
-            {
-              "if": "toilets:position=urinals",
-              "then": "circle:#FE6F32;./assets/themes/natuurpunt/urinal.svg"
+        {
+            "#": "Nature reserve overview from cache, points only, z < 13",
+            "builtin": "nature_reserve",
+            "override": {
+                "source": {
+                    "osmTags": {
+                        "+and": ["operator~.*[nN]atuurpunt.*"]
+                    },
+                    "geoJson": "https://pietervdvn.github.io/natuurpunt_cache/natuurpunt_nature_reserve_points.geojson",
+                    "isOsmCache": "duplicate"
+                },
+                "minzoom": 1,
+                "icon": {
+                    "render": "circle:#FE6F32;./assets/themes/natuurpunt/nature_reserve.svg"
+                },
+                "deletion": {
+                    "hardDeletionTags": {
+                        "and": [
+                            "leisure=nature_reserve",
+                            "boundary=protected_area"
+                        ]
+                    }
+                }
             }
-          ]
         },
-        "deletion": {
-          "hardDeletionTags": "amenity=toilets"
-        }
-      }
-    },
-    {
-      "builtin": "birdhide",
-      "override": {
-        "minzoom": 12,
-        "source": {
-          "geoJson": "https://pietervdvn.github.io/natuurpunt_cache/natuurpunt_{layer}_{z}_{x}_{y}.geojson",
-          "geoJsonZoomLevel": 12,
-          "isOsmCache": true
-        },
-        "icon": {
-          "render": "circle:#FE6F32;./assets/themes/natuurpunt/birdhide.svg",
-          "mappings": null
-        },
-        "deletion": [{
-          "if": "leisure=bird_hide",
-          "then": {
-            "hardDeletionTags": "leisure=bird_hide"
-          }
-        }, {
-          "if": {
-            "or": [
-              "building=yes",
-              "shelter=yes",
-              "amenity=shelter"
-            ]
-          },
-          "then": {
-            "hardDeletionTags": {
-              "and": [
-                "building=yes",
-                "shelter=yes",
-                "amenity=shelter"
-              ]
+        {
+            "builtin": "visitor_information_centre",
+            "override": {
+                "source": {
+                    "osmTags": {
+                        "+and": ["operator~.*[nN]atuurpunt.*"]
+                    },
+                    "geoJson": "https://pietervdvn.github.io/natuurpunt_cache/natuurpunt_{layer}_{z}_{x}_{y}.geojson",
+                    "geoJsonZoomLevel": 1,
+                    "isOsmCache": true
+                },
+                "minzoom": "10",
+                "icon": {
+                    "render": "circle:#FE6F32;./assets/themes/natuurpunt/information.svg"
+                },
+                "deletion": {
+                    "hardDeletionTags": {
+                        "and": [
+                            "information=visitor_centre",
+                            "information=office"
+                        ]
+                    }
+                }
             }
-          }
-        }]
-      }
-    },
-    {
-      "builtin": "picnic_table",
-      "override": {
-        "minzoom": "16",
-        "source": {
-          "geoJson": "https://pietervdvn.github.io/natuurpunt_cache/natuurpunt_{layer}_{z}_{x}_{y}.geojson",
-          "geoJsonZoomLevel": 12,
-          "isOsmCache": true
         },
-        "icon": {
-          "render": "circle:#FE6F32;./assets/themes/natuurpunt/picnic_table.svg"
+        {
+            "builtin": "trail",
+            "override": {
+                "source": {
+                    "osmTags": {
+                        "+and": ["operator~.*[nN]atuurpunt.*"]
+                    },
+                    "geoJson": "https://pietervdvn.github.io/natuurpunt_cache/natuurpunt_{layer}_{z}_{x}_{y}.geojson",
+                    "geoJsonZoomLevel": 12,
+                    "isOsmCache": true
+                },
+                "minzoom": "13",
+                "icon": {
+                    "render": "circle:#FE6F32;./assets/themes/natuurpunt/trail.svg",
+                    "mappings": [
+                        {
+                            "if": "wheelchair=yes",
+                            "then": "circle:#FE6F32;./assets/themes/natuurpunt/walk_wheelchair.svg"
+                        },
+                        {
+                            "if": "pushchair=yes",
+                            "then": "circle:#FE6F32;./assets/themes/natuurpunt/pushchair.svg"
+                        }
+                    ]
+                },
+                "deletion": {
+                    "hardDeletionTags": {
+                        "and": ["route=hiking", "route=bycicle", "route=horse"]
+                    }
+                }
+            }
         },
-        "deletion": {
-          "hardDeletionTags": "leisure=picnic_table"
+        {
+            "builtin": "toilet",
+            "override": {
+                "minzoom": "15",
+                "source": {
+                    "geoJson": "https://pietervdvn.github.io/natuurpunt_cache/natuurpunt_{layer}_{z}_{x}_{y}.geojson",
+                    "geoJsonZoomLevel": 12,
+                    "isOsmCache": true
+                },
+                "icon": {
+                    "render": "circle:#FE6F32;./assets/themes/natuurpunt/toilets.svg",
+                    "mappings": [
+                        {
+                            "if": "wheelchair=yes",
+                            "then": "circle:#FE6F32;./assets/themes/natuurpunt/wheelchair.svg"
+                        },
+                        {
+                            "if": "toilets:position=urinals",
+                            "then": "circle:#FE6F32;./assets/themes/natuurpunt/urinal.svg"
+                        }
+                    ]
+                },
+                "deletion": {
+                    "hardDeletionTags": "amenity=toilets"
+                }
+            }
+        },
+        {
+            "builtin": "birdhide",
+            "override": {
+                "minzoom": 12,
+                "source": {
+                    "geoJson": "https://pietervdvn.github.io/natuurpunt_cache/natuurpunt_{layer}_{z}_{x}_{y}.geojson",
+                    "geoJsonZoomLevel": 12,
+                    "isOsmCache": true
+                },
+                "icon": {
+                    "render": "circle:#FE6F32;./assets/themes/natuurpunt/birdhide.svg",
+                    "mappings": null
+                },
+                "deletion": [
+                    {
+                        "if": "leisure=bird_hide",
+                        "then": {
+                            "hardDeletionTags": "leisure=bird_hide"
+                        }
+                    },
+                    {
+                        "if": {
+                            "or": [
+                                "building=yes",
+                                "shelter=yes",
+                                "amenity=shelter"
+                            ]
+                        },
+                        "then": {
+                            "hardDeletionTags": {
+                                "and": [
+                                    "building=yes",
+                                    "shelter=yes",
+                                    "amenity=shelter"
+                                ]
+                            }
+                        }
+                    }
+                ]
+            }
+        },
+        {
+            "builtin": "picnic_table",
+            "override": {
+                "minzoom": "16",
+                "source": {
+                    "geoJson": "https://pietervdvn.github.io/natuurpunt_cache/natuurpunt_{layer}_{z}_{x}_{y}.geojson",
+                    "geoJsonZoomLevel": 12,
+                    "isOsmCache": true
+                },
+                "icon": {
+                    "render": "circle:#FE6F32;./assets/themes/natuurpunt/picnic_table.svg"
+                },
+                "deletion": {
+                    "hardDeletionTags": "leisure=picnic_table"
+                }
+            }
+        },
+        {
+            "builtin": "drinking_water",
+            "override": {
+                "minzoom": "16",
+                "source": {
+                    "geoJson": "https://pietervdvn.github.io/natuurpunt_cache/natuurpunt_{layer}_{z}_{x}_{y}.geojson",
+                    "geoJsonZoomLevel": 12,
+                    "isOsmCache": true
+                },
+                "icon": {
+                    "render": "circle:#FE6F32;./assets/themes/natuurpunt/drips.svg"
+                },
+                "deletion": {
+                    "hardDeletionTags": "amenity=drinking_water"
+                }
+            }
+        },
+        {
+            "builtin": "parking",
+            "override": {
+                "minzoom": "16",
+                "icon": {
+                    "render": "circle:#FE6F32;./assets/themes/natuurpunt/parking.svg",
+                    "mappings": [
+                        {
+                            "if": "amenity=bicycle_parking",
+                            "then": "circle:#FE6F32;./assets/themes/natuurpunt/parkingbike.svg"
+                        }
+                    ]
+                },
+                "iconOverlays": [
+                    {
+                        "if": "amenity=motorcycle_parking",
+                        "then": "circle:#335D9F;./assets/themes/natuurpunt/parkingmotor.svg",
+                        "badge": true
+                    },
+                    {
+                        "if": "capacity:disabled=yes",
+                        "then": "circle:#335D9F;./assets/themes/natuurpunt/parkingwheels.svg",
+                        "badge": true
+                    }
+                ],
+                "deletion": {
+                    "hardDeletionTags": {
+                        "and": [
+                            "amenity=parking",
+                            "amenity=motorcycle_parking",
+                            "amenity=bicycle_parking"
+                        ]
+                    }
+                }
+            }
+        },
+        {
+            "builtin": "information_board",
+            "override": {
+                "minzoom": "16",
+                "source": {
+                    "geoJson": "https://pietervdvn.github.io/natuurpunt_cache/natuurpunt_{layer}_{z}_{x}_{y}.geojson",
+                    "geoJsonZoomLevel": 12,
+                    "isOsmCache": true
+                },
+                "icon": {
+                    "render": "circle:#FE6F32;./assets/themes/natuurpunt/information_board.svg"
+                },
+                "deletion": {
+                    "hardDeletionTags": "information=board"
+                }
+            }
+        },
+        {
+            "builtin": "bench",
+            "override": {
+                "minzoom": "18",
+                "source": {
+                    "geoJson": "https://pietervdvn.github.io/natuurpunt_cache/natuurpunt_{layer}_{z}_{x}_{y}.geojson",
+                    "geoJsonZoomLevel": 12,
+                    "isOsmCache": true
+                },
+                "icon": {
+                    "render": "circle:#FE6F32;./assets/themes/natuurpunt/bench.svg"
+                },
+                "deletion": {
+                    "hardDeletionTags": "amenity=bench"
+                }
+            }
+        },
+        {
+            "builtin": "watermill",
+            "override": {
+                "minzoom": "18",
+                "source": {
+                    "geoJson": "https://pietervdvn.github.io/natuurpunt_cache/natuurpunt_{layer}_{z}_{x}_{y}.geojson",
+                    "geoJsonZoomLevel": 12,
+                    "isOsmCache": true
+                },
+                "icon": {
+                    "render": "circle:#FE6F32;./assets/themes/natuurpunt/watermill.svg"
+                },
+                "deletion": {
+                    "hardDeletionTags": "man_made=watermill"
+                }
+            }
         }
-      }
-    },
-    {
-      "builtin": "drinking_water",
-      "override": {
-        "minzoom": "16",
-        "source": {
-          "geoJson": "https://pietervdvn.github.io/natuurpunt_cache/natuurpunt_{layer}_{z}_{x}_{y}.geojson",
-          "geoJsonZoomLevel": 12,
-          "isOsmCache": true
-        },
-        "icon": {
-          "render": "circle:#FE6F32;./assets/themes/natuurpunt/drips.svg"
-        },
-        "deletion": {
-          "hardDeletionTags": "amenity=drinking_water"
-        }
-      }
-    },
-    {
-      "builtin": "parking",
-      "override": {
-        "minzoom": "16",
-        "icon": {
-          "render": "circle:#FE6F32;./assets/themes/natuurpunt/parking.svg",
-          "mappings": [{
-            "if": "amenity=bicycle_parking",
-            "then": "circle:#FE6F32;./assets/themes/natuurpunt/parkingbike.svg"
-          }]
-        },
-        "iconOverlays": [{
-            "if": "amenity=motorcycle_parking",
-            "then": "circle:#335D9F;./assets/themes/natuurpunt/parkingmotor.svg",
-            "badge": true
-          },
-          {
-            "if": "capacity:disabled=yes",
-            "then": "circle:#335D9F;./assets/themes/natuurpunt/parkingwheels.svg",
-            "badge": true
-          }
-        ],
-        "deletion": {
-          "hardDeletionTags": {
-            "and": [
-              "amenity=parking",
-              "amenity=motorcycle_parking",
-              "amenity=bicycle_parking"
-            ]
-          }
-        }
-      }
-    },
-    {
-      "builtin": "information_board",
-      "override": {
-        "minzoom": "16",
-        "source": {
-          "geoJson": "https://pietervdvn.github.io/natuurpunt_cache/natuurpunt_{layer}_{z}_{x}_{y}.geojson",
-          "geoJsonZoomLevel": 12,
-          "isOsmCache": true
-        },
-        "icon": {
-          "render": "circle:#FE6F32;./assets/themes/natuurpunt/information_board.svg"
-        },
-        "deletion": {
-          "hardDeletionTags": "information=board"
-        }
-      }
-    },
-    {
-      "builtin": "bench",
-      "override": {
-        "minzoom": "18",
-        "source": {
-          "geoJson": "https://pietervdvn.github.io/natuurpunt_cache/natuurpunt_{layer}_{z}_{x}_{y}.geojson",
-          "geoJsonZoomLevel": 12,
-          "isOsmCache": true
-        },
-        "icon": {
-          "render": "circle:#FE6F32;./assets/themes/natuurpunt/bench.svg"
-        },
-        "deletion": {
-          "hardDeletionTags": "amenity=bench"
-        }
-      }
-    },
-    {
-      "builtin": "watermill",
-      "override": {
-        "minzoom": "18",
-        "source": {
-          "geoJson": "https://pietervdvn.github.io/natuurpunt_cache/natuurpunt_{layer}_{z}_{x}_{y}.geojson",
-          "geoJsonZoomLevel": 12,
-          "isOsmCache": true
-        },
-        "icon": {
-          "render": "circle:#FE6F32;./assets/themes/natuurpunt/watermill.svg"
-        },
-        "deletion": {
-          "hardDeletionTags": "man_made=watermill"
-        }
-      }
-    }
-  ],
-  "roamingRenderings": []
-}
\ No newline at end of file
+    ],
+    "roamingRenderings": []
+}