diff --git a/langs/layers/ca.json b/langs/layers/ca.json
index 8cf1643f7e..2164bdb4e3 100644
--- a/langs/layers/ca.json
+++ b/langs/layers/ca.json
@@ -801,6 +801,17 @@
             }
         }
     },
+    "parcel_lockers": {
+        "filter": {
+            "0": {
+                "options": {
+                    "0": {
+                        "question": "Actualment obert"
+                    }
+                }
+            }
+        }
+    },
     "parking": {
         "name": "Aparcament"
     },
@@ -853,6 +864,37 @@
             "render": "Parc infantil"
         }
     },
+    "postboxes": {
+        "name": "Bústies",
+        "presets": {
+            "0": {
+                "title": "una bústia"
+            }
+        },
+        "title": {
+            "render": "Bústia"
+        }
+    },
+    "postoffices": {
+        "filter": {
+            "0": {
+                "options": {
+                    "0": {
+                        "question": "Actualment obert"
+                    }
+                }
+            }
+        },
+        "name": "Oficines de correus",
+        "presets": {
+            "0": {
+                "title": "una oficina de correus"
+            }
+        },
+        "title": {
+            "render": "Oficina de correus"
+        }
+    },
     "public_bookcase": {
         "name": "Bústies per llibres",
         "presets": {
diff --git a/langs/layers/de.json b/langs/layers/de.json
index 75df80ec68..4d49d6cde5 100644
--- a/langs/layers/de.json
+++ b/langs/layers/de.json
@@ -5018,6 +5018,17 @@
             }
         }
     },
+    "parcel_lockers": {
+        "filter": {
+            "0": {
+                "options": {
+                    "0": {
+                        "question": "Aktuell geöffnet"
+                    }
+                }
+            }
+        }
+    },
     "parking": {
         "description": "Eine Ebene mit Parkplätzen",
         "name": "Parkplätze",
@@ -5308,6 +5319,58 @@
             "render": "Spielplatz"
         }
     },
+    "postboxes": {
+        "description": "Die Ebene zeigt Briefkästen.",
+        "name": "Briefkästen",
+        "presets": {
+            "0": {
+                "title": "ein Briefkasten"
+            }
+        },
+        "title": {
+            "render": "Briefkasten"
+        }
+    },
+    "postoffices": {
+        "description": "Eine Ebene mit Postämtern.",
+        "filter": {
+            "0": {
+                "options": {
+                    "0": {
+                        "question": "Aktuell geöffnet"
+                    }
+                }
+            }
+        },
+        "name": "Poststellen",
+        "presets": {
+            "0": {
+                "title": "eine Poststelle"
+            }
+        },
+        "tagRenderings": {
+            "OH": {
+                "mappings": {
+                    "0": {
+                        "then": "durchgehend geöffnet (auch an Feiertagen)"
+                    }
+                },
+                "question": "Wie sind die Öffnungszeiten dieser Poststelle?",
+                "render": "Öffnungszeiten: {opening_hours_table()}"
+            }
+        },
+        "title": {
+            "mappings": {
+                "0": {
+                    "then": "Postfiliale im Einzelhandel"
+                },
+                "1": {
+                    "then": "Postfiliale im {name}"
+                }
+            },
+            "render": "Poststelle"
+        }
+    },
     "public_bookcase": {
         "description": "Ein Bücherschrank am Straßenrand mit Büchern, für jedermann zugänglich",
         "filter": {
diff --git a/langs/layers/en.json b/langs/layers/en.json
index 3dc11e5913..82d18f2c41 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -5049,6 +5049,91 @@
             }
         }
     },
+    "parcel_lockers": {
+        "description": "Layer showing parcel lockers for collecting and sending parcels.",
+        "filter": {
+            "0": {
+                "options": {
+                    "0": {
+                        "question": "Currently open"
+                    }
+                }
+            }
+        },
+        "name": "Parcel Lockers",
+        "presets": {
+            "0": {
+                "title": "a parcel locker"
+            }
+        },
+        "tagRenderings": {
+            "brand": {
+                "freeform": {
+                    "placeholder": "Brand"
+                },
+                "mappings": {
+                    "0": {
+                        "then": "This is an Amazon Locker"
+                    },
+                    "1": {
+                        "then": "This is a DHL Packstation"
+                    },
+                    "2": {
+                        "then": "This is a DPD Pickup Station"
+                    },
+                    "3": {
+                        "then": "This is a PostNL Parcel Locker"
+                    }
+                },
+                "question": "What is the brand of the parcel locker?",
+                "render": "This is a {brand} parcel locker"
+            },
+            "mail-in": {
+                "mappings": {
+                    "0": {
+                        "then": "You can send packages from this parcel locker"
+                    },
+                    "1": {
+                        "then": "You <b>can't</b> send packages from this parcel locker"
+                    }
+                },
+                "question": "Can you send packages from this parcel locker?"
+            },
+            "operator": {
+                "freeform": {
+                    "placeholder": "Operator"
+                },
+                "question": "What is the operator of the parcel locker?",
+                "render": "This parcel locker is operated by {operator}"
+            },
+            "pickup": {
+                "mappings": {
+                    "0": {
+                        "then": "You can pick up packages from this parcel locker"
+                    },
+                    "1": {
+                        "then": "You <b>can't</b> pick up packages from this parcel locker"
+                    }
+                },
+                "question": "Can you pick up packages from this parcel locker?"
+            },
+            "ref": {
+                "freeform": {
+                    "placeholder": "Reference"
+                },
+                "question": "What is the reference number/identifier of this parcel locker?",
+                "render": "This parcel locker has the reference {ref}"
+            }
+        },
+        "title": {
+            "mappings": {
+                "0": {
+                    "then": "{brand} parcel locker"
+                }
+            },
+            "render": "Parcel Locker"
+        }
+    },
     "parking": {
         "description": "A layer showing car parkings",
         "name": "Parking",
@@ -5339,6 +5424,159 @@
             "render": "Playground"
         }
     },
