diff --git a/assets/layers/grave/grave.json b/assets/layers/grave/grave.json
new file mode 100644
index 000000000..22e2b58f6
--- /dev/null
+++ b/assets/layers/grave/grave.json
@@ -0,0 +1,101 @@
+{
+  "credits": "Built for Wegspotter on the meetup",
+  "minzoom": 15,
+  "pointRendering": [
+    {
+      "location": [
+        "point",
+        "centroid"
+      ],
+      "marker": [
+        {
+          "icon": "./assets/layers/memorial/memorial.svg",
+          "color": "white"
+        }
+      ],
+      "label": "{name}",
+      "labelCssClasses": "bg-white rounded px-2"
+    }
+  ],
+  "tagRenderings": [
+    "images",
+    {
+      "question": {
+        "en": "What is the Wikipedia page of the person buried here?"
+      },
+      "id": "buried:wikidata",
+      "render": {
+        "en": "{wikipedia(buried:wikidata)}"
+      },
+      "freeform": {
+        "key": "buried:wikidata",
+        "type": "wikidata"
+      }
+    },
+    {
+      "question": {
+        "en": "What is the name of the person buried here?"
+      },
+      "id": "name",
+      "render": {
+        "en": "<b>{name}</b> is buried here"
+      },
+      "freeform": {
+        "key": "name"
+      }
+    }
+  ],
+  "lineRendering": [],
+  "id": "grave",
+  "name": {
+    "en": "Gravestones"
+  },
+  "description": {
+    "en": "Tombstones (and graves) indicate where a person was buried. On this map, those can be recorded and a link to Wikipedia can be made"
+  },
+  "source": {
+    "osmTags": "historic=tomb"
+  },
+  "title": {
+    "render": {
+      "en": "Tombstone"
+    }
+  },
+  "presets": [
+    {
+      "title": {
+        "en": "a tombstone"
+      },
+      "tags": [
+        "historic=tomb"
+      ],
+      "description": {
+        "en": "A tombstone is a physical object which indicates that one or more persons are buried here. It generally has the name, birth date and death date of the person or persons as inscription."
+      }
+    }
+  ],
+  "filter": [
+    {
+      "id": "has_wikidata",
+      "options": [
+        {
+          "question": {
+            "en": "With or without wikidata"
+          }
+        },
+        {
+          "question": {
+            "en": "Has a link to Wikidata"
+          },
+          "osmTags": "buried:wikidata~*"
+        },
+        {
+          "question": {
+            "en": "Has no link to Wikidata"
+          },
+          "osmTags": "buried:wikidata="
+        }
+      ]
+    }
+  ]
+}
diff --git a/assets/layers/memorial/memorial.json b/assets/layers/memorial/memorial.json
index 866a890e0..18a3238a6 100644
--- a/assets/layers/memorial/memorial.json
+++ b/assets/layers/memorial/memorial.json
@@ -78,6 +78,9 @@
         "de": "ein Denkmal",
         "fr": "un mémorial"
       },
+      "description": {
+        "en": "A memorial is a physical object which remembers a person or event."
+      },
       "tags": [
         "historic=memorial"
       ]
@@ -218,6 +221,12 @@
           "addExtraTags": [
             "natural=tree"
           ]
+        },
+        {"if": "historic=tomb",
+          "then": {
+            "en": "This is a gravestone; the person is buried here"
+          },
+          "addExtraTags": ["memorial="]
         }
       ],
       "render": {
diff --git a/assets/themes/memorials/memorials.json b/assets/themes/memorials/memorials.json
index 0cb1a616a..52e07568b 100644
--- a/assets/themes/memorials/memorials.json
+++ b/assets/themes/memorials/memorials.json
@@ -15,7 +15,8 @@
     {
       "builtin": [
         "ghost_bike",
-        "memorial"
+        "memorial",
+        "grave"
       ],
       "override": {
         "minzoom": 9
@@ -23,7 +24,8 @@
     },
     {
       "builtin": [
-        "bench"
+        "bench",
+        "artwork"
       ],
       "override": {
         "minzoom": 18