diff --git a/assets/layers/ghost_bike/ghost_bike.json b/assets/layers/ghost_bike/ghost_bike.json
index f50dabfc3..8f50e2a74 100644
--- a/assets/layers/ghost_bike/ghost_bike.json
+++ b/assets/layers/ghost_bike/ghost_bike.json
@@ -48,6 +48,16 @@
       "ca": "Bicicleta blanca"
     },
     "mappings": [
+      {
+        "if": "subject~*",
+        "then": {
+          "en": "Ghost bike in the remembrance of {subject}",
+          "nl": "Witte fiets ter nagedachtenis van {subject}",
+          "de": "Geisterrad im Gedenken an {subject}",
+          "it": "Bici fantasma in ricordo di {subject}",
+          "fr": "Vélo fantôme en souvenir de {subject}"
+        }
+      },
       {
         "if": "name~*",
         "then": {
@@ -111,17 +121,30 @@
         "fr": "À qui est dédié ce vélo fantôme ?"
       },
       "render": {
-        "en": "In remembrance of {name}",
-        "nl": "Ter nagedachtenis van {name}",
-        "de": "Im Gedenken an {name}",
-        "it": "In ricordo di {name}",
-        "fr": "En souvenir de {name}",
-        "ru": "В знак памяти о {name}"
+        "en": "In remembrance of {subject}",
+        "nl": "Ter nagedachtenis van {subject}",
+        "de": "Im Gedenken an {subject}",
+        "it": "In ricordo di {subject}",
+        "fr": "En souvenir de {subject}",
+        "ru": "В знак памяти о {subject}"
       },
       "freeform": {
-        "key": "name"
+        "key": "subject",
+        "addExtraTags": ["noname=","name="]
       },
       "mappings": [
+        {
+          "if": "name~*",
+          "then": {
+            "en": "In remembrance of {name}",
+            "nl": "Ter nagedachtenis van {name}",
+            "de": "Im Gedenken an {name}",
+            "it": "In ricordo di {name}",
+            "fr": "En souvenir de {name}",
+            "ru": "В знак памяти о {name}"
+          },
+          "hideInAnswer": true
+        },
         {
           "if": "noname=yes",
           "then": {
@@ -131,7 +154,8 @@
             "it": "Nessun nome scritto sulla bici",
             "fr": "Aucun nom n'est marqué sur le vélo",
             "ca": "No hi ha cap nom marcat a la bicicleta"
-          }
+          },
+          "addExtraTags": ["name=","subject="]
         }
       ],
       "id": "ghost_bike-name",
diff --git a/assets/layers/memorial/license_info.json b/assets/layers/memorial/license_info.json
new file mode 100644
index 000000000..3d4379d1c
--- /dev/null
+++ b/assets/layers/memorial/license_info.json
@@ -0,0 +1,12 @@
+[
+  {
+    "path": "plaque.svg",
+    "license": "CC-0",
+    "authors": [
+      "OSM Carto"
+    ],
+    "sources": [
+      "https://wiki.openstreetmap.org/wiki/File:Plaque.svg"
+    ]
+  }
+]
\ No newline at end of file
diff --git a/assets/layers/memorial/memorial.json b/assets/layers/memorial/memorial.json
new file mode 100644
index 000000000..9515842e9
--- /dev/null
+++ b/assets/layers/memorial/memorial.json
@@ -0,0 +1,41 @@
+{
+  "id": "memorial",
+  "description": "Layer showing memorial plaques, based upon a unofficial theme. Can be expanded to have multiple types of memorials later on",
+  "source": {
+    "osmTags": "memorial=plaque"
+  },
+  "title": {
+    "render": {
+      "en": "Memorial plaque"
+    }
+  },
+  "tagRenderings": [
+    {
+      "id": "inscription",
+      "question": {
+        "en": "What is the inscription of this plaque?"
+      },
+      "render": {
+        "en": "The inscription on this plaque reads: <p><i>{inscription}<i></p>"
+      },
+      "freeform": {
+        "key": "inscription",
+        "type": "text"
+      }
+    }
+  ],
+  "mapRendering": [
+    {
+      "location": [
+        "centroid",
+        "point"
+      ],
+      "icon": "circle:white;./assets/layers/memorial/plaque.svg"
+    }
+  ],
+  "deletion": true,
+  "allowMove": {
+    "enableImproveAccuracy": true,
+    "enableRelocation": false
+  }
+}
diff --git a/assets/layers/memorial/plaque.svg b/assets/layers/memorial/plaque.svg
new file mode 100644
index 000000000..e91e9efe4
--- /dev/null
+++ b/assets/layers/memorial/plaque.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+   <path
+     style="fill:#734a08;fill-opacity:1;stroke:none"
+     id="plaque"
+     d="M 2.5,2 C 1.6887616,2 1,2.6887616 1,3.5 l 0,7 C 1,11.269291 1.667788,12 2.5,12 l 9,0 c 0.748318,0 1.5,-0.709735 1.5,-1.5 l 0,-7 C 13,2.7307086 12.269291,2 11.5,2 z m 0,1 C 2.7761424,3 3,3.2238576 3,3.5 3,3.7761424 2.7761424,4 2.5,4 2.2238576,4 2,3.7761424 2,3.5 2,3.2238576 2.2238576,3 2.5,3 z m 9,0 C 11.776142,3 12,3.2238576 12,3.5 12,3.7761424 11.776142,4 11.5,4 11.223858,4 11,3.7761424 11,3.5 11,3.2238576 11.223858,3 11.5,3 z M 5,4 6,4 6,5 5,5 z M 7,4 9,4 9,5 7,5 z M 3,6 11,6 11,7 3,7 z M 5,8 9,8 9,9 5,9 z M 2.5,10 C 2.7761424,10 3,10.223858 3,10.5 3,10.776142 2.7761424,11 2.5,11 2.2238576,11 2,10.776142 2,10.5 2,10.223858 2.2238576,10 2.5,10 z m 9,0 C 11.776142,10 12,10.223858 12,10.5 12,10.776142 11.776142,11 11.5,11 11.223858,11 11,10.776142 11,10.5 11,10.223858 11.223858,10 11.5,10 z" />
+</svg>