+    "postboxes": {
+        "description": "The layer showing postboxes.",
+        "name": "Postboxes",
+        "presets": {
+            "0": {
+                "title": "a postbox"
+            }
+        },
+        "title": {
+            "render": "Postbox"
+        }
+    },
+    "postoffices": {
+        "description": "A layer showing post offices.",
+        "filter": {
+            "0": {
+                "options": {
+                    "0": {
+                        "question": "Currently open"
+                    }
+                }
+            }
+        },
+        "name": "Post offices",
+        "presets": {
+            "0": {
+                "title": "a post office"
+            }
+        },
+        "tagRenderings": {
+            "OH": {
+                "mappings": {
+                    "0": {
+                        "then": "24/7 opened (including holidays)"
+                    }
+                },
+                "question": "What are the opening hours for this post office?",
+                "render": "Opening Hours: {opening_hours_table()}"
+            },
+            "letter-from": {
+                "mappings": {
+                    "0": {
+                        "then": "You can post letters here"
+                    },
+                    "1": {
+                        "then": "You can't post letters here"
+                    }
+                },
+                "question": "Can you post a letter here?",
+                "render": "You can post letters with these companies: {post_office:letter_from}"
+            },
+            "parcel-from": {
+                "mappings": {
+                    "0": {
+                        "then": "You can send parcels here"
+                    },
+                    "1": {
+                        "then": "You can't send parcels here"
+                    }
+                },
+                "question": "Can you send a parcel here?",
+                "render": "You can post parcels with these companies: {post_office:parcel_from}"
+            },
+            "parcel-pickup": {
+                "mappings": {
+                    "0": {
+                        "then": "You can pick up missed parcels here"
+                    },
+                    "1": {
+                        "then": "You can't pick up missed parcels here"
+                    }
+                },
+                "question": "Can you pick up missed parcels here?",
+                "render": "You can pick up parcels from these companies: {post_office:parcel_pickup}"
+            },
+            "parcel-to": {
+                "mappings": {
+                    "0": {
+                        "then": "You can send parcels to here for pickup"
+                    },
+                    "1": {
+                        "then": "You can't send parcels to here for pickup"
+                    }
+                },
+                "question": "Can you send parcels to here for pickup?",
+                "render": "You can send parcels to here for pickup with these companies: {post_office:parcel_to}"
+            },
+            "partner-brand": {
+                "mappings": {
+                    "0": {
+                        "then": "This location offers services for DHL"
+                    },
+                    "1": {
+                        "then": "This location offers services for DPD"
+                    },
+                    "2": {
+                        "then": "This location offers services for GLS"
+                    },
+                    "3": {
+                        "then": "This location offers services for UPS"
+                    },
+                    "4": {
+                        "then": "This location is a DHL Paketshop"
+                    },
+                    "5": {
+                        "then": "This location is a Hermes PaketShop"
+                    },
+                    "6": {
+                        "then": "This location is a PostNL-point"
+                    },
+                    "7": {
+                        "then": "This location offers services for bpost"
+                    }
+                },
+                "question": "For which brand does this location offer services?",
+                "render": "This location offers services for {post_office:brand}"
+            },
+            "post_partner": {
+                "mappings": {
+                    "0": {
+                        "then": "This shop is a post partner"
+                    },
+                    "1": {
+                        "then": "This shop is not a post partner"
+                    }
+                },
+                "question": "Is this a post partner?"
+            },
+            "stamps": {
+                "mappings": {
+                    "0": {
+                        "then": "You can buy stamps here"
+                    },
+                    "1": {
+                        "then": "You can't buy stamps here"
+                    }
+                },
+                "question": "Can you buy stamps here?",
+                "render": "You can buy stamps from companies: {post_office:stamps}"
+            }
+        },
+        "title": {
+            "mappings": {
+                "0": {
+                    "then": "Post partner at a shop"
+                },
+                "1": {
+                    "then": "Post partner at {name}"
+                }
+            },
+            "render": "Post Office"
+        }
+    },
     "public_bookcase": {
         "description": "A streetside cabinet with books, accessible to anyone",
         "filter": {
diff --git a/langs/layers/es.json b/langs/layers/es.json
index 9f45a974af..2f909769b4 100644
--- a/langs/layers/es.json
+++ b/langs/layers/es.json
@@ -3000,6 +3000,17 @@
             }
         }
     },
