diff --git a/assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json b/assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json
deleted file mode 100644
index 01effe096..000000000
--- a/assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json
+++ /dev/null
@@ -1,470 +0,0 @@
-{
-  "id": "bicycle_tube_vending_machine",
-  "name": {
-    "en": "Bicycle tube vending machine",
-    "nl": "Fietsbanden-verkoopsautomaat",
-    "fr": "Distributeur automatique de chambre à air de vélo",
-    "it": "Distributore automatico di camere d’aria per bici",
-    "de": "Automat für Fahrradschläuche",
-    "ru": "Торговый автомат для велосипедистов",
-    "zh_Hant": "自行車內胎自動售貨機",
-    "pt_BR": "Máquina de venda automática de tubos de bicicleta",
-    "pt": "Máquina de venda automática de tubos de bicicleta",
-    "da": "Automat til salg af cykelslanger",
-    "cs": "Automat na cyklistické duše",
-    "ca": "Màquina expenedora de tubs de bicicleta",
-    "es": "Máquina expendedora de tubos de bicicleta"
-  },
-  "description": {
-    "en": "A layer showing vending machines for bicycle tubes (either purpose-built bicycle tube vending machines or classical vending machines with bicycle tubes and optionally additional bicycle related objects such as lights, gloves, locks, …)",
-    "nl": "Een laag met verkoopsautomaten met binnenbanden voor fietsen (dit kan een automaat zijn met énkel fietsbanden, of een gewone automaat met fietsbanden en andere fietsaccessoires zoals lichten, handschoenen, sloten,...)",
-    "de": "Eine Ebene mit Automaten für Fahrradschläuche (entweder spezielle Fahrradschlauch-Automaten oder klassische Automaten mit Fahrradschläuchen und optional zusätzlichen fahrradbezogenen Gegenständen wie Lampen, Handschuhe, Schlösser, …)",
-    "da": "Et lag med automater til cykelslanger (enten specialbyggede cykelslangeautomater eller klassiske automater med cykelslanger og eventuelt andre cykelrelaterede genstande som f.eks. lys, handsker, låse, o.s.v)",
-    "fr": "Une couche affichant des distributeurs automatiques de chambre à air (que ce soit des distributeurs conçus spécifiquement pour les chambres à air ou des distributeurs classiques incluant des chambres à air ainsi des objets apparentés tels que de l'éclairage pour vélo, des gants, des cadenas, ...)",
-    "cs": "Vrstva zobrazující automaty na cyklistické duše (buď speciální automaty na cyklistické duše, nebo klasické automaty s cyklistickými dušemi a případně dalšími předměty souvisejícími s jízdními koly, jako jsou světla, rukavice, zámky, ...)",
-    "ca": "Una capa que mostra màquines expenedores per a tubs de bicicleta (ja siguin màquines expenedores de tubs de bicicleta o màquines expenedores clàssiques amb tubs de bicicleta i opcionalment objectes addicionals relacionats amb la bicicleta com ara llums, guants, panys, ...)",
-    "pt_BR": "Uma camada que mostra máquinas de venda de câmaras de ar de bicicleta (sejam máquinas de venda de câmaras de ar de bicicleta específicas ou máquinas de venda clássicas com câmaras de ar de bicicleta e opcionalmente objetos relacionados a bicicletas, como luzes, luvas, travas, ...)",
-    "es": "Una capa que muestra máquinas expendedoras de cámaras de bicicleta (ya sean máquinas expendedoras de cámaras de bicicleta especialmente diseñadas o máquinas expendedoras clásicas con cámaras de bicicleta y, opcionalmente, objetos adicionales relacionados con la bicicleta, como luces, guantes, candados, etc.)",
-    "pt": "Uma camada que mostra máquinas de venda de câmaras de ar de bicicleta (sejam máquinas de venda de câmaras de ar de bicicleta específicas ou máquinas de venda clássicas com câmaras de ar de bicicleta e opcionalmente objetos relacionados a bicicletas, como luzes, luvas, travas, ...)"
-  },
-  "source": {
-    "osmTags": {
-      "and": [
-        "amenity=vending_machine",
-        "vending~.*bicycle_tube.*"
-      ]
-    }
-  },
-  "minzoom": 13,
-  "title": {
-    "render": {
-      "en": "Bicycle tube vending machine",
-      "nl": "Fietsbanden-verkoopautomaat",
-      "fr": "Distributeur automatique de chambre à air de vélo",
-      "it": "Distributore automatico di camere d’aria per bici",
-      "de": "Fahrradschlauch-Automat",
-      "ru": "Торговый автомат для велосипедистов",
-      "zh_Hant": "自行車內胎自動售貨機",
-      "pt_BR": "Máquina de venda automática de tubos de bicicleta",
-      "pt": "Máquina de venda automática de tubos de bicicleta",
-      "da": "Automat til salg af cykelslanger",
-      "cs": "Automat na cyklistické duše",
-      "ca": "Màquina expenedora de tubs de bicicleta"
-    },
-    "mappings": [
-      {
-        "if": "name~*",
-        "then": {
-          "en": "Bicycle tube vending machine {name}",
-          "ca": "Màquina expenedora de cambres d'aire de bicicletes {name}",
-          "de": "{name} Fahrradschlauch-Automat",
-          "cs": "Automat na cyklistické pláště{name}",
-          "nl": "Fietsbanden-verkoopautomaat {name}",
-          "pt_BR": "Máquina de venda de câmara de ar para bicicleta {name}",
-          "es": "Máquina expendedora de cámaras de bicicleta {name}",
-          "pt": "Máquina de venda de câmara de ar para bicicleta {name}"
-        }
-      }
-    ]
-  },
-  "titleIcons": [
-    {
-      "render": "<a href='https://fietsambassade.gent.be/' target='_blank'><img src='./assets/themes/cyclofix/fietsambassade_gent_logo_small.svg'/></a>",
-      "condition": "operator=De Fietsambassade Gent"
-    },
-    "icons.defaults"
-  ],
-  "pointRendering": [
-    {
-      "iconBadges": [
-        {
-          "if": {
-            "or": [
-              "operational_status=broken",
-              "operational_status=closed"
-            ]
-          },
-          "then": "close:#c33"
-        }
-      ],
-      "iconSize": "50,50",
-      "location": [
-        "point",
-        "centroid"
-      ],
-      "anchor": "bottom",
-      "marker": [
-        {
-          "icon": "pin",
-          "color": "#ffffff"
-        },
-        {
-          "icon": "./assets/layers/bicycle_tube_vending_machine/pinIcon.svg"
-        }
-      ]
-    }
-  ],
-  "lineRendering": [
-    {
-      "color": "#6bc4f7"
-    }
-  ],
-  "presets": [
-    {
-      "title": {
-        "en": "a bicycle tube vending machine",
-        "nl": "een fietsbanden-verkoopsautomaat",
-        "fr": "une distributeur automatique de chambre à air de vélo",
-        "it": "una distributore automatico di camere d’aria per bici",
-        "de": "einen Fahrradschlauch-Automaten",
-        "ru": "Торговый автомат для велосипедистов",
-        "zh_Hant": "自行車內胎自動售貨機",
-        "pt_BR": "uma máquina de venda automática de tubos de bicicleta",
-        "pt": "uma máquina de venda automática de tubos de bicicleta",
-        "da": "en automat til salg af cykelslanger",
-        "cs": "automat na cyklistické duše",
-        "ca": "una màquina expenedora de tubs de bicicleta",
-        "es": "una máquina expendedora de tubos de bicicleta"
-      },
-      "tags": [
-        "amenity=vending_machine",
-        "vending=bicycle_tube"
-      ]
-    }
-  ],
-  "tagRenderings": [
-    "images",
-    {
-      "question": {
-        "en": "Is this vending machine still operational?",
-        "nl": "Is deze verkoopsautomaat nog steeds werkende?",
-        "fr": "Cette machine est-elle encore opérationelle ?",
-        "it": "Questo distributore automatico funziona ancora?",
-        "ru": "Этот торговый автомат все еще работает?",
-        "de": "Ist dieser Automat in Betrieb?",
-        "zh_Hant": "這個自動販賣機仍有運作嗎？",
-        "pt_BR": "Esta máquina de venda automática ainda está operacional?",
-        "pt": "Esta máquina de venda automática ainda está operacional?",
-        "es": "¿Todavía funciona esta máquina expendedora?",
-        "da": "Er denne salgsautomat stadig i drift?",
-        "cs": "Je tento automat stále v provozu?",
-        "ca": "Aquesta màquina expenedora encara funciona?"
-      },
-      "render": {
-        "en": "The operational status is <i>{operational_status}</i>",
-        "nl": "Deze verkoopsautomaat is <i>{operational_status}</i>",
-        "fr": "L'état opérationnel est <i>{operational_status}</i>",
-        "it": "Lo stato operativo è <i>{operational_status}</i>",
-        "de": "Der Betriebszustand ist <i>{operational_status}</i>",
-        "ru": "Рабочий статус: <i> {operational_status}</i>",
-        "zh_Hant": "運作狀態是 <i>{operational_status}</i>",
-        "pt_BR": "O estado operacional é: <i>{operational_status}</i>",
-        "pt": "O estado operacional é: <i>{operational_status}</i>",
-        "es": "El estado operacional es <i>{operational_status}</i>",
-        "da": "Driftsstatus er <i>{operational_status}</i>",
-        "cs": "Provozní stav je <i>{operational_status}</i>",
-        "ca": "L'estat operatiu és <i>{operational_status}</i>"
-      },
-      "freeform": {
-        "key": "operational_status"
-      },
-      "mappings": [
-        {
-          "if": "operational_status=",
-          "then": {
-            "en": "This vending machine works",
-            "nl": "Deze verkoopsautomaat werkt",
-            "fr": "Le distributeur automatique fonctionne",
-            "hu": "Ez az automata működik",
-            "it": "Il distributore automatico funziona",
-            "ru": "Этот торговый автомат работает",
-            "zh_Hans": "这个借还机正常工作",
-            "de": "Dieser Automat ist in Betrieb",
-            "zh_Hant": "這個自動販賣機仍運作",
-            "pt_BR": "Esta máquina de venda automática funciona",
-            "pt": "Esta máquina de venda automática funciona",
-            "da": "Denne salgsautomat virker",
-            "es": "Esta máquina expendedora funciona",
-            "cs": "Tento prodejní automat funguje",
-            "ca": "Aquesta màquina expenedora funciona"
-          }
-        },
-        {
-          "if": "operational_status=broken",
-          "then": {
-            "en": "This vending machine is broken",
-            "nl": "Deze verkoopsautomaat is kapot",
-            "fr": "Le distributeur automatique est en panne",
-            "hu": "Ez az automata elromlott",
-            "it": "Il distributore automatico è guasto",
-            "ru": "Этот торговый автомат сломан",
-            "zh_Hans": "这个借还机已经损坏",
-            "de": "Dieser Automat ist kaputt",
-            "zh_Hant": "這個自動販賣機沒有運作了",
-            "pt_BR": "Esta máquina de venda automática está quebrada",
-            "pt": "Esta máquina de venda automática está quebrada",
-            "es": "Esta máquina exprendedora está rota",
-            "da": "Denne salgsautomat er i stykker",
-            "cs": "Tento prodejní automat je rozbitý",
-            "ca": "Aquesta màquina expenedora està trencada"
-          }
-        },
-        {
-          "if": "operational_status=closed",
-          "then": {
-            "en": "This vending machine is closed",
-            "nl": "Deze verkoopsautomaat is uitgeschakeld",
-            "fr": "Le distributeur automatique est fermé",
-            "hu": "Ez az automata zárva van",
-            "it": "Il distributore automatico è spento",
-            "ru": "Этот торговый автомат закрыт",
-            "zh_Hans": "这个借还机被关闭了",
-            "de": "Dieser Automat ist geschlossen",
-            "zh_Hant": "這個自動販賣機已經關閉了",
-            "pt_BR": "Esta máquina de venda automática está fechada",
-            "pt": "Esta máquina de venda automática está fechada",
-            "es": "Esta máquina exprendedora está cerrada",
-            "da": "Denne salgsautomat er lukket",
-            "cs": "Tento prodejní automat je uzavřen",
-            "ca": "Aquesta màquina expenedora està tancada"
-          }
-        }
-      ],
-      "id": "Still in use?"
-    },
-    {
-      "question": {
-        "en": "How much does a bicycle tube cost?",
-        "ca": "Quant costa una cambra d'aire de bicicleta?",
-        "de": "Wie viel kostet ein Fahrradschlauch?",
-        "cs": "Kolik stojí duše na kolo?",
-        "nl": "Hoeveel kost een fietsband?",
-        "pt_BR": "Quanto custa uma câmara de ar para bicicleta?",
-        "es": "¿Cuánto cuesta una cámara para la bicicleta?",
-        "pt": "Quanto custa uma câmara de ar para bicicleta?"
-      },
-      "render": {
-        "en": "A bicycle tube costs {charge}",
-        "ca": "Una cambra d'aire de bicicleta costa {charge}",
-        "de": "Ein Fahrradschlauch kostet {charge}",
-        "cs": "Cena jedné duše {charge}",
-        "nl": "Een fietsband kost {charge}",
-        "pt_BR": "Uma câmara de ar para bicicleta custa {charge}",
-        "es": "Una cámara para bicicletas cuesta {charge}",
-        "pt": "Uma câmara de ar para bicicleta custa {charge}"
-      },
-      "freeform": {
-        "key": "charge"
-      },
-      "id": "bicycle_tube_vending_machine-charge"
-    },
-    "payment-options-split",
-    {
-      "question": {
-        "en": "Which brand of tubes are sold here?",
-        "ca": "Quines marques de cambres d'aire es venen aquí?",
-        "de": "Welche Fahrradschläuche werden hier verkauft?",
-        "cs": "Jaká značka duší je zde prodávána?",
-        "nl": "Welk merk banden wordt hier verkocht?",
-        "pt_BR": "Quais marcas de câmara de ar são vendidas aqui?",
-        "es": "¿Qué cámaras se venden aquí?",
-        "pt": "Quais marcas de câmara de ar são vendidas aqui?"
-      },
-      "freeform": {
-        "key": "brand"
-      },
-      "render": {
-        "en": "{brand} tubes are sold here",
-        "ca": "Aquí es venen cambres d'aire {brand}",
-        "de": "Hier werden Fahrradschläuche von {brand} verkauft",
-        "cs": "{brand} duše jsou zde prodávány",
-        "nl": "{brand} banden worden hier verkocht",
-        "pt_BR": "câmaras de ar {brand} são vendidas aqui",
-        "es": "Las cámaras {brand} se venden aquí",
-        "pt": "câmaras de ar {brand} são vendidas aqui"
-      },
-      "mappings": [
-        {
-          "if": "brand=Continental",
-          "then": {
-            "en": "Continental tubes are sold here",
-            "ca": "Aquí es venen cambres d'aire Continental",
-            "de": "Hier werden Fahrradschläuche von Continental verkauft",
-            "cs": "Continental duše jsou zde prodávány",
-            "nl": "Continental banden worden hier verkocht",
-            "pt_BR": "Câmaras de ar Continental são vendidas aqui",
-            "es": "Las cámaras Continental se venden aquí",
-            "pt": "Câmaras de ar Continental são vendidas aqui"
-          }
-        },
-        {
-          "if": "brand=Schwalbe",
-          "then": {
-            "en": "Schwalbe tubes are sold here",
-            "ca": "Aquí es venen cambres d'aire Schwalbe",
-            "de": "Hier werden Fahrradschläuche von Schwalbe verkauft",
-            "cs": "Schwalbe duše jsou zde prodávány",
-            "nl": "Schwalbe banden worden hier verkocht",
-            "pt_BR": "Câmaras de ar Schwalbe são vendidas aqui",
-            "es": "Las cámaras Schwalbe se venden aquí",
-            "pt": "Câmaras de ar Schwalbe são vendidas aqui"
-          }
-        }
-      ],
-      "multiAnswer": true,
-      "id": "bicycle_tube_vending_machine-brand"
-    },
-    {
-      "question": {
-        "en": "Who maintains this vending machine?",
-        "ca": "Qui manté aquesta màquina expenedora?",
-        "de": "Wer betreibt den Automaten?",
-        "cs": "Kdo se stará o tento automat?",
-        "nl": "Wie onderhoudt deze verkoopautomaat?",
-        "pt_BR": "Quem mantém essa máquina de venda?",
-        "es": "¿Quién mantiene esta máquina expendedora?",
-        "pt": "Quem mantém esta máquina de venda?"
-      },
-      "render": "This vending machine is maintained by {operator}",
-      "mappings": [
-        {
-          "if": "operator=Schwalbe",
-          "then": {
-            "en": "Maintained by Schwalbe",
-            "ca": "Mantés per Schwalbe",
-            "de": "Betrieben von Schwalbe",
-            "cs": "Udržuje Schwalbe",
-            "nl": "Onderhouden door Schwalbe",
-            "pt_BR": "Mantido pela Schwalbe",
-            "es": "Mantenido por Schwalbe",
-            "pt": "Mantido pela Schwalbe"
-          }
-        },
-        {
-          "if": "operator=Continental",
-          "then": {
-            "en": "Maintained by Continental",
-            "ca": "Mantés per Continental",
-            "de": "Betrieben von Continental",
-            "cs": "Udržuje Continental",
-            "nl": "Onderhouden door Continental",
-            "pt_BR": "Mantido pela Continental",
-            "es": "Mantenido por Continental",
-            "pt": "Mantido pela Continental"
-          }
-        }
-      ],
-      "freeform": {
-        "key": "operator"
-      },
-      "id": "bicycle_tube_vending_machine-operator"
-    },
-    {
-      "id": "other-items-vending",
-      "question": {
-        "en": "Are other biycle accessories sold here?",
-        "ca": "Es venen altres accessoris per a bicicletes aquí?",
-        "de": "Wird weiteres Fahrradzubehör verkauft?",
-        "cs": "Prodávají se zde další doplňky na kolo?",
-        "nl": "Worden hier andere fietsaccessoires verkocht?",
-        "pt_BR": "Outros acessórios para bicicleta são vendidos aqui?",
-        "es": "¿Se venden aquí otros accesorios para bicicletas?",
-        "pt": "Outros acessórios para bicicleta são vendidos aqui?"
-      },
-      "mappings": [
-        {
-          "if": "vending=bicycle_tube",
-          "then": {
-            "en": "Bicycle inner tubes are sold here",
-            "nl": "Fietsbinnenbanden worden hier verkocht",
-            "ca": "Aquí es venen cambres d'aire de bicicletes",
-            "de": "Hier werden Fahrradschläuche verkauft",
-            "cs": "Zde se prodávají cyklistické duše",
-            "pt_BR": "Câmaras de ar para bicicletas são vendidas aqui",
-            "es": "Aquí se venden cámaras de aire para bicicletas",
-            "pt": "Câmaras de ar para bicicletas são vendidas aqui"
-          }
-        },
-        {
-          "if": "vending=bicycle_light",
-          "then": {
-            "en": "Bicycle lights are sold here",
-            "nl": "Fietslampjes worden hier verkocht",
-            "ca": "Aquí es venen llums per a bicicletes",
-            "de": "Hier werden Fahrradlampen verkauft",
-            "cs": "Zde se prodávají světla na jízdní kola",
-            "pt_BR": "Luzes para bicicleta são vendidas aqui",
-            "es": "Las luces para bicicletas se venden aquí",
-            "pt": "Luzes para bicicleta são vendidas aqui"
-          }
-        },
-        {
-          "if": "vending=gloves",
-          "then": {
-            "en": "Gloves are sold here",
-            "nl": "Handschoenen worden hier verkocht",
-            "ca": "Aquí es venen guants",
-            "de": "Hier werden Fahrradhandschuhe verkauft",
-            "cs": "Prodávají se zde rukavice",
-            "pt_BR": "Luvas são vendidas aqui",
-            "es": "Los guantes se venden aquí",
-            "pt": "Luvas são vendidas aqui"
-          }
-        },
-        {
-          "if": "vending=bicycle_repair_kit",
-          "then": {
-            "en": "Bicycle repair kits are sold here",
-            "nl": "Fietsreparatiesets worden hier verkocht",
-            "ca": "Aquí es venen kits de reparació de bicicletes",
-            "de": "Hier werden Fahrrad-Reparatursets verkauft",
-            "cs": "Zde se prodávají sady na opravu jízdních kol",
-            "pt_BR": "Kits para reparo de bicicleta são vendidos aqui",
-            "es": "Los kits de reparación de bicicletas se venden aquí",
-            "pt": "Kits para reparo de bicicleta são vendidos aqui"
-          }
-        },
-        {
-          "if": "vending=bicycle_pump",
-          "then": {
-            "en": "Bicycle pumps are sold here",
-            "nl": "Fietspompen worden hier verkocht",
-            "ca": "Aquí es venen bombes de bicicletes",
-            "de": "Hier werden Fahrradpumpen verkauft",
-            "cs": "Prodávají se zde pumpy na kolo",
-            "pt_BR": "Bombas de ar para bicicleta são vendidas aqui",
-            "es": "Las bombas para bicicletas se venden aquí",
-            "pt": "Bombas de ar para bicicleta são vendidas aqui"
-          }
-        },
-        {
-          "if": "vending=bicycle_lock",
-          "then": {
-            "en": "Bicycle locks are sold here",
-            "nl": "Fietssloten worden hier verkocht",
-            "ca": "Aquí es venen cadenats per a bicicletes",
-            "de": "Hier werden Fahrradschlösser verkauft",
-            "cs": "Prodávají se zde zámky na kola",
-            "pt_BR": "Cadeados para bicicleta são vendidos aqui",
-            "es": "Aquí se venden candados para bicicletas",
-            "pt": "Cadeados para bicicleta são vendidos aqui"
-          }
-        }
-      ],
-      "multiAnswer": true
-    }
-  ],
-  "deletion": {
-    "softDeletionTags": {
-      "and": [
-        "disused:amenity:={amenity}",
-        "amenity="
-      ]
-    },
-    "neededChangesets": 1
-  },
-  "allowMove": {
-    "enableRelocation": false,
-    "enableImproveAccuracy": true
-  }
-}
diff --git a/assets/layers/bicycle_tube_vending_machine/license_info.json b/assets/layers/bicycle_tube_vending_machine/license_info.json
deleted file mode 100644
index 3a4480d87..000000000
--- a/assets/layers/bicycle_tube_vending_machine/license_info.json
+++ /dev/null
@@ -1,18 +0,0 @@
-[
-  {
-    "path": "pinIcon.svg",
-    "license": "CC0-1.0",
-    "authors": [
-      "Pieter Vander Vennet"
-    ],
-    "sources": []
-  },
-  {
-    "path": "tube.svg",
-    "license": "CC0-1.0",
-    "authors": [
-      "Pieter Vander Vennet"
-    ],
-    "sources": []
-  }
-]
\ No newline at end of file
diff --git a/assets/layers/bicycle_tube_vending_machine/pinIcon.svg b/assets/layers/bicycle_tube_vending_machine/pinIcon.svg
deleted file mode 100644
index 6ebaa9e1a..000000000
--- a/assets/layers/bicycle_tube_vending_machine/pinIcon.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="313px" height="374px" viewBox="0 0 313 374" version="1.1">
-  <g id="surface1">
-    <path style="fill:none;stroke-width:0.82687;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:4;" d="M 41.280465 238.515911 C 41.280465 239.055692 40.663043 239.49477 39.894824 239.507722 C 39.883498 239.508046 29.019382 239.508046 29.007732 239.508046 C 28.223333 239.508046 27.587466 239.063787 27.587466 238.515911 C 27.587466 237.968359 28.223333 237.524424 29.007732 237.524424 C 29.023265 237.524424 39.891264 237.524424 39.906473 237.524748 C 40.669515 237.541586 41.280465 237.979045 41.280465 238.515911 Z M 41.280465 238.515911 " transform="matrix(12.071348,0,0,12.063634,-254.510092,-2708.802357)"/>
-    <path style="fill:none;stroke-width:0.82687;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:4;" d="M 43.666021 238.479645 C 43.666021 240.039408 42.312092 241.306452 40.630683 241.334299 C 40.612238 241.334623 28.023351 241.334623 28.004582 241.334623 C 26.297285 241.334623 24.913909 240.056246 24.913909 238.479645 C 24.913909 236.903045 26.297285 235.624991 28.004582 235.624991 C 28.027557 235.624991 40.620652 235.625315 40.643303 235.625963 C 42.318888 235.659315 43.666021 236.924092 43.666021 238.479969 Z M 43.666021 238.479645 " transform="matrix(12.071348,0,0,12.063634,-254.510092,-2708.802357)"/>
-    <path style="fill:none;stroke-width:0.82687;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:4;" d="M 46.014687 238.479645 C 46.014687 241.172397 43.846265 243.358396 41.160411 243.387215 C 41.142613 243.387538 27.393308 243.387538 27.375833 243.387538 C 24.665063 243.387538 22.468164 241.189882 22.468164 238.479645 C 22.468164 235.769408 24.665063 233.572399 27.375833 233.572399 C 27.404633 233.572399 41.164941 233.572399 41.194389 233.573371 C 43.864386 233.619675 46.014687 235.79855 46.014687 238.479969 Z M 46.014687 238.479645 " transform="matrix(12.071348,0,0,12.063634,-254.510092,-2708.802357)"/>
-    <path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:0.236216;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:4;" d="M 37.684981 232.827003 L 39.941422 232.827003 L 39.941422 244.186039 L 37.684981 244.186039 Z M 37.684981 232.827003 " transform="matrix(12.071348,0,0,12.063634,-254.510092,-2708.802357)"/>
-    <path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 156.066406 30.582031 L 165.640625 30.582031 L 165.640625 95.710938 L 156.066406 95.710938 Z M 156.066406 30.582031 "/>
-  </g>
-</svg>
\ No newline at end of file
diff --git a/assets/layers/bicycle_tube_vending_machine/pinIcon.svg.license b/assets/layers/bicycle_tube_vending_machine/pinIcon.svg.license
deleted file mode 100644
index ed0288300..000000000
--- a/assets/layers/bicycle_tube_vending_machine/pinIcon.svg.license
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-FileCopyrightText: Pieter Vander Vennet
-SPDX-License-Identifier: CC0-1.0
\ No newline at end of file
diff --git a/assets/layers/bicycle_tube_vending_machine/tube.svg b/assets/layers/bicycle_tube_vending_machine/tube.svg
deleted file mode 100644
index c39c1a856..000000000
--- a/assets/layers/bicycle_tube_vending_machine/tube.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="373px" height="264px" viewBox="0 0 373 264" version="1.1">
-  <g id="surface1">
-    <path style="fill:none;stroke-width:1.685897;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:4;" d="M 52.819462 187.17936 C 52.819462 188.594501 51.200611 189.745829 49.184795 189.779484 C 49.154887 189.780027 20.66321 189.780027 20.632758 189.780027 C 18.575615 189.780027 16.907279 188.615671 16.907279 187.17936 C 16.907279 185.742506 18.575615 184.57815 20.632758 184.57815 C 20.673542 184.57815 49.175007 184.578693 49.215247 184.579236 C 51.216924 184.623747 52.819462 185.770733 52.819462 187.178817 Z M 52.819462 187.17936 " transform="matrix(7.18343,0,0,7.19617,-61.01085,-1171.138615)"/>
-    <path style="fill:none;stroke-width:1.925465;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:4;" d="M 56.121332 187.102279 C 56.121332 190.688714 53.007612 193.603676 49.141293 193.666643 C 49.098877 193.667186 20.14607 193.667729 20.103654 193.667729 C 16.178062 193.667729 12.995281 190.72834 12.995281 187.102279 C 12.995281 183.476218 16.178062 180.536829 20.103654 180.536829 C 20.155858 180.536829 49.11791 180.537372 49.169569 180.539001 C 53.023382 180.615539 56.121332 183.525073 56.121332 187.102822 Z M 56.121332 187.102279 " transform="matrix(7.18343,0,0,7.19617,-61.01085,-1171.138615)"/>
-    <path style="fill:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:4;" d="M 59.376436 187.102279 C 59.376436 192.801925 54.786881 197.428952 49.101596 197.489749 C 49.064075 197.490291 19.960638 197.490291 19.923117 197.490291 C 14.186173 197.490291 9.53517 192.83938 9.53517 187.102279 C 9.53517 181.365178 14.186173 176.714267 19.923117 176.714267 C 19.984565 176.714267 49.111384 176.71481 49.172832 176.716438 C 54.824946 176.814689 59.376436 181.42706 59.376436 187.102822 Z M 59.376436 187.102279 " transform="matrix(7.18343,0,0,7.19617,-61.01085,-1171.138615)"/>
-    <path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:4;" d="M 41.744713 175.137365 L 46.521331 175.137365 L 46.521331 199.180644 L 41.744713 199.180644 Z M 41.744713 175.137365 " transform="matrix(7.18343,0,0,7.19617,-61.01085,-1171.138615)"/>
-    <path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 165.183594 45.855469 L 175.863281 45.855469 L 175.863281 88.890625 L 165.183594 88.890625 Z M 165.183594 45.855469 "/>
-    <path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 163.027344 6.570312 C 164.667969 -0.507812 174.207031 -3.726562 177.15625 6.570312 L 184.074219 42.386719 L 158.125 42.386719 Z M 163.027344 6.570312 "/>
-  </g>
-</svg>
\ No newline at end of file
diff --git a/assets/layers/bicycle_tube_vending_machine/tube.svg.license b/assets/layers/bicycle_tube_vending_machine/tube.svg.license
deleted file mode 100644
index ed0288300..000000000
--- a/assets/layers/bicycle_tube_vending_machine/tube.svg.license
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-FileCopyrightText: Pieter Vander Vennet
-SPDX-License-Identifier: CC0-1.0
\ No newline at end of file
diff --git a/assets/layers/vending_machine/vending_machine.json b/assets/layers/vending_machine/vending_machine.json
index 9d01b7e6b..d208ba7c6 100644
--- a/assets/layers/vending_machine/vending_machine.json
+++ b/assets/layers/vending_machine/vending_machine.json
@@ -358,6 +358,7 @@
   ],
   "tagRenderings": [
     "images",
+    "level",
     {
       "id": "vending",
       "question": {
@@ -487,7 +488,10 @@
             "de": "Fahrradschläuche werden verkauft",
             "fr": "Vent des chambres à air pour vélo",
             "ca": "Es venen càmeres interiors de bicicletes",
-            "cs": "Prodává duše na kola"
+            "cs": "Prodává duše na kola",
+            "pt_BR": "Câmaras de ar para bicicletas são vendidas aqui",
+            "es": "Aquí se venden cámaras de aire para bicicletas",
+            "pt": "Câmaras de ar para bicicletas são vendidas aqui"
           }
         },
         {
@@ -646,7 +650,10 @@
             "nl": "Fietslampjes worden verkocht",
             "de": "Fahrradlampen werden verkauft",
             "cs": "Prodává světla na kolo",
-            "ca": "Es venen llums per a bicicletes"
+            "ca": "Es venen llums per a bicicletes",
+            "pt_BR": "Luzes para bicicleta são vendidas aqui",
+            "es": "Las luces para bicicletas se venden aquí",
+            "pt": "Luzes para bicicleta são vendidas aqui"
           }
         },
         {
@@ -656,7 +663,10 @@
             "nl": "Handschoenen worden verkocht",
             "de": "Fahrradhandschuhe werden verkauft",
             "cs": "Prodává rukavice",
-            "ca": "Es venen guants"
+            "ca": "Es venen guants",
+            "pt_BR": "Luvas são vendidas aqui",
+            "es": "Los guantes se venden aquí",
+            "pt": "Luvas são vendidas aqui"
           }
         },
         {
@@ -666,7 +676,10 @@
             "nl": "Fietsreparatiesets worden verkocht",
             "de": "Fahrrad-Reparaturset werden verkauft",
             "cs": "Prodává sady na opravu jízdních kol",
-            "ca": "Es venen kits de reparació de bicicletes"
+            "ca": "Es venen kits de reparació de bicicletes",
+            "pt_BR": "Kits para reparo de bicicleta são vendidos aqui",
+            "es": "Los kits de reparación de bicicletas se venden aquí",
+            "pt": "Kits para reparo de bicicleta são vendidos aqui"
           }
         },
         {
@@ -676,7 +689,10 @@
             "nl": "Fietspompen worden verkocht",
             "de": "Fahrradpumpen werden verkauft",
             "cs": "Prodává pumpy na kolo",
-            "ca": "Es venen bombes de bicicletes"
+            "ca": "Es venen bombes de bicicletes",
+            "pt_BR": "Bombas de ar para bicicleta são vendidas aqui",
+            "es": "Las bombas para bicicletas se venden aquí",
+            "pt": "Bombas de ar para bicicleta são vendidas aqui"
           }
         },
         {
@@ -686,12 +702,71 @@
             "nl": "Fietssloten worden verkocht",
             "de": "Fahrradschlösser werden verkauft",
             "cs": "Prodává zámky na kolo",
-            "ca": "Es venen cadenats per a bicicletes"
+            "ca": "Es venen cadenats per a bicicletes",
+            "pt_BR": "Cadeados para bicicleta são vendidos aqui",
+            "es": "Aquí se venden candados para bicicletas",
+            "pt": "Cadeados para bicicleta são vendidos aqui"
           }
         }
       ],
       "multiAnswer": true
     },
