diff --git a/assets/layers/bbq/bbq.json b/assets/layers/bbq/bbq.json
new file mode 100644
index 000000000..a7ed0f5d6
--- /dev/null
+++ b/assets/layers/bbq/bbq.json
@@ -0,0 +1,173 @@
+{
+  "id": "bbq",
+  "name": {
+    "en": "BBQ",
+    "de": "Grillstelle"
+  },
+  "description": {
+    "de": "Ein ortsfest installierter Grill, typischerweise öffentlich zugänglich.",
+    "en": "A permanently installed barbecue, typically accessible to the public."
+  },
+  "source": {
+    "osmTags": "amenity=bbq"
+  },
+  "minzoom": 8,
+  "title": {
+    "render": {
+      "en": "BBQ",
+      "de": "Grillstelle"
+    }
+  },
+  "pointRendering": [
+    {
+      "iconSize": "40,40",
+      "location": [
+        "point",
+        "centroid"
+      ],
+      "anchor": "bottom",
+      "marker": [
+        {
+          "icon": "circle",
+          "color": "white"
+        },
+        {
+          "icon": "./assets/layers/bbq/bbq.svg"
+        }
+      ]
+    }
+  ],
+  "presets": [
+    {
+      "title": {
+        "en": "BBQ",
+        "de": "Grillstelle"
+      },
+      "description": {
+        "de": "Ein ortsfest installierter Grill, typischerweise öffentlich zugänglich.",
+        "en": "A permanently installed barbecue, typically accessible to the public."
+      },
+      "tags": [
+        "amenity=bbq"
+      ]
+    }
+  ],
+  "tagRenderings": [
+    "images",
+    {
+      "id": "access",
+      "question": {
+        "en": "What is the permitted access?",
+        "de": "Was ist der erlaubte Zugang?"
+      },
+      "mappings": [
+        {
+          "if": "access=yes",
+          "then": {
+            "de": "Öffentlich",
+            "en": "Public"
+          }
+        },
+        {
+          "if": "access=no",
+          "then": {
+            "de": "Kein Zugang",
+            "en": "No access"
+          }
+        },
+        {
+          "if": "access=private",
+          "then": {
+            "de": "Privat",
+            "en": "Private"
+          }
+        },
+        {
+          "if": "access=permissive",
+          "then": {
+            "de": "Zugang bis auf Widerruf",
+            "en": "Access until revoked"
+          }
+        },
+        {
+          "if": "access=customers",
+          "then": {
+            "de": "Zugang nur für Kunden",
+            "en": "Access only for customers"
+          }
+        },
+        {
+          "if": "access=permit",
+          "then": {
+            "de": "Zugang nur für Berechtigte",
+            "en": "Access only for authorized persons"
+          }
+        }
+      ]
+    },
+    {
+      "id": "covered",
+      "question": {
+        "en": "Is the grill covered?",
+        "de": "Ist die Grillstelle überdacht?"
+      },
+      "mappings": [
+        {
+          "if": "covered=no",
+          "then": {
+            "de": "Die Grillstelle ist nicht überdacht",
+            "en": "The grill is not covered"
+          }
+        },
+        {
+          "if": "covered=yes",
+          "then": {
+            "de": "Die Grillstelle ist überdacht",
+            "en": "The grill is covered"
+          }
+        }
+      ]
+    },
+    {
+      "id": "fuel",
+      "question": {
+        "en": "How ist the grill fueled?",
+        "de": "Mit was wird die Grillstelle angefeuert?"
+      },
+      "mappings": [
+        {
+          "if": "fuel=wood",
+          "then": {
+            "de": "Holz",
+            "en": "Wood"
+          }
+        },
+        {
+          "if": "fuel=charcoal",
+          "then": {
+            "de": "Kohle",
+            "en": "Charcoal"
+          }
+        },
+        {
+          "if": "fuel=electric",
+          "then": {
+            "de": "Elektronisch",
+            "en": "Electric"
+          }
+        },
+        {
+          "if": "fuel=gas",
+          "then": {
+            "de": "Gas",
+            "en": "Gas"
+          }
+        }
+      ]
+    }
+  ],
+  "allowMove": {
+    "enableRelocation": false,
+    "enableImproveAccuracy": true
+  }
+}
diff --git a/assets/layers/bbq/bbq.svg b/assets/layers/bbq/bbq.svg
new file mode 100644
index 000000000..c540b7d69
--- /dev/null
+++ b/assets/layers/bbq/bbq.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="bbq" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M9.32,7.655C10.8782,7.108,11.9471,5.6506,12,4H3c0.053,1.6299,1.0978,3.0728,2.63,3.631L4.923,9.044&#xA;&#x9;c-1.3571-0.2355-2.6482,0.6737-2.8837,2.0308s0.6737,2.6482,2.0308,2.8837C4.9927,14.1187,5.9273,13.7485,6.49,13h4.223l0.335,0.717&#xA;&#x9;c0.0836,0.1735,0.2594,0.2836,0.452,0.283c0.0733,0.0003,0.1457-0.0158,0.212-0.047c0.2497-0.117,0.3575-0.4141,0.241-0.664&#xA;&#x9;L9.32,7.655z M4.5,12.75c-0.6904,0-1.25-0.5596-1.25-1.25s0.5596-1.25,1.25-1.25s1.25,0.5596,1.25,1.25&#xA;&#x9;C5.7484,12.1897,5.1897,12.7484,4.5,12.75z M6.95,12c0.2066-1.007-0.2268-2.0374-1.091-2.594L6.6,7.923&#xA;&#x9;c0.577,0.1042,1.168,0.1042,1.745,0l1.9,4.07L6.95,12z M4.75,1C4.6119,1,4.5,1.1119,4.5,1.25c0,0.5-0.5,0.5-0.5,0.5c-1,0-1,1-1,1&#xA;&#x9;C3,2.8881,3.1119,3,3.25,3S3.5,2.8881,3.5,2.75c0-0.5,0.5-0.5,0.5-0.5c1,0,1-1,1-1C5,1.1119,4.8881,1,4.75,1z M6.75,1&#xA;&#x9;C6.6119,1,6.5,1.1119,6.5,1.25c0,0.5-0.5,0.5-0.5,0.5c-1,0-1,1-1,1C5,2.8881,5.1119,3,5.25,3S5.5,2.8881,5.5,2.75&#xA;&#x9;c0-0.5,0.5-0.5,0.5-0.5c1,0,1-1,1-1C7,1.1119,6.8881,1,6.75,1z M8.75,1C8.6119,1,8.5,1.1119,8.5,1.25c0,0.5-0.5,0.5-0.5,0.5&#xA;&#x9;c-1,0-1,1-1,1C7,2.8881,7.1119,3,7.25,3S7.5,2.8881,7.5,2.75c0-0.5,0.5-0.5,0.5-0.5c1,0,1-1,1-1C9,1.1119,8.8881,1,8.75,1z M10.75,1&#xA;&#x9;c-0.1381,0-0.25,0.1119-0.25,0.25c0,0.5-0.5,0.5-0.5,0.5c-1,0-1,1-1,1C9,2.8881,9.1119,3,9.25,3S9.5,2.8881,9.5,2.75&#xA;&#x9;c0-0.5,0.5-0.5,0.5-0.5c1,0,1-1,1-1C11,1.1119,10.8881,1,10.75,1z M12.75,1c-0.1381,0-0.25,0.1119-0.25,0.25c0,0.5-0.5,0.5-0.5,0.5&#xA;&#x9;c-1,0-1,1-1,1C11,2.8881,11.1119,3,11.25,3s0.25-0.1119,0.25-0.25c0-0.5,0.5-0.5,0.5-0.5c1,0,1-1,1-1C13,1.1119,12.8881,1,12.75,1z"/>
+</svg>
\ No newline at end of file
diff --git a/assets/layers/bbq/bbq.svg.license b/assets/layers/bbq/bbq.svg.license
new file mode 100644
index 000000000..0cf6926f1
--- /dev/null
+++ b/assets/layers/bbq/bbq.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Maki
+SPDX-License-Identifier: CC0-1.0
\ No newline at end of file
diff --git a/assets/layers/bbq/license_info.json b/assets/layers/bbq/license_info.json
new file mode 100644
index 000000000..51d95c947
--- /dev/null
+++ b/assets/layers/bbq/license_info.json
@@ -0,0 +1,12 @@
+[
+  {
+    "path": "bbq.svg",
+    "license": "CC0-1.0",
+    "authors": [
+      "Maki"
+    ],
+    "sources": [
+      "https://labs.mapbox.com/maki-icons/"
+    ]
+  }
+]
\ No newline at end of file
diff --git a/assets/layers/drinking_water/drinking_water.json b/assets/layers/drinking_water/drinking_water.json
index 8862186ee..296004db3 100644
--- a/assets/layers/drinking_water/drinking_water.json
+++ b/assets/layers/drinking_water/drinking_water.json
@@ -329,41 +329,16 @@
       ]
     },
     {
-      "id": "seasonal",
-      "question": {
-        "en": "Is this drinking water point available all year round?",
-        "nl": "Is dit drinkwaterpunt heel het jaar door beschikbaar?",
-        "de": "Ist die Trinkwasserstelle ganzjährig in Betrieb?"
-      },
-      "mappings": [
-        {
-          "if": "seasonal=no",
-          "then": {
-            "en": "This drinking water point is available all around the year",
-            "nl": "Dit drinkwaterpunt is heel het jaar door beschikbaar",
-            "de": "Die Trinkwasserstelle ist ganzjährig in Betrieb"
-          }
-        },
-        {
-          "if": "seasonal=summer",
-          "then": {
-            "en": "This drinking water point is only available in summer",
-            "nl": "Dit drinkwaterpunt is enkel in de zomer beschikbaar",
-            "de": "Die Trinkwasserstelle ist nur im Sommer in Betrieb"
-          }
-        },
-        {
-          "if": "seasonal=spring;summer;autumn",
-          "icon": "./assets/layers/drinking_water/no_winter.svg",
-          "then": {
-            "en": "This drinking water point is closed during the winter",
-            "nl": "Dit drinkwaterpunt is gesloten in de winter",
-            "de": "Die Trinkwasserstelle ist im Winter nicht in Betrieb"
-          }
+      "builtin":  "seasonal",
+      "override": {
+        "question": {
+          "en": "Is this drinking water point available all year round?",
+          "nl": "Is dit drinkwaterpunt heel het jaar door beschikbaar?",
+          "de": "Ist die Trinkwasserstelle ganzjährig in Betrieb?"
         }
-      ]
+      }
     },
-    {
+     {
       "builtin": "opening_hours_24_7",
       "override": {
         "questionHint": {
diff --git a/assets/layers/firepit/firepit.json b/assets/layers/firepit/firepit.json
new file mode 100644
index 000000000..9f046a18e
--- /dev/null
+++ b/assets/layers/firepit/firepit.json
@@ -0,0 +1,132 @@
+{
+  "id": "firepit",
+  "name": {
+    "en": "Firepitd",
+    "de": "Feuerstelle"
+  },
+  "description": {
+    "en": "An outdoor place to make a fire, typically open to the public.",
+    "de": "Eine Stelle im Freien zum Feuermachen, typischerweise öffentlich zugänglich."
+  },
+  "source": {
+    "osmTags": "leisure=firepit"
+  },
+  "minzoom": 8,
+  "title": {
+    "render": {
+      "en": "Firepit",
+      "de": "Feuerstelle"
+    }
+  },
+  "titleIcons": [
+    "icons.defaults"
+  ],
+  "pointRendering": [
+    {
+      "iconSize": "40,40",
+      "location": [
+        "point",
+        "centroid"
+      ],
+      "anchor": "bottom",
+      "marker": [
+        {
+          "icon": "circle",
+          "color": "white"
+        },
+        {
+          "icon": "./assets/layers/assembly_point/fire.svg"
+        }
+      ]
+    }
+  ],
+  "presets": [
+    {
+      "title": {
+        "en": "Firepit",
+        "de": "Feuerstelle"
+      },
+      "description": {
+        "de": "Eine Stelle im Freien zum Feuermachen, typischerweise öffentlich zugänglich.",
+        "en": "An outdoor place to make a fire, typically open to the public."
+      },
+      "tags": [
+        "leisure=firepit"
+      ]
+    }
+  ],
+  "tagRenderings": [
+    "images",
+    {
+      "id": "access",
+      "question": {
+        "en": "What is the permitted access?",
+        "de": "Was ist der erlaubte Zugang?"
+      },
+      "mappings": [
+        {
+          "if": "access=yes",
+          "then": {
+            "de": "Öffentlich",
+            "en": "Public"
+          }
+        },
+        {
+          "if": "access=no",
+          "then": {
+            "de": "Kein Zugang",
+            "en": "No access"
+          }
+        },
+        {
+          "if": "access=private",
+          "then": {
+            "de": "Privat",
+            "en": "Private"
+          }
+        },
+        {
+          "if": "access=permissive",
+          "then": {
+            "de": "Zugang bis auf Widerruf",
+            "en": "Access until revoked"
+          }
+        },
+        {
+          "if": "access=customers",
+          "then": {
+            "de": "Zugang nur für Kunden",
+            "en": "Access only for customers"
+          }
+        },
+        {
+          "if": "access=permit",
+          "then": {
+            "de": "Zugang nur für Berechtigte",
+            "en": "Access only for authorized"
+          }
+        },
+        {
+          "if": "access=unknown",
+          "then": {
+            "de": "unbekannt",
+            "en": "Unknown"
+          }
+        }
+      ]
+    },
+    {
+      "builtin": "seasonal",
+      "override": {
+        "question": {
+          "en": "Is the firepit available all around the year?",
+          "nl": "Is deze kampvuurplaats heel het jaar door beschikbaar?"
+        }
+      }
+    }
+  ],
+  "allowMove": {
+    "enableRelocation": false,
+    "enableImproveAccuracy": true
+  }
+}
diff --git a/assets/layers/questions/questions.json b/assets/layers/questions/questions.json
index 30febaed0..48e4eb258 100644
--- a/assets/layers/questions/questions.json
+++ b/assets/layers/questions/questions.json
@@ -2755,6 +2755,40 @@
           "cssClasses": "subtle m-4 italic flex items-center justify-center"
         }
       }
+    },
+    {
+      "id": "seasonal",
+      "question": {
+        "en": "Is {title()} available all around the year?",
+        "nl": "Is {title()} heel het jaar beschikbaar?"
+      },
+      "mappings": [
+        {
+          "if": "seasonal=no",
+          "then": {
+            "en": "Available all around the year",
+            "nl": "Heel het jaar door beschikbaar",
+            "de": "Ganzjährig in Betrieb"
+          }
+        },
+        {
+          "if": "seasonal=summer",
+          "then": {
+            "en": "Only available in summer",
+            "nl": "Enkel in de zomer beschikbaar",
+            "de": "Nur im Sommer in Betrieb"
+          }
+        },
+        {
+          "if": "seasonal=spring;summer;autumn",
+          "icon": "./assets/layers/drinking_water/no_winter.svg",
+          "then": {
+            "en": "Closed during the winter",
+            "nl": "Gesloten in de winter",
+            "de": "Im Winter nicht in Betrieb"
+          }
+        }
+      ]
     }
   ]
 }