+    "parcel_lockers": {
+        "filter": {
+            "0": {
+                "options": {
+                    "0": {
+                        "question": "Actualmente abierta"
+                    }
+                }
+            }
+        }
+    },
     "parking": {
         "description": "Una capa que muestra aparcamientos para coches",
         "name": "Aparcamiento",
@@ -3125,6 +3136,50 @@
             }
         }
     },
+    "postboxes": {
+        "description": "La capa que muestra buzones de correo.",
+        "name": "Buzones de correo",
+        "presets": {
+            "0": {
+                "title": "un buzón de correo"
+            }
+        },
+        "title": {
+            "render": "Buzón de correo"
+        }
+    },
+    "postoffices": {
+        "description": "Una capa que muestra oficinas de correo.",
+        "filter": {
+            "0": {
+                "options": {
+                    "0": {
+                        "question": "Actualmente abierta"
+                    }
+                }
+            }
+        },
+        "name": "Oficinas de correo",
+        "presets": {
+            "0": {
+                "title": "una oficina de correo"
+            }
+        },
+        "tagRenderings": {
+            "OH": {
+                "mappings": {
+                    "0": {
+                        "then": "Abierta 24/7 (incluyendo festivos)"
+                    }
+                },
+                "question": "¿Cuáles son las horas de apertura para esta oficina de correos?",
+                "render": "Horas de Apertura: {opening_hours_table()}"
+            }
+        },
+        "title": {
+            "render": "Oficina de Correo"
+        }
+    },
     "public_bookcase": {
         "filter": {
             "2": {
diff --git a/langs/layers/fr.json b/langs/layers/fr.json
index e9e10cb505..1fe3833d6b 100644
--- a/langs/layers/fr.json
+++ b/langs/layers/fr.json
@@ -3149,6 +3149,17 @@
             }
         }
     },
+    "parcel_lockers": {
+        "filter": {
+            "0": {
+                "options": {
+                    "0": {
+                        "question": "Ouvert actuellement"
+                    }
+                }
+            }
+        }
+    },
     "parking": {
         "description": "Un calque montrant les parkings",
         "name": "Lieu de stationnement",
@@ -3375,6 +3386,50 @@
             "render": "Aire de jeu"
         }
     },
+    "postboxes": {
+        "description": "Le calque montrant les boîtes à lettres.",
+        "name": "Boîtes à lettres",
+        "presets": {
+            "0": {
+                "title": "une boîte à lettres"
+            }
+        },
+        "title": {
+            "render": "Boîte à lettres"
+        }
+    },
+    "postoffices": {
+        "description": "Un claque montrant les bureaux de poste.",
+        "filter": {
+            "0": {
+                "options": {
+                    "0": {
+                        "question": "Ouvert actuellement"
+                    }
+                }
+            }
+        },
+        "name": "Bureaux de poste",
+        "presets": {
+            "0": {
+                "title": "un bureau de poste"
+            }
+        },
+        "tagRenderings": {
+            "OH": {
+                "mappings": {
+                    "0": {
+                        "then": "Ouvert 24h/24 (jours fériés compris)"
+                    }
+                },
+                "question": "Quelles sont les heures d’ouverture de ce bureau de poste ?",
+                "render": "Heures d’ouverture : {opening_hours_table()}"
+            }
+        },
+        "title": {
+            "render": "Bureau de poste"
+        }
+    },
     "public_bookcase": {
         "description": "Une armoire ou une boite contenant des livres en libre accès",
         "name": "Microbibliothèque",
diff --git a/langs/layers/hu.json b/langs/layers/hu.json
index 1e00fef507..c22c1e3847 100644
--- a/langs/layers/hu.json
+++ b/langs/layers/hu.json
@@ -607,6 +607,61 @@
             "render": "Hackerspace"
         }
     },
+    "parcel_lockers": {
+        "filter": {
+            "0": {
+                "options": {
+                    "0": {
+                        "question": "Most nyitva"
+                    }
+                }
+            }
+        }
+    },
+    "postboxes": {
+        "description": "A postaládákat megjelenítő réteg.",
+        "name": "Postaládák",
+        "presets": {
+            "0": {
+                "title": "postaláda"
+            }
+        },
+        "title": {
+            "render": "Postaláda"
+        }
+    },
+    "postoffices": {
+        "description": "Postákat megjelenítő réteg.",
+        "filter": {
+            "0": {
+                "options": {
+                    "0": {
+                        "question": "Most nyitva"
+                    }
+                }
+            }
+        },
+        "name": "Posták",
+        "presets": {
+            "0": {
+                "title": "Posta"
+            }
+        },
+        "tagRenderings": {
+            "OH": {
+                "mappings": {
+                    "0": {
+                        "then": "Éjjel-nappal nyitva (munkaszüneti napokon is)"
+                    }
+                },
+                "question": "Mikor van nyitva ez a posta?",
+                "render": "Nyitva tartás: {opening_hours_table()}"
+            }
+        },
+        "title": {
+            "render": "Posta"
+        }
+    },
     "public_bookcase": {
         "description": "Egy utcai szekrény könyvekkel, amelyet bárki használhat",
         "filter": {
diff --git a/langs/layers/id.json b/langs/layers/id.json
index 05147e9de0..eb67534e12 100644
--- a/langs/layers/id.json
+++ b/langs/layers/id.json
@@ -356,6 +356,17 @@
             }
         }
     },
