diff --git a/assets/layers/waste_disposal/waste_disposal.json b/assets/layers/waste_disposal/waste_disposal.json
index 5bf4faf8bc..b744796724 100644
--- a/assets/layers/waste_disposal/waste_disposal.json
+++ b/assets/layers/waste_disposal/waste_disposal.json
@@ -70,6 +70,36 @@
           }
         }
       ]
+    },
+    {
+      "id": "disposal-location",
+      "question": {
+        "en": "Where is this container located?",
+        "nl": "Waar bevindt deze container zich?"
+      },
+      "mappings": [
+        {
+          "if": "location=underground",
+          "then": {
+            "en": "This is an underground container",
+            "nl": "Dit is een ondergrondse container"
+          }
+        },
+        {
+          "if": "location=indoor",
+          "then": {
+            "en": "This container is located indoors",
+            "nl": "Deze container bevindt zich binnen"
+          }
+        },
+        {
+          "if": "location=",
+          "then": {
+            "en": "This container is located outdoors",
+            "nl": "Deze container is buiten"
+          }
+        }
+      ]
     }
   ],
   "filter": [
diff --git a/assets/themes/street_lighting/street_lighting_assen.json b/assets/themes/street_lighting/street_lighting_assen.json
index fe515dba0c..49de1e8af1 100644
--- a/assets/themes/street_lighting/street_lighting_assen.json
+++ b/assets/themes/street_lighting/street_lighting_assen.json
@@ -30,7 +30,7 @@
       },
       "calculatedTags": [
         "_closest_osm_street_lamp=feat.closest('street_lamps')?.properties?.id",
-        "_closest_osm_street_lamp_distance=feat.distanceTo(feat.properties._closest_osm_street_lamp) * 1000",
+        "_closest_osm_street_lamp_distance=feat.distanceTo(feat.properties._closest_osm_street_lamp)",
         "_has_closeby_feature=Number(feat.properties._closest_osm_street_lamp_distance) < 5 ? 'yes' : 'no'"
       ],
       "title": "Straatlantaarn in dataset",