diff --git a/assets/themes/fireplace/fireplace.json b/assets/themes/fireplace/fireplace.json
new file mode 100644
index 000000000..a5c13081a
--- /dev/null
+++ b/assets/themes/fireplace/fireplace.json
@@ -0,0 +1,16 @@
+{
+  "id": "fireplace",
+  "title": {
+    "en": "Fireplaces and BBQ",
+    "de": "Feuerstellen und Grillstellen"
+  },
+  "description": {
+    "en": "Stelle im Freien zum Feuermachen oder ein ortsfest installierter Grill an einer offizielle Stelle.",
+    "de": "Outdoor place to make a fire or a fixed barbecue in an official place."
+  },
+  "icon": "./assets/layers/assembly_point/fire.svg",
+  "layers": [
+    "firepit",
+    "bbq"
+  ]
+}
diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
index 71a45eb7f..99de2cacb 100644
--- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json
+++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
@@ -241,6 +241,10 @@
                     "if": "theme=facadegardens",
                     "then": "./assets/themes/facadegardens/geveltuin.svg"
                   },
+                  {
+                    "if": "theme=fireplace",
+                    "then": "./assets/layers/assembly_point/fire.svg"
+                  },
                   {
                     "if": "theme=food",
                     "then": "./assets/layers/food/restaurant.svg"