diff --git a/assets/themes/postboxes/license_info.json b/assets/themes/postboxes/license_info.json
new file mode 100644
index 0000000000..0c50f7040e
--- /dev/null
+++ b/assets/themes/postboxes/license_info.json
@@ -0,0 +1,25 @@
+[
+  {
+    "path": "post_office.svg",
+    "license": "CC BY-SA 4.0",
+    "authors": [
+      "https://github.com/emojione/emojione/graphs/contributors"
+    ],
+    "sources": [
+      "https://commons.wikimedia.org/wiki/File:Emojione_BW_1F3E4.svg",
+      "https://github.com/emojione/emojione/blob/2.2.7/assets/svg_bw/1f3e4.svg"
+    ]
+  },
+  {
+    "path": "postbox.svg",
+    "license": "CC BY 4.0",
+    "authors": [
+      "Vincent Le Moign",
+      "https://twitter.com/webalys"
+    ],
+    "sources": [
+      "https://upload.wikimedia.org/wikipedia/commons/6/6d/726-postbox.svg",
+      "http://emoji.streamlineicons.com"
+    ]
+  }
+]
\ No newline at end of file
diff --git a/assets/themes/postboxes_postoffices/post_office.svg b/assets/themes/postboxes/post_office.svg
similarity index 100%
rename from assets/themes/postboxes_postoffices/post_office.svg
rename to assets/themes/postboxes/post_office.svg
diff --git a/assets/themes/postboxes_postoffices/postbox.svg b/assets/themes/postboxes/postbox.svg
similarity index 100%
rename from assets/themes/postboxes_postoffices/postbox.svg
rename to assets/themes/postboxes/postbox.svg
diff --git a/assets/themes/postboxes_postoffices/postboxes_postoffices.json b/assets/themes/postboxes/postboxes.json
similarity index 82%
rename from assets/themes/postboxes_postoffices/postboxes_postoffices.json
rename to assets/themes/postboxes/postboxes.json
index 7e9f6c8236..69425a32e0 100644
--- a/assets/themes/postboxes_postoffices/postboxes_postoffices.json
+++ b/assets/themes/postboxes/postboxes.json
@@ -13,13 +13,17 @@
     "en"
   ],
   "maintainer": "",
-  "icon": "./assets/themes/postboxes_postoffices/postbox.svg",
+  "icon": "./assets/themes/postboxes/postbox.svg",
   "version": "0",
   "startLat": 53.5511,
   "startLon": 9.9937,
   "startZoom": 13,
-  "widenFactor": 0.05,
+  "widenFactor": 1.0,
   "socialImage": "",
+  "clustering": {
+    "minNeededFeatures": 100,
+    "maxZoom": 14
+  },
   "layers": [
     {
       "id": "postboxes",
@@ -27,10 +31,8 @@
         "en": "Postbox"
       },
       "minzoom": 12,
-      "overpassTags": {
-        "and": [
-          "amenity=post_box"
-        ]
+      "source": {
+        "osmTags": "amenity=post_box"
       },
       "title": {
         "render": {
@@ -43,11 +45,12 @@
       "tagRenderings": [
         "images",
         {
+          "id": "minimap",
           "render": "{minimap(18): height: 5rem; overflow: hidden; border-radius:3rem; }"
         }
       ],
       "icon": {
-        "render": "./assets/themes/postboxes_postoffices/postbox.svg"
+        "render": "./assets/themes/postboxes/postbox.svg"
       },
       "width": {
         "render": "1"
@@ -64,11 +67,11 @@
             "amenity=post_box"
           ],
           "title": {
-            "en": "Postbox"
+            "en": "postbox"
           }
         }
       ],
-      "wayHandling": "both outline and center"
+      "wayHandling": 2
     },
     {
       "id": "postoffices",
@@ -76,10 +79,8 @@
         "en": "A layer containing post offices"
       },
       "minzoom": 12,
-      "overpassTags": {
-        "and": [
-          "amenity=post_office"
-        ]
+      "source": {
+        "osmTags": "amenity=post_office"
       },
       "title": {
         "render": {
@@ -92,11 +93,12 @@
       "tagRenderings": [
         "images",
         {
+          "id": "minimap",
           "render": "{minimap(18): height: 5rem; overflow: hidden; border-radius:3rem; }"
         },
         {
           "render": {
-            "en": "Opening Hours: {opening_hours}"
+            "en": "Opening Hours: {opening_hours_table()}"
           },
           "freeform": {
             "key": "opening_hours",
@@ -117,7 +119,7 @@
         }
       ],
       "icon": {
-        "render": "./assets/themes/postboxes_postoffices/post_office.svg"
+        "render": "./assets/themes/postboxes/post_office.svg"
       },
       "width": {
         "render": "1"
@@ -140,6 +142,5 @@
       ],
       "wayHandling": 2
     }
-  ],
-  "roamingRenderings": []
+  ]
 }
\ No newline at end of file
diff --git a/assets/themes/postboxes_postoffices/license_info.json b/assets/themes/postboxes_postoffices/license_info.json
deleted file mode 100644
index 869dda32ca..0000000000
--- a/assets/themes/postboxes_postoffices/license_info.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-    {
-      "path": "postbox.svg",
-      "license": "CC BY 4.0",
-      "authors": ["Vincent Le Moign","https://twitter.com/webalys"],
-      "sources": ["https://upload.wikimedia.org/wikipedia/commons/6/6d/726-postbox.svg", "http://emoji.streamlineicons.com"]
-    },
-
-    {
-      "path": "post_office.svg",
-      "license": "CC BY-SA 4.0",
-      "authors": ["https://github.com/emojione/emojione/graphs/contributors"],
-      "sources": ["https://commons.wikimedia.org/wiki/File:Emojione_BW_1F3E4.svg", "https://github.com/emojione/emojione/blob/2.2.7/assets/svg_bw/1f3e4.svg"]
-    }
-  ]
\ No newline at end of file