+    "parcel_lockers": {
+        "filter": {
+            "0": {
+                "options": {
+                    "0": {
+                        "question": "Saat ini buka"
+                    }
+                }
+            }
+        }
+    },
     "playground": {
         "tagRenderings": {
             "playground-email": {
@@ -366,6 +377,50 @@
             }
         }
     },
+    "postboxes": {
+        "description": "Layer yang memperlihatkan kotak pos.",
+        "name": "Kotak pos",
+        "presets": {
+            "0": {
+                "title": "kotak pos"
+            }
+        },
+        "title": {
+            "render": "Kotak pos"
+        }
+    },
+    "postoffices": {
+        "description": "Layer yang menunjukkan kantor pos.",
+        "filter": {
+            "0": {
+                "options": {
+                    "0": {
+                        "question": "Saat ini buka"
+                    }
+                }
+            }
+        },
+        "name": "Kantor pos",
+        "presets": {
+            "0": {
+                "title": "Kantor Pos"
+            }
+        },
+        "tagRenderings": {
+            "OH": {
+                "mappings": {
+                    "0": {
+                        "then": "Buka 24 jam (termasuk hari libur)"
+                    }
+                },
+                "question": "Jam berapa kantor pos ini buka?",
+                "render": "Jam Buka: {opening_hours_table()}"
+            }
+        },
+        "title": {
+            "render": "Kantor Pos"
+        }
+    },
     "tree_node": {
         "presets": {
             "2": {
diff --git a/langs/layers/nb_NO.json b/langs/layers/nb_NO.json
index 5b9eb9320d..2d07f6cd48 100644
--- a/langs/layers/nb_NO.json
+++ b/langs/layers/nb_NO.json
@@ -341,6 +341,34 @@
             "render": "Brannhydrant"
         }
     },
+    "postboxes": {
+        "name": "Postbokser",
+        "title": {
+            "render": "Postboks"
+        }
+    },
+    "postoffices": {
+        "description": "Et lag som viser postkontor.",
+        "name": "Postkontor",
+        "presets": {
+            "0": {
+                "title": "et postkontor"
+            }
+        },
+        "tagRenderings": {
+            "OH": {
+                "mappings": {
+                    "0": {
+                        "then": "Døgnåpent (inkludert helligdager)"
+                    }
+                },
+                "render": "Åpningstider: {opening_hours_table()}"
+            }
+        },
+        "title": {
+            "render": "Postkontor"
+        }
+    },
     "windturbine": {
         "units": {
             "0": {
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index a3327973c4..f4cee6f2bb 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -4823,6 +4823,31 @@
             }
         }
     },
+    "parcel_lockers": {
+        "filter": {
+            "0": {
+                "options": {
+                    "0": {
+                        "question": "Momenteel geopend"
+                    }
+                }
+            }
+        },
+        "presets": {
+            "0": {
+                "title": "een pakketautomaat"
+            }
+        },
+        "tagRenderings": {
+            "brand": {
+                "mappings": {
+                    "3": {
+                        "then": "Dit is een PostNL pakketautomaat"
+                    }
+                }
+            }
+        }
+    },
     "parking": {
         "description": "Deze laag toont autoparkings",
         "name": "Parking",
@@ -5128,6 +5153,55 @@
             "render": "Speeltuin"
         }
     },
+    "postboxes": {
+        "description": "Deze laag toont brievenbussen.",
+        "name": "Brievenbussen",
+        "presets": {
+            "0": {
+                "title": "een brievenbus"
+            }
+        },
+        "title": {
+            "render": "Brievenbus"
+        }
+    },
+    "postoffices": {
+        "description": "Een laag die postkantoren toont.",
+        "filter": {
+            "0": {
+                "options": {
+                    "0": {
+                        "question": "Momenteel geopend"
+                    }
+                }
+            }
+        },
+        "name": "Postkantoren",
+        "presets": {
+            "0": {
+                "title": "een postkantoor"
+            }
+        },
+        "tagRenderings": {
+            "OH": {
+                "mappings": {
+                    "0": {
+                        "then": "24/7 open (ook tijdens feestdagen)"
+                    }
+                },
+                "question": "Wat zijn de openingsuren voor dit postkantoor?",
+                "render": "Openingsuren: {opening_hours_table()}"
+            }
+        },
+        "title": {
+            "mappings": {
+                "0": {
+                    "then": "Postpartner in een winkel"
+                }
+            },
+            "render": "Postkantoor"
+        }
+    },
     "public_bookcase": {
         "description": "Een straatkastje met boeken voor iedereen",
         "filter": {
diff --git a/langs/layers/ru.json b/langs/layers/ru.json
index 163beb679f..1fd003510b 100644
--- a/langs/layers/ru.json
+++ b/langs/layers/ru.json
@@ -1263,6 +1263,33 @@
             "render": "Детская площадка"
         }
     },
