diff --git a/assets/themes/waste_basket/waste_basket.json b/assets/themes/waste_basket/waste_basket.json
index a11a95568e..2c457c8e93 100644
--- a/assets/themes/waste_basket/waste_basket.json
+++ b/assets/themes/waste_basket/waste_basket.json
@@ -1,102 +1,74 @@
 {
-  "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,
-      "source": {
-        "osmTags": {
-          "and": [
-            "amenity=waste_basket"
-          ]
-        }
-      },
-      "title": {
-        "render": {
+    "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"
         },
-        "mappings": [
-          {
-            "if": {
-              "and": [
-                "amenity=waste_basket"
-              ]
-            },
-            "then": {
-              "en": "Waste Basket",
-              "nl": "Vuilnisbak"
-            }
+        "minzoom": 12,
+        "source": {"osmTags": {
+          "and": [
+            "amenity=waste_basket"
+          ]
+        }},
+        "title": {
+          "render": {
+            "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"
+        },
+        "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"
+        },
+        "width": {
+          "render": "8"
+        },
+        "iconSize": {
+          "render": "40,40,center",
+          "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": {
diff --git a/package.json b/package.json
index d09ca2b7ca..e125b7b005 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "generate:layouts": "ts-node scripts/generateLayouts.ts",
     "generate:docs": "ts-node scripts/generateDocs.ts && ts-node scripts/generateTaginfoProjectFiles.ts",
     "generate:cache:speelplekken": "npm run generate:layeroverview && ts-node scripts/generateCache.ts speelplekken 14 ../pietervdvn.github.io/speelplekken_cache/ 51.20 4.35 51.09 4.56",
-    "generate:layeroverview": "echo {\\\"layers\\\":[], \\\"themes\\\":[]} > ./assets/generated/known_layers_and_themes.json && ts-node scripts/generateLayerOverview.ts --no-fail",
+    "generate:layeroverview": "npm run generate:licenses && echo {\\\"layers\\\":[], \\\"themes\\\":[]} > ./assets/generated/known_layers_and_themes.json && ts-node scripts/generateLayerOverview.ts --no-fail",
     "generate:licenses": "ts-node scripts/generateLicenseInfo.ts --no-fail",
     "generate:report": "cd Docs/Tools && ./compileStats.sh && git commit . -m 'New statistics ands graphs' && git push",
     "generate:contributor-list": "git log --pretty='%aN' | sort | uniq -c | sort -hr | sed 's/ *\\([0-9]*\\) \\(.*\\)$/{\"contributor\":\"\\2\", \"commits\":\\1}/' | tr '\\n' ',' | sed 's/^/{\"contributors\":[/' | sed 's/,$/]}/' > assets/contributors.json",