diff --git a/assets/layers/brothel/brothel.json b/assets/layers/brothel/brothel.json
index a1d4c5650c..167c602a38 100644
--- a/assets/layers/brothel/brothel.json
+++ b/assets/layers/brothel/brothel.json
@@ -109,5 +109,8 @@
   },
   "allowMove": true,
   "allowSplit": false,
-  "enableMorePrivacy": true
+  "enableMorePrivacy": true,
+  "labels": [
+    "nsfw"
+  ]
 }
diff --git a/assets/layers/love_hotel/love_hotel.json b/assets/layers/love_hotel/love_hotel.json
index cd50a3b381..5f2b70feae 100644
--- a/assets/layers/love_hotel/love_hotel.json
+++ b/assets/layers/love_hotel/love_hotel.json
@@ -96,5 +96,8 @@
   ],
   "allowMove": true,
   "enableMorePrivacy": true,
+  "labels": [
+    "nsfw"
+  ],
   "credits": "Asteliks"
 }
diff --git a/assets/layers/stripclub/stripclub.json b/assets/layers/stripclub/stripclub.json
index 12e86f173f..6b28c1552b 100644
--- a/assets/layers/stripclub/stripclub.json
+++ b/assets/layers/stripclub/stripclub.json
@@ -105,5 +105,8 @@
     "contact"
   ],
   "allowMove": true,
-  "enableMorePrivacy": true
+  "enableMorePrivacy": true,
+  "labels": [
+    "nsfw"
+  ]
 }
diff --git a/assets/themes/openlovemap/openlovemap.json b/assets/themes/openlovemap/openlovemap.json
index 169c8d39db..863ecdbee0 100644
--- a/assets/themes/openlovemap/openlovemap.json
+++ b/assets/themes/openlovemap/openlovemap.json
@@ -38,7 +38,7 @@
         "minzoom": 6,
         "=filter": [
           "open_now",
-          "fetish",
+          "erotic_shop_fetish",
           "accepts_cash",
           "accepts_cards"
         ],
@@ -70,94 +70,6 @@
               "shop=erotic"
             ]
           }