+    "postboxes": {
+        "name": "Почтовые ящики",
+        "presets": {
+            "0": {
+                "title": "почтовый ящик"
+            }
+        },
+        "title": {
+            "render": "Почтовый ящик"
+        }
+    },
+    "postoffices": {
+        "name": "Почтовые отделения",
+        "presets": {
+            "0": {
+                "title": "Почтовое отделение"
+            }
+        },
+        "tagRenderings": {
+            "OH": {
+                "render": "Часы работы: {opening_hours_table()}"
+            }
+        },
+        "title": {
+            "render": "Почтовое отделение"
+        }
+    },
     "public_bookcase": {
         "description": "Уличный шкаф с книгами, доступными для всех",
         "name": "Книжные шкафы",
diff --git a/langs/layers/zh_Hant.json b/langs/layers/zh_Hant.json
index f9a2f96070..f5c9071129 100644
--- a/langs/layers/zh_Hant.json
+++ b/langs/layers/zh_Hant.json
@@ -562,6 +562,61 @@
         "description": "顯示消防栓的地圖圖層。",
         "name": "消防栓地圖"
     },
+    "parcel_lockers": {
+        "filter": {
+            "0": {
+                "options": {
+                    "0": {
+                        "question": "目前開放"
+                    }
+                }
+            }
+        }
+    },
+    "postboxes": {
+        "description": "這圖層顯示郵筒。",
+        "name": "郵筒",
+        "presets": {
+            "0": {
+                "title": "郵筒"
+            }
+        },
+        "title": {
+            "render": "郵筒"
+        }
+    },
+    "postoffices": {
+        "description": "圖層顯示郵局。",
+        "filter": {
+            "0": {
+                "options": {
+                    "0": {
+                        "question": "目前開放"
+                    }
+                }
+            }
+        },
+        "name": "郵局",
+        "presets": {
+            "0": {
+                "title": "郵局"
+            }
+        },
+        "tagRenderings": {
+            "OH": {
+                "mappings": {
+                    "0": {
+                        "then": "24/7 開放 (包括假日)"
+                    }
+                },
+                "question": "這間郵局的開放時間是？",
+                "render": "開放時間：{opening_hours_table()}"
+            }
+        },
+        "title": {
+            "render": "郵局"
+        }
+    },
     "windturbine": {
         "name": "風機",
         "presets": {
diff --git a/langs/themes/ca.json b/langs/themes/ca.json
index 5d76fd9dcc..7a5ea1800d 100644
--- a/langs/themes/ca.json
+++ b/langs/themes/ca.json
@@ -419,41 +419,6 @@
         "shortDescription": "Codis postals",
         "title": "Codis postals"
     },
-    "postboxes": {
-        "layers": {
-            "0": {
-                "name": "Bústies",
-                "presets": {
-                    "0": {
-                        "title": "una bústia"
-                    }
-                },
-                "title": {
-                    "render": "Bústia"
-                }
-            },
-            "1": {
-                "filter": {
-                    "0": {
-                        "options": {
-                            "0": {
-                                "question": "Actualment obert"
-                            }
-                        }
-                    }
-                },
-                "name": "Oficines de correus",
-                "presets": {
-                    "0": {
-                        "title": "una oficina de correus"
-                    }
-                },
-                "title": {
-                    "render": "Oficina de correus"
-                }
-            }
-        }
-    },
     "shops": {
         "title": "Open Shop Map"
     },
diff --git a/langs/themes/de.json b/langs/themes/de.json
index 954a88dd29..e252d4646e 100644
--- a/langs/themes/de.json
+++ b/langs/themes/de.json
@@ -888,52 +888,6 @@
     },
     "postboxes": {
         "description": "Auf dieser Karte können Sie Daten von Poststellen und Briefkästen finden und ergänzen. Sie können diese Karte nutzen, um herauszufinden, wo Sie Ihre nächste Postkarte versenden können :)<br/>Haben Sie einen Fehler entdeckt oder fehlt ein Briefkasten? Sie können die Kartenddaten mit einem kostenlosen OpenStreetMap-Konto bearbeiten. ",
-        "layers": {
-            "0": {
-                "description": "Die Ebene zeigt Briefkästen.",
-                "name": "Briefkästen",
-                "presets": {
-                    "0": {
-                        "title": "ein Briefkasten"
-                    }
-                },
-                "title": {
-                    "render": "Briefkasten"
-                }
-            },
-            "1": {
-                "description": "Eine Ebene mit Postämtern.",
-                "filter": {
-                    "0": {
-                        "options": {
-                            "0": {
-                                "question": "Aktuell geöffnet"
-                            }
-                        }
-                    }
-                },
-                "name": "Poststellen",
-                "presets": {
-                    "0": {
-                        "title": "eine Poststelle"
-                    }
-                },
-                "tagRenderings": {
-                    "OH": {
-                        "mappings": {
-                            "0": {
-                                "then": "durchgehend geöffnet (auch an Feiertagen)"
-                            }
-                        },
-                        "question": "Wie sind die Öffnungszeiten dieser Poststelle?",
-                        "render": "Öffnungszeiten: {opening_hours_table()}"
-                    }
-                },
-                "title": {
-                    "render": "Poststelle"
-                }
-            }
-        },
         "shortDescription": "Eine Karte die Briefkästen und Poststellen anzeigt",
         "title": "Post- und Briefkastenkarte"
     },