+    {
+      "question": {
+        "en": "Which brand of tubes are sold here?",
+        "ca": "Quines marques de cambres d'aire es venen aquí?",
+        "de": "Welche Fahrradschläuche werden hier verkauft?",
+        "cs": "Jaká značka duší je zde prodávána?",
+        "nl": "Welk merk banden wordt hier verkocht?",
+        "pt_BR": "Quais marcas de câmara de ar são vendidas aqui?",
+        "es": "¿Qué cámaras se venden aquí?",
+        "pt": "Quais marcas de câmara de ar são vendidas aqui?"
+      },
+      "condition": "vending~.*bicycle_tube.*",
+      "freeform": {
+        "key": "brand"
+      },
+      "render": {
+        "en": "{brand} tubes are sold here",
+        "ca": "Aquí es venen cambres d'aire {brand}",
+        "de": "Hier werden Fahrradschläuche von {brand} verkauft",
+        "cs": "{brand} duše jsou zde prodávány",
+        "nl": "{brand} banden worden hier verkocht",
+        "pt_BR": "câmaras de ar {brand} são vendidas aqui",
+        "es": "Las cámaras {brand} se venden aquí",
+        "pt": "câmaras de ar {brand} são vendidas aqui"
+      },
+      "mappings": [
+        {
+          "if": "brand=Continental",
+          "then": {
+            "en": "Continental tubes are sold here",
+            "ca": "Aquí es venen cambres d'aire Continental",
+            "de": "Hier werden Fahrradschläuche von Continental verkauft",
+            "cs": "Continental duše jsou zde prodávány",
+            "nl": "Continental banden worden hier verkocht",
+            "pt_BR": "Câmaras de ar Continental são vendidas aqui",
+            "es": "Las cámaras Continental se venden aquí",
+            "pt": "Câmaras de ar Continental são vendidas aqui"
+          }
+        },
+        {
+          "if": "brand=Schwalbe",
+          "then": {
+            "en": "Schwalbe tubes are sold here",
+            "ca": "Aquí es venen cambres d'aire Schwalbe",
+            "de": "Hier werden Fahrradschläuche von Schwalbe verkauft",
+            "cs": "Schwalbe duše jsou zde prodávány",
+            "nl": "Schwalbe banden worden hier verkocht",
+            "pt_BR": "Câmaras de ar Schwalbe são vendidas aqui",
+            "es": "Las cámaras Schwalbe se venden aquí",
+            "pt": "Câmaras de ar Schwalbe são vendidas aqui"
+          }
+        }
+      ],
+      "multiAnswer": true,
+      "id": "bicycle_tube_vending_machine-brand"
+    },
     "opening_hours_24_7",
     "payment-options-split",
     "denominations-coins",