diff --git a/assets/themes/waste/waste.json b/assets/themes/waste/waste.json
index 0ae3985437..61d65712ca 100644
--- a/assets/themes/waste/waste.json
+++ b/assets/themes/waste/waste.json
@@ -1,7 +1,7 @@
 {
   "id": "waste",
   "maintainer": "",
-  "version": "2021-12-31",
+  "version": "2022-01-19",
   "language": [
     "en",
     "nl"
diff --git a/assets/themes/waste/waste_assen.json b/assets/themes/waste/waste_assen.json
new file mode 100644
index 0000000000..fadb370fd2
--- /dev/null
+++ b/assets/themes/waste/waste_assen.json
@@ -0,0 +1,113 @@
+{
+  "id": "waste_assen",
+  "maintainer": "Robin van der Linde",
+  "version": "2022-01-09",
+  "language": [
+    "en",
+    "nl"
+  ],
+  "title": {
+    "nl": "Afval - Assen"
+  },
+  "description": {
+    "nl": "Kaart met afvalbakken en recyclingfaciliteiten + een dataset voor Assen."
+  },
+  "icon": "./assets/layers/recycling/recycling-14.svg",
+  "startZoom": 19,
+  "startLat": 53.24865,
+  "startLon": 6.60075,
+  "layers": [
+    {
+      "builtin": "waste_basket",
+      "override": {
+        "minzoom": 12
+      }
+    },
+    {
+      "id": "waste_basket_assen",
+      "name": "Dataset Afvalbakken Assen",
+      "source": {
+        "osmTags": "OBJECTID~*",
+        "geoJson": "https://opendata.arcgis.com/datasets/5b6953ac5a9d4616a7dc75ab0beeac2f_0.geojson",
+        "isOsmCache": false
+      },
+      "calculatedTags": [
+        "_closest_osm_waste_basket=feat.closest('waste_basket')?.properties?.id",
+        "_closest_osm_waste_basket_distance=feat.distanceTo(feat.properties._closest_osm_waste_basket)",
+        "_has_closeby_feature=Number(feat.properties._closest_osm_waste_basket_distance) < 10 ? 'yes' : 'no'"
+      ],
+      "title": "Afvalbak in dataset",
+      "mapRendering": [
+        {
+          "location": [
+            "point",
+            "centroid"
+          ],
+          "icon": {
+            "render": "circle:red",
+            "mappings": [
+              {
+                "if": "_has_closeby_feature=yes",
+                "then": "circle:#008000aa"
+              }
+            ]
+          },
+          "iconSize": "20,20,center"
+        }
+      ],
+      "tagRenderings": [
+        "all_tags"
+      ]
+    },
+    {
+      "builtin": "recycling"
+    },
+    {
+      "id": "recycling_assen",
+      "name": "Dataset Recyclingcontainers Assen",
+      "source": {
+        "osmTags": "OBJECTID~*",
+        "geoJson": "https://opendata.arcgis.com/datasets/edb893998e27461b8ed82aad9854d27d_0.geojson",
+        "isOsmCache": false
+      },
+      "calculatedTags": [
+        "_closest_osm_recycling=feat.closest('recycling')?.properties?.id",
+        "_closest_osm_waste_disposal=feat.closest('waste_disposal')?.properties?.id",
+        "_closest_osm_recycling_distance=feat.distanceTo(feat.properties._closest_osm_recycling)",
+        "_closest_osm_waste_disposal_distance=feat.distanceTo(feat.properties._closest_osm_waste_disposal)",
+        "_has_closeby_recycling=Number(feat.properties._closest_osm_recycling_distance) < 10 ? 'yes' : 'no'",
+        "_has_closeby_waste_disposal=Number(feat.properties._closest_osm_waste_disposal_distance) < 10 ? 'yes' : 'no'"
+      ],
+      "title": "Recyclingcontainer in dataset",
+      "mapRendering": [
+        {
+          "location": [
+            "point",
+            "centroid"
+          ],
+          "icon": {
+            "render": "circle:red",
+            "mappings": [
+              {
+                "if": "_has_closeby_recycling=yes",
+                "then": "circle:#008000aa"
+              },
+              {
+                "if": "_has_closeby_waste_disposal=yes",
+                "then": "circle:#008000aa"
+              }
+            ]
+          },
+          "iconSize": "20,20,center"
+        }
+      ],
+      "tagRenderings": [
+        "all_tags"
+      ]
+    },
+    {
+      "builtin": "waste_disposal"
+    }
+  ],
+  "hideFromOverview": true
+}
\ No newline at end of file
diff --git a/langs/layers/en.json b/langs/layers/en.json
index a08fbbb598..4fa8c01efb 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -4784,6 +4784,20 @@
                 },
                 "question": "Who can use this waste disposal bin?",
                 "render": "Access: {access}"
+            },
+            "disposal-location": {
+                "mappings": {
+                    "0": {
+                        "then": "This is an underground container"
+                    },
+                    "1": {
+                        "then": "This container is located indoors"
+                    },
+                    "2": {
+                        "then": "This container is located outdoors"
+                    }
+                },
+                "question": "Where is this container located?"
             }
         },
         "title": {
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index 31967af2db..805df00d8b 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -4798,6 +4798,24 @@
             "render": "Vuilnisbak"
         }
     },
+    "waste_disposal": {
+        "tagRenderings": {
+            "disposal-location": {
+                "mappings": {
+                    "0": {
+                        "then": "Dit is een ondergrondse container"
+                    },
+                    "1": {
+                        "then": "Deze container bevindt zich binnen"
+                    },
+                    "2": {
+                        "then": "Deze container is buiten"
+                    }
+                },
+                "question": "Waar bevindt deze container zich?"
+            }
+        }
+    },
     "watermill": {
         "description": "Watermolens",
         "name": "Watermolens",
diff --git a/langs/themes/nl.json b/langs/themes/nl.json
index 5a12cc0397..80cbc37c9f 100644
--- a/langs/themes/nl.json
+++ b/langs/themes/nl.json
@@ -1061,6 +1061,10 @@
         "description": "Kaart met afvalbakken en recyclingfaciliteiten.",
         "title": "Afval"
     },
+    "waste_assen": {
+        "description": "Kaart met afvalbakken en recyclingfaciliteiten + een dataset voor Assen.",
+        "title": "Afval - Assen"
+    },
     "waste_basket": {
         "description": "Op deze kaart vind je vuilnisbakken waar je afval in kan smijten. Ontbreekt er een vuilnisbak? Dan kan je die zelf toevoegen",
         "shortDescription": "Een kaart met vuilnisbakken",