diff --git a/langs/themes/en.json b/langs/themes/en.json
index b69461ddd5..f12db62b57 100644
--- a/langs/themes/en.json
+++ b/langs/themes/en.json
@@ -889,48 +889,22 @@
     "postboxes": {
         "description": "On this map you can find and add data of post offices and post boxes. You can use this map to find where you can mail your next postcard! :)<br/>Spotted an error or is a post box missing? You can edit this map with a free OpenStreetMap account. ",
         "layers": {
-            "0": {
-                "description": "The layer showing postboxes.",
-                "name": "Postboxes",
-                "presets": {
-                    "0": {
-                        "title": "a postbox"
-                    }
-                },
-                "title": {
-                    "render": "Postbox"
-                }
-            },
-            "1": {
-                "description": "A layer showing post offices.",
-                "filter": {
-                    "0": {
-                        "options": {
-                            "0": {
-                                "question": "Currently open"
-                            }
+            "3": {
+                "override": {
+                    "+tagRenderings": {
+                        "0": {
+                            "mappings": {
+                                "0": {
+                                    "then": "This shop is a post partner"
+                                },
+                                "1": {
+                                    "then": "This shop is not a post partner"
+                                }
+                            },
+                            "question": "Is this shop a post partner?"
                         }
-                    }
-                },
-                "name": "Post offices",
-                "presets": {
-                    "0": {
-                        "title": "a post office"
-                    }
-                },
-                "tagRenderings": {
-                    "OH": {
-                        "mappings": {
-                            "0": {
-                                "then": "24/7 opened (including holidays)"
-                            }
-                        },
-                        "question": "What are the opening hours for this post office?",
-                        "render": "Opening Hours: {opening_hours_table()}"
-                    }
-                },
-                "title": {
-                    "render": "Post Office"
+                    },
+                    "description": "Add a new post partner to the map in an existing shop"
                 }
             }
         },
diff --git a/langs/themes/es.json b/langs/themes/es.json
index 8bdf326551..dbafd095b4 100644
--- a/langs/themes/es.json
+++ b/langs/themes/es.json
@@ -549,52 +549,6 @@
     },
     "postboxes": {
         "description": "En este mapa puedes encontrar y añadir datos de oficinas de correo y buzones de correo. ¡Puedes utilizar este mapa para encontrar donde puedes enviar tu próxima postal! :)<br/>¿Has encontrado un error o algo que falta? Puedes editar este mapa con una cuenta de OpenStreetMap gratuíta. ",
-        "layers": {
-            "0": {
-                "description": "La capa que muestra buzones de correo.",
-                "name": "Buzones de correo",
-                "presets": {
-                    "0": {
-                        "title": "un buzón de correo"
-                    }
-                },
-                "title": {
-                    "render": "Buzón de correo"
-                }
-            },
-            "1": {
-                "description": "Una capa que muestra oficinas de correo.",
-                "filter": {
-                    "0": {
-                        "options": {
-                            "0": {
-                                "question": "Actualmente abierta"
-                            }
-                        }
-                    }
-                },
-                "name": "Oficinas de correo",
-                "presets": {
-                    "0": {
-                        "title": "una oficina de correo"
-                    }
-                },
-                "tagRenderings": {
-                    "OH": {
-                        "mappings": {
-                            "0": {
-                                "then": "Abierta 24/7 (incluyendo festivos)"
-                            }
-                        },
-                        "question": "¿Cuáles son las horas de apertura para esta oficina de correos?",
-                        "render": "Horas de Apertura: {opening_hours_table()}"
-                    }
-                },
-                "title": {
-                    "render": "Oficina de Correo"
-                }
-            }
-        },
         "shortDescription": "Un mapa que muestra buzones y oficinas de correo"
     },
     "shops": {
diff --git a/langs/themes/fr.json b/langs/themes/fr.json
index ebad670047..db3beace12 100644
--- a/langs/themes/fr.json
+++ b/langs/themes/fr.json
@@ -888,52 +888,6 @@
     },
     "postboxes": {
         "description": "Trouvez et ajoutez des bureaux de poste et boîtes à lettres sur cette carte. Utilisez cette carte où vous pouvez envoyer vos cartes postales ! :)<br/>Vous avez trouvez une erreur ou une boîte à lettres est manquante ? Vous pouvez modifier cette carte avec un compte OpenStreetMap gratuit. ",
-        "layers": {
-            "0": {
-                "description": "Le calque montrant les boîtes à lettres.",
-                "name": "Boîtes à lettres",
-                "presets": {
-                    "0": {
-                        "title": "une boîte à lettres"
-                    }
-                },
-                "title": {
-                    "render": "Boîte à lettres"
-                }
-            },
-            "1": {
-                "description": "Un claque montrant les bureaux de poste.",
-                "filter": {
-                    "0": {
-                        "options": {
-                            "0": {
-                                "question": "Ouvert actuellement"
-                            }
-                        }
-                    }
-                },
-                "name": "Bureaux de poste",
-                "presets": {
-                    "0": {
-                        "title": "un bureau de poste"
-                    }
-                },
-                "tagRenderings": {
-                    "OH": {
-                        "mappings": {
-                            "0": {
-                                "then": "Ouvert 24h/24 (jours fériés compris)"
-                            }
-                        },
-                        "question": "Quelles sont les heures d’ouverture de ce bureau de poste ?",
-                        "render": "Heures d’ouverture : {opening_hours_table()}"
-                    }
-                },
-                "title": {
-                    "render": "Bureau de poste"
-                }
-            }
-        },
         "shortDescription": "Une carte des bureaux de poste et des boîtes à lettres",
         "title": "Carte des Bureaux de Poste et Boîtes à Lettres"
     },
diff --git a/langs/themes/hu.json b/langs/themes/hu.json
index 964fde035e..a4f0c96533 100644
--- a/langs/themes/hu.json
+++ b/langs/themes/hu.json
@@ -345,52 +345,6 @@
     },
     "postboxes": {
         "description": "Ezen a térképen postahivatalok és postaládák adatait találod és egészítheted ki. Utánanézhetsz, hogy hol adhatod fel a következő képeslapodat! :)<br/>Hibát találtál, vagy hiányzik egy postaláda? Ezt a térképet mindössze egy ingyenes OpenStreetMap-fiókkal szerkesztheted. ",
-        "layers": {
-            "0": {
-                "description": "A postaládákat megjelenítő réteg.",
-                "name": "Postaládák",
-                "presets": {
-                    "0": {
-                        "title": "postaláda"
-                    }
-                },
-                "title": {
-                    "render": "Postaláda"
-                }
-            },
-            "1": {
-                "description": "Postákat megjelenítő réteg.",
-                "filter": {
-                    "0": {
-                        "options": {
-                            "0": {
-                                "question": "Most nyitva"
-                            }
-                        }
-                    }
-                },
-                "name": "Posták",
-                "presets": {
-                    "0": {
-                        "title": "Posta"
-                    }
-                },
-                "tagRenderings": {
-                    "OH": {
-                        "mappings": {
-                            "0": {
-                                "then": "Éjjel-nappal nyitva (munkaszüneti napokon is)"
-                            }
-                        },
-                        "question": "Mikor van nyitva ez a posta?",
-                        "render": "Nyitva tartás: {opening_hours_table()}"
-                    }
-                },
-                "title": {
-                    "render": "Posta"
-                }
-            }
-        },
         "shortDescription": "Posták és postaládák térképe",
         "title": "Posta- és postaládatérkép"
     },
diff --git a/langs/themes/id.json b/langs/themes/id.json
index addb208509..abc60c194f 100644
--- a/langs/themes/id.json
+++ b/langs/themes/id.json
@@ -148,54 +148,6 @@
         "shortDescription": "Kode pos",
         "title": "Kode pos"
     },
-    "postboxes": {
-        "layers": {
-            "0": {
-                "description": "Layer yang memperlihatkan kotak pos.",
-                "name": "Kotak pos",
-                "presets": {
-                    "0": {
-                        "title": "kotak pos"
-                    }
-                },
-                "title": {
-                    "render": "Kotak pos"
-                }
-            },
-            "1": {
-                "description": "Layer yang menunjukkan kantor pos.",
-                "filter": {
-                    "0": {
-                        "options": {
-                            "0": {
-                                "question": "Saat ini buka"
-                            }
-                        }
-                    }
-                },
-                "name": "Kantor pos",
-                "presets": {
-                    "0": {
-                        "title": "Kantor Pos"
-                    }
-                },
-                "tagRenderings": {
-                    "OH": {
-                        "mappings": {
-                            "0": {
-                                "then": "Buka 24 jam (termasuk hari libur)"
-                            }
-                        },
-                        "question": "Jam berapa kantor pos ini buka?",
-                        "render": "Jam Buka: {opening_hours_table()}"
-                    }
-                },
-                "title": {
-                    "render": "Kantor Pos"
-                }
-            }
-        }
-    },
     "trees": {
         "title": "Pohon"
     },
diff --git a/langs/themes/nb_NO.json b/langs/themes/nb_NO.json
index c1f49dafc1..a48b38175f 100644
--- a/langs/themes/nb_NO.json
+++ b/langs/themes/nb_NO.json
@@ -443,36 +443,6 @@
         "title": "Postkoder"
     },
     "postboxes": {
-        "layers": {
-            "0": {
-                "name": "Postbokser",
-                "title": {
-                    "render": "Postboks"
-                }
-            },
-            "1": {
-                "description": "Et lag som viser postkontor.",
-                "name": "Postkontor",
-                "presets": {
-                    "0": {
-                        "title": "et postkontor"
-                    }
-                },
-                "tagRenderings": {
-                    "OH": {
-                        "mappings": {
-                            "0": {
-                                "then": "Døgnåpent (inkludert helligdager)"
-                            }
-                        },
-                        "render": "Åpningstider: {opening_hours_table()}"
-                    }
-                },
-                "title": {
-                    "render": "Postkontor"
-                }
-            }
-        },
         "shortDescription": "Postbokser og postkontor",
         "title": "Postboks og postkontor-kart"
     },