@@ -773,7 +848,6 @@
         }
       ]
     },
-    "level",
     {
       "builtin": "phone",
       "override": {
@@ -791,7 +865,171 @@
         }
       }
     },
-    "website"
+    "website",
+    {
+      "rewrite": {
+        "sourceString": [
+          "{product_key}",
+          "{product_name}"
+        ],
+        "into": [
+          [
+            "bicycle_tube",
+            {
+              "en": "a bicycle tube",
+              "ca": "una cambra d'aire de bicicleta",
+              "de": "ein Fahrradschlauch",
+              "nl": "een fietsband",
+              "pt_BR": "uma câmara de ar para bicicleta",
+              "es": "una cámara para la bicicleta",
+              "pt": "uma câmara de ar para bicicleta",
+              "cs": "duše na kolo"
+            }
+          ],
+          [
+            "bicycle_light",
+            {
+              "en": "bicycle light",
+              "nl": "een fietslichtje"
+            }
+          ],
+          [
+            "condom",
+            {
+              "en": "a condom",
+              "nl": "een condoom"
+            }
+          ]
+        ]
+      },
+      "renderings": {
+        "question": {
+          "en": "How much does a {product_name} cost?",
+          "ca": "Quant costa {product_name}?",
+          "de": "Wie viel kostet {product_name}?",
+          "cs": "Kolik stojí {product_name}?",
+          "nl": "Hoeveel kost {product_name}?",
+          "pt_BR": "Quanto custa {product_name}?",
+          "es": "¿Cuánto cuesta {product_name}?",
+          "pt": "Quanto custa {product_name}?"
+        },
+        "render": {
+          "en": "{product_name} costs {charge:{product_key}}",
+          "ca": "{product_name} costa {charge:{product_key}}",
+          "de": "{product_name} kostet {charge:{product_key}}",
+          "cs": "{product_name} {charge:{product_key}}",
+          "nl": "{product_name} kost {charge:{product_key}}",
+          "pt_BR": "{product_name} custa {charge:{product_key}}",
+          "es": "{product_name} cuesta {charge:{product_key}}",
+          "pt": "{product_name} custa {charge:{product_key}}"
+        },
+        "freeform": {
+          "key": "charge:{product_key}",
+          "type": "currency"
+        },
+        "condition": "vending~.*{product_key}.*",
+        "id": "charge_{product_key}"
+      }
+    },
+    {
+      "id": "operational_status",
+      "question": {
+        "en": "Is this vending machine still operational?",
+        "nl": "Is deze verkoopsautomaat nog steeds werkende?",
+        "fr": "Cette machine est-elle encore opérationelle ?",
+        "it": "Questo distributore automatico funziona ancora?",
+        "ru": "Этот торговый автомат все еще работает?",
+        "de": "Ist dieser Automat in Betrieb?",
+        "zh_Hant": "這個自動販賣機仍有運作嗎？",
+        "pt_BR": "Esta máquina de venda automática ainda está operacional?",
+        "pt": "Esta máquina de venda automática ainda está operacional?",
+        "es": "¿Todavía funciona esta máquina expendedora?",
+        "da": "Er denne salgsautomat stadig i drift?",
+        "cs": "Je tento automat stále v provozu?",
+        "ca": "Aquesta màquina expenedora encara funciona?"
+      },
+      "mappings": [
+        {
+          "if": "operational_status=",
+          "then": {
+            "en": "This vending machine works",
+            "nl": "Deze verkoopsautomaat werkt",
+            "fr": "Le distributeur automatique fonctionne",
+            "hu": "Ez az automata működik",
+            "it": "Il distributore automatico funziona",
+            "ru": "Этот торговый автомат работает",
+            "zh_Hans": "这个借还机正常工作",
+            "de": "Dieser Automat ist in Betrieb",
+            "zh_Hant": "這個自動販賣機仍運作",
+            "pt_BR": "Esta máquina de venda automática funciona",
+            "pt": "Esta máquina de venda automática funciona",
+            "da": "Denne salgsautomat virker",
+            "es": "Esta máquina expendedora funciona",
+            "cs": "Tento prodejní automat funguje",
+            "ca": "Aquesta màquina expenedora funciona"
+          }
+        },
+        {
+          "if": "operational_status=broken",
+          "then": {
+            "en": "This vending machine is broken",
+            "nl": "Deze verkoopsautomaat is kapot",
+            "fr": "Le distributeur automatique est en panne",
+            "hu": "Ez az automata elromlott",
+            "it": "Il distributore automatico è guasto",
+            "ru": "Этот торговый автомат сломан",
+            "zh_Hans": "这个借还机已经损坏",
+            "de": "Dieser Automat ist kaputt",
+            "zh_Hant": "這個自動販賣機沒有運作了",
+            "pt_BR": "Esta máquina de venda automática está quebrada",
+            "pt": "Esta máquina de venda automática está quebrada",
+            "es": "Esta máquina exprendedora está rota",
+            "da": "Denne salgsautomat er i stykker",
+            "cs": "Tento prodejní automat je rozbitý",
+            "ca": "Aquesta màquina expenedora està trencada"
+          }
+        },
+        {
+          "if": "operational_status=closed",
+          "then": {
+            "en": "This vending machine is closed",
+            "nl": "Deze verkoopsautomaat is uitgeschakeld",
+            "fr": "Le distributeur automatique est fermé",
+            "hu": "Ez az automata zárva van",
+            "it": "Il distributore automatico è spento",
+            "ru": "Этот торговый автомат закрыт",
+            "zh_Hans": "这个借还机被关闭了",
+            "de": "Dieser Automat ist geschlossen",
+            "zh_Hant": "這個自動販賣機已經關閉了",
+            "pt_BR": "Esta máquina de venda automática está fechada",
+            "pt": "Esta máquina de venda automática está fechada",
+            "es": "Esta máquina exprendedora está cerrada",
+            "da": "Denne salgsautomat er lukket",
+            "cs": "Tento prodejní automat je uzavřen",
+            "ca": "Aquesta màquina expenedora està tancada"
+          }
+        },
+        {
+          "if": "operational_status~*",
+          "hideInAnswer": true,
+          "then": {
+            "en": "The operational status is <i>{operational_status}</i>",
+            "nl": "Deze verkoopsautomaat is <i>{operational_status}</i>",
+            "fr": "L'état opérationnel est <i>{operational_status}</i>",
+            "it": "Lo stato operativo è <i>{operational_status}</i>",
+            "de": "Der Betriebszustand ist <i>{operational_status}</i>",
+            "ru": "Рабочий статус: <i> {operational_status}</i>",
+            "zh_Hant": "運作狀態是 <i>{operational_status}</i>",
+            "pt_BR": "O estado operacional é: <i>{operational_status}</i>",
+            "pt": "O estado operacional é: <i>{operational_status}</i>",
+            "es": "El estado operacional es <i>{operational_status}</i>",
+            "da": "Driftsstatus er <i>{operational_status}</i>",
+            "cs": "Provozní stav je <i>{operational_status}</i>",
+            "ca": "L'estat operatiu és <i>{operational_status}</i>"
+          }
+        }
+      ]
+    }
   ],
   "filter": [
     "open_now",
@@ -1094,7 +1332,15 @@
       ]
     }
   ],