-        ],
-        "tagRenderings+": [
-          {
-            "id": "fetish",
-            "multiAnswer": true,
-            "question": {
-              "en": "Does this shop offer fetish gear?",
-              "de": "Bietet dieser Laden Fetischkleidung an?",
-              "es": "¿Esta tienda ofrece artículos fetiche?",
-              "cs": "Nabízí tento obchod vybavení pro fetišisty?",
-              "nl": "Biedt deze winkel fetisjspullen aan?",
-              "ko": "이 상점은 페티시 기어를 제공하나요?",
-              "it": "Questo negozio offre attrezzature fetish?",
-              "zh_Hant": "這家商店提供戀物癖裝備嗎？"
-            },
-            "mappings": [
-              {
-                "if": "fetish:bdsm:soft=yes",
-                "ifnot": "fetish:bdsm:soft=no",
-                "then": {
-                  "en": "This shop offers <b>soft BDSM-gear</b>, such as fluffy handcuffs, a 'fifty-shade-of-grey'-starterset, ...",
-                  "de": "Dieser Laden bietet <b>weiches BDSM-Zubehör</b> an, wie zum Beispiel flauschige Handschellen, ein \"Fifty Shades of Grey\"-Starterset, ...",
-                  "es": "Esta tienda ofrece <b>artículos BDSM suaves</b>, como esposas de peluche, un kit de iniciación 'cincuenta sombras de Grey',...",
-                  "cs": "Tento obchod nabízí <b>měkké BDSM pomůcky</b>, jako jsou chlupatá pouta, sada „padesát odstínů šedi“, ...",
-                  "nl": "Deze winkel biedt <b>soft BDSM-accessoires</b>, zoals zachte handboeien, een 'fifty-shade-of-grey'-starterset, ...",
-                  "ko": "이 상점은 털 수갑과 같은 <b>soft BDSM-gear</b>를 제공합니다.",
-                  "it": "Questo negozio offre <b>attrezzature BDSM leggere</b>, come manette pelose, un 'kit di partenza cinquanta sfumature di grigio', ...",
-                  "zh_Hant": "這間店提供<b>軟性調教道具</b>，例如完整的手銬、完整的格雷的五十道陰影入門款、…"
-                }
-              },
-              {
-                "if": "fetish:bdsm:specialized=yes",
-                "ifnot": "fetish:bdsm:specialized=no",
-                "then": {
-                  "en": "This shop offers <b>specialized BDSM-gear</b>, such as spreader bars, supplies for needle play, medical bondage supplies, impact tools, shackles, metal colors, cuffs, nipple clamps, shibari accessories, ...",
-                  "de": "Dieser Laden bietet <b>spezialisiertes BDSM-Zubehör</b> an, wie zum Beispiel Spreizstangen, Utensilien für Nadelfolter, medizinische Bondage-Ausrüstung, Schlagwerkzeuge, Fesseln, Metallhalsbänder, Handschellen, Nippelklemmen, Shibari-Zubehör, ...",
-                  "es": "Esta tienda ofrece <b>artículos BDSM especializados</b>, como barras separadoras, artículos para juegos con agujas, artículos de bondage médico, herramientas de impacto, grilletes, colores metálicos, puños, pinzas para pezones, accesorios shibari,...",
-                  "cs": "Tento obchod nabízí <b>specializované BDSM pomůcky</b>, jako jsou roztahovací tyče, potřeby pro hru na jehlách, potřeby pro lékařskou bondáž, nárazové nástroje, pouta, kovové barvy, pouta, svorky na bradavky, shibari doplňky, ...",
-                  "nl": "Deze winkel biedt <b>gespecialiseerde BDSM-benodigdheden</b>, zoals spreidstangen, benodigdheden voor naaldspellen, medische bondagebenodigdheden, slagwerktuigen, kluisters, metalen kleuren, boeien, tepelklemmen, shibari-accessoires, ...",
-                  "ko": "이 상점은 스프레더 바와 같은 <b>specialized BDSM-gear</b>를 제공합니다.",
-                  "it": "Questo negozio offre <b>attrezzature BDSM specializzate</b>, come barre divaricatrici, forniture per giochi con aghi, forniture per bondage medico, strumenti d'impatto, catene, polsini, morsetti per capezzoli, accessori per shibari, ...",
-                  "zh_Hant": "這間店提供<b>特規調教工具</b>，例如擴張桿、針刺遊戲用品、醫療束縛用品、衝擊工具、枷鎖、金屬色料、袖口、乳頭夾、繩縛配件、…"
-                }
-              },
-              {
-                "if": "fetish:pet_play=yes",
-                "ifnot": "fetish:pet_play=no",
-                "then": {
-                  "en": "This shop offers <b>pet play</b> accessories, such as puppy masks, animal masks, pony play, tails, hoof shoes, ...",
-                  "de": "Dieser Laden bietet <b>Petplay</b>-Zubehör an, wie zum Beispiel Hundemasken, Tiermasken, Ponyplay-Ausrüstung, Schwänze, Hufschuhe, ...",
-                  "es": "Esta tienda ofrece accesorios para <b>juegos con mascotas</b>, como máscaras de cachorro, máscaras de animales, juegos de pony, colas, zapatos de casco,...",
-                  "cs": "Tento obchod nabízí doplňky <b>na hraní si na zvířata</b>, jako jsou masky štěňat, masky zvířat, poníci na hraní, ocasy, boty na kopyta, ...",
-                  "nl": "Deze winkel biedt '<b>pet play</b>'-accessoires, zoals puppymaskers, dierenmaskers, ponyspellen, staarten, hoefschoenen, ...",
-                  "ko": "이 상점은 동물 마스크와 같은 <b>pet play</b> 악세사리를 제공합니다.",
-                  "it": "Questo negozio offre accessori per <b>pet play</b>, come maschere da cucciolo, maschere di animali, pony play, code, scarpe a zoccolo, ...",
-                  "zh_Hant": "這間店提供<b>寵物扮演</b>配件，像是寵物面具、動物面具、馬尾、馬蹄鐵、…"
-                }
-              },
-              {
-                "if": "fetish:leather=yes",
-                "ifnot": "fetish:leather=no",
-                "then": {
-                  "en": "This shop offers <b>leather gear</b>, including pants and shirts usable in daily life up till leather harnesses",
-                  "de": "Dieser Laden bietet <b>Lederkleidung</b> an, darunter Hosen und Hemden für den Alltag bis hin zu Lederharnissen",
-                  "es": "Esta tienda ofrece <b>artículos de cuero</b>, incluyendo pantalones y camisas utilizables en la vida diaria hasta arneses de cuero",
-                  "cs": "Tento obchod nabízí <b>kožené vybavení</b>, včetně kalhot a košil použitelných v každodenním životě až po kožené postroje",
-                  "nl": "Deze winkel biedt <b>leren kledij</b> aan, waaronder broeken en shirts die je in het dagelijks leven kunt gebruiken tot en met leren harnassen",
-                  "ko": "이 상점은 바지, 셔츠, 가죽 하네스와 같은 <b>leather gear</b>를 제공합니다",
-                  "it": "Questo negozio offre <b>abbigliamento in pelle</b>, inclusi pantaloni e camicie utilizzabili nella vita quotidiana fino a imbracature in pelle",
-                  "zh_Hant": "這間店提供<b>皮革工具</b>，包括日常生活中穿的褲子和襯衫，採用皮革馬具"
-                }
-              },
-              {
-                "if": "fetish:uniform=yes",
-                "ifnot": "fetish:uniform=no",
-                "then": {
-                  "en": "This shop offers <b>uniforms</b> for roleplay, such nurse uniforms, military uniforms, police, school girl, french maid, ...",
-                  "de": "Dieser Laden bietet <b>Uniformen</b> für Rollenspiele an, wie Krankenschwester-Uniformen, Militäruniformen, Polizei-, Schulmädchen- und Dienstmädchen-Outfits, ...",
-                  "es": "Esta tienda ofrece <b>uniformes</b> para juegos de rol, como uniformes de enfermera, uniformes militares, policía, colegiala, criada francesa,...",
-                  "cs": "Tento obchod nabízí <b>uniformy</b> pro roleplay, jako jsou uniformy zdravotní sestry, vojenské uniformy, policie, školačky, francouzské pokojské, ...",
-                  "nl": "Deze winkel biedt <b>uniformen</b> voor rollenspelen aan, zoals verpleegsteruniformen, militaire uniformen, politie, schoolmeisje, Franse dienstmeid, ...",
-                  "ko": "이 상점은 롤플레이 유니폼 같은<b>uniforms</b> 을 제공합니다.",
-                  "it": "Questo negozio offre <b>uniformi</b> per giochi di ruolo, come uniformi da infermiera, uniformi militari, polizia, scolaretta, cameriera francese, ...",
-                  "zh_Hant": "這間店提供角色扮演<b>制服</b>，例如護士服、軍服、警察、學生妹、法國女佣、…"
-                }
-              }
-            ]
-          }
         ]
       }
     },
@@ -381,5 +293,8 @@
       }
     ]
   },
-  "enableMorePrivacy": true
+  "enableMorePrivacy": true,
+  "labels": [
+    "nsfw"
+  ]
 }
diff --git a/src/Models/ThemeConfig/Json/LayerConfigJson.ts b/src/Models/ThemeConfig/Json/LayerConfigJson.ts
index b33663ff49..dd0ad89286 100644
--- a/src/Models/ThemeConfig/Json/LayerConfigJson.ts
+++ b/src/Models/ThemeConfig/Json/LayerConfigJson.ts
@@ -30,6 +30,13 @@ export interface LayerConfigJson {
      */
     id: string
 
+    /**
+     * question: What labels are applied on the theme?
+     *
+     * Labels are tags on a layer and might mark special properties, influencing certain build processes
+     */
+    labels?: string[]
+
     /**
      * Used in the layer control panel to toggle a layer on and of.
      *