diff --git a/langs/themes/nl.json b/langs/themes/nl.json
index f35622a8a8..3e6c0b505c 100644
--- a/langs/themes/nl.json
+++ b/langs/themes/nl.json
@@ -931,52 +931,6 @@
     },
     "postboxes": {
         "description": "Op deze kaart kan je informatie over brievenbussen en postkantoren vinden en toevoegen. Je kan deze kaart gebruiken om te achterhalen waar je je volgende postkaart naar kan sturen! :)<br/>Zie je een fout of ontbreekt een brievenbus? Dan kan je deze kaart aanpassen met een gratis OpenStreetMap account. ",
-        "layers": {
-            "0": {
-                "description": "Deze laag toont brievenbussen.",
-                "name": "Brievenbussen",
-                "presets": {
-                    "0": {
-                        "title": "een brievenbus"
-                    }
-                },
-                "title": {
-                    "render": "Brievenbus"
-                }
-            },
-            "1": {
-                "description": "Een laag die postkantoren toont.",
-                "filter": {
-                    "0": {
-                        "options": {
-                            "0": {
-                                "question": "Momenteel geopend"
-                            }
-                        }
-                    }
-                },
-                "name": "Postkantoren",
-                "presets": {
-                    "0": {
-                        "title": "een postkantoor"
-                    }
-                },
-                "tagRenderings": {
-                    "OH": {
-                        "mappings": {
-                            "0": {
-                                "then": "24/7 open (ook tijdens feestdagen)"
-                            }
-                        },
-                        "question": "Wat zijn de openingsuren voor dit postkantoor?",
-                        "render": "Openingsuren: {opening_hours_table()}"
-                    }
-                },
-                "title": {
-                    "render": "Postkantoor"
-                }
-            }
-        },
         "shortDescription": "Een kaart die brievenbussen en postkantoren toont",
         "title": "Brievenbussen en postkantoren"
     },