-  "deletion": true,
+  "deletion": {
+    "softDeletionTags": {
+      "and": [
+        "disused:amenity:={amenity}",
+        "amenity="
+      ]
+    },
+    "neededChangesets": 0
+  },
   "allowMove": {
     "enableImproveAccuracy": true,
     "enableRelocation": true
diff --git a/assets/themes/cyclofix/cyclofix.json b/assets/themes/cyclofix/cyclofix.json
index 279ee784f..002485e62 100644
--- a/assets/themes/cyclofix/cyclofix.json
+++ b/assets/themes/cyclofix/cyclofix.json
@@ -45,7 +45,6 @@
         "bike_cafe",
         "bike_shop",
         "bike_repair_station",
-        "bicycle_tube_vending_machine",
         "drinking_water",
         "bike_themed_object",
         "bike_cleaning"
@@ -155,6 +154,30 @@
         },
         "minzoom": 18
       }
+    },
+    {
+      "builtin": "vending_machine",
+      "override": {
+        "id": "vending_machine_bicycle",
+        "minzoom": 11,
+        "source": {
+          "osmTags": {
+            "and+": ["vending~.*bicycle.*"]
+          }
+        },
+        "=presets":[]
+
+      }
+    },
+    {"#": "All vending machines at high zoom level to avoid duplicates",
+      "builtin": "vending_machine",
+      "override": {
+        "name": null,
+        "filter": {
+          "sameAs": "vending_machine_bicycle"
+        },
+        "minzoom": 18
+      }
     }
   ],
   "widenFactor": 2
diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
index 364995aee..6ba5c5884 100644
--- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json
+++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
@@ -1,4 +1,4 @@
-²{
+{
   "id": "mapcomplete-changes",
   "title": {
     "en": "Changes made with MapComplete"
@@ -9,12 +9,11 @@
   "description": {
     "en": "This maps shows all the changes made with MapComplete"
   },
-  "shortDescription": {
-    "en": "Shows changes made by MapComplete",
-    "de": "Änderungen von MapComplete anzeigen"
-  },
   "icon": "./assets/svg/logo.svg",
   "hideFromOverview": true,
+  "startLat": 0,
+  "startLon": 0,
+  "startZoom": 1,
   "layers": [
     {
       "id": "mapcomplete-changes",
@@ -298,6 +297,10 @@
                     "if": "theme=kerbs_and_crossings",
                     "then": "./assets/layers/kerbs/KerbIcon.svg"
                   },
+                  {
+                    "if": "theme=lighthouses",
+                    "then": "./assets/themes/lighthouses/lighthouse.svg"
+                  },
                   {
                     "if": "theme=mapcomplete-changes",
                     "then": "./assets/svg/logo.svg"