diff --git a/langs/themes/ru.json b/langs/themes/ru.json
index edb9275b2a..30d3aa4969 100644
--- a/langs/themes/ru.json
+++ b/langs/themes/ru.json
@@ -341,37 +341,6 @@
         "shortDescription": "Карта игровых площадок",
         "title": "Игровые площадки"
     },
-    "postboxes": {
-        "layers": {
-            "0": {
-                "name": "Почтовые ящики",
-                "presets": {
-                    "0": {
-                        "title": "почтовый ящик"
-                    }
-                },
-                "title": {
-                    "render": "Почтовый ящик"
-                }
-            },
-            "1": {
-                "name": "Почтовые отделения",
-                "presets": {
-                    "0": {
-                        "title": "Почтовое отделение"
-                    }
-                },
-                "tagRenderings": {
-                    "OH": {
-                        "render": "Часы работы: {opening_hours_table()}"
-                    }
-                },
-                "title": {
-                    "render": "Почтовое отделение"
-                }
-            }
-        }
-    },
     "shops": {
         "title": "Открыть карту магазинов"
     },
diff --git a/langs/themes/zh_Hant.json b/langs/themes/zh_Hant.json
index dee090b865..2f1b6683e5 100644
--- a/langs/themes/zh_Hant.json
+++ b/langs/themes/zh_Hant.json
@@ -370,52 +370,6 @@
     },
     "postboxes": {
         "description": "在這份地圖你能找到與新增有關郵局與郵筒的資料，你可以用這份地圖找到寄送您下張明信片的地方！:)<br/>發現錯誤或是有郵筒遺漏嗎？你可以用免費的開放街圖帳號來編輯。 ",
-        "layers": {
-            "0": {
-                "description": "這圖層顯示郵筒。",
-                "name": "郵筒",
-                "presets": {
-                    "0": {
-                        "title": "郵筒"
-                    }
-                },
-                "title": {
-                    "render": "郵筒"
-                }
-            },
-            "1": {
-                "description": "圖層顯示郵局。",
-                "filter": {
-                    "0": {
-                        "options": {
-                            "0": {
-                                "question": "目前開放"
-                            }
-                        }
-                    }
-                },
-                "name": "郵局",
-                "presets": {
-                    "0": {
-                        "title": "郵局"
-                    }
-                },
-                "tagRenderings": {
-                    "OH": {
-                        "mappings": {
-                            "0": {
-                                "then": "24/7 開放 (包括假日)"
-                            }
-                        },
-                        "question": "這間郵局的開放時間是？",
-                        "render": "開放時間：{opening_hours_table()}"
-                    }
-                },
-                "title": {
-                    "render": "郵局"
-                }
-            }
-        },
         "shortDescription": "顯示郵筒與郵局的地圖",
         "title": "郵筒與郵局地圖"
     },