diff --git a/assets/layers/wayside_shrines/shrine.svg b/assets/layers/wayside_shrines/shrine.svg
new file mode 100644
index 0000000000..1d13b2ef28
--- /dev/null
+++ b/assets/layers/wayside_shrines/shrine.svg
@@ -0,0 +1,31 @@
+<?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"
+   id="svg109"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14">
+  <metadata
+     id="metadata115">
+    <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="defs113" />
+  <path
+     id="rect816"
+     d="M 7 0 L 5 3 L 5 12 L 9 12 L 9 3 L 7 0 z M 7 3.9980469 A 1 1 0 0 1 8 4.9980469 A 1 1 0 0 0 8 5 L 8 8 L 6 8 L 6 5 A 1 1 0 0 0 6 4.9980469 A 1 1 0 0 1 7 3.9980469 z M 4 13 L 4 14 L 10 14 L 10 13 L 4 13 z "
+     style="opacity:1;fill:#555;fill-opacity:1;stroke:none;stroke-width:0.21650636;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
+</svg>
diff --git a/assets/layers/wayside_shrines/shrine.svg.license b/assets/layers/wayside_shrines/shrine.svg.license
new file mode 100644
index 0000000000..547f873e6c
--- /dev/null
+++ b/assets/layers/wayside_shrines/shrine.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Wanderwütiger
+SPDX-License-Identifier: CC0-1.0
diff --git a/assets/layers/wayside_shrines/shrine_example1.jpg b/assets/layers/wayside_shrines/shrine_example1.jpg
new file mode 100644
index 0000000000..6093b3f590
Binary files /dev/null and b/assets/layers/wayside_shrines/shrine_example1.jpg differ
diff --git a/assets/layers/wayside_shrines/shrine_example1.jpg.license b/assets/layers/wayside_shrines/shrine_example1.jpg.license
new file mode 100644
index 0000000000..0ed57fe73b
--- /dev/null
+++ b/assets/layers/wayside_shrines/shrine_example1.jpg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Bastian Greshake Tzovaras
+SPDX-License-Identifier: CC-BY-SA-4.0
diff --git a/assets/layers/wayside_shrines/shrine_example2.jpg b/assets/layers/wayside_shrines/shrine_example2.jpg
new file mode 100644
index 0000000000..a76edb087c
Binary files /dev/null and b/assets/layers/wayside_shrines/shrine_example2.jpg differ
diff --git a/assets/layers/wayside_shrines/shrine_example2.jpg.license b/assets/layers/wayside_shrines/shrine_example2.jpg.license
new file mode 100644
index 0000000000..0ed57fe73b
--- /dev/null
+++ b/assets/layers/wayside_shrines/shrine_example2.jpg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Bastian Greshake Tzovaras
+SPDX-License-Identifier: CC-BY-SA-4.0
diff --git a/assets/layers/wayside_shrines/shrine_example3.jpg b/assets/layers/wayside_shrines/shrine_example3.jpg
new file mode 100644
index 0000000000..4d909a06d3
Binary files /dev/null and b/assets/layers/wayside_shrines/shrine_example3.jpg differ
diff --git a/assets/layers/wayside_shrines/shrine_example3.jpg.license b/assets/layers/wayside_shrines/shrine_example3.jpg.license
new file mode 100644
index 0000000000..0ed57fe73b
--- /dev/null
+++ b/assets/layers/wayside_shrines/shrine_example3.jpg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Bastian Greshake Tzovaras
+SPDX-License-Identifier: CC-BY-SA-4.0
diff --git a/assets/layers/wayside_shrines/wayside_shrines.json b/assets/layers/wayside_shrines/wayside_shrines.json
new file mode 100644
index 0000000000..521bc9ba7c
--- /dev/null
+++ b/assets/layers/wayside_shrines/wayside_shrines.json
@@ -0,0 +1,335 @@
+{
+  "id": "wayside_shrine",
+  "name": {
+    "en": "Wayside Shrines"
+  },
+  "description": {
+    "en": "Shrines are religious places that are dedicated to specific deities, saints and other figures of religious importance. Typically, the contain religious depictions and people frequently leave offerings at those places. Wayside shrines are small small shrines that can be found next to a road or pathway and are frequented by travellers passing by."
+  },
+  "source": {
+    "osmTags": "historic=wayside_shrine"
+  },
+  "minzoom": 12,
+  "title": {
+    "render": {
+      "en": "Wayside Shrine {name}"
+    }
+  },
+  "pointRendering": [
+    {
+      "iconSize": "40,40",
+      "location": [
+        "point"
+      ],
+      "anchor": "center",
+      "marker": [
+        {
+          "icon": "circle",
+          "color": "white"
+        },
+        {
+          "icon": "./assets/layers/wayside_shrines/shrine.svg"
+        }
+      ]
+    }
+  ],
+  "lineRendering": [
+    {
+      "color": "#00f",
+      "width": "8"
+    }
+  ],
+  "presets": [
+    {
+      "tags": [
+        "historic=wayside_shrine"
+      ],
+      "title": {
+        "en": "a wayside shrine"
+      },
+      "description": {
+        "en": "A wayside shrine typically shows a religious depiction, usually placed by a road or pathway. "
+      },
+      "exampleImages": [
+        "./assets/layers/wayside_shrines/shrine_example1.jpg",
+        "./assets/layers/wayside_shrines/shrine_example2.jpg",
+        "./assets/layers/wayside_shrines/shrine_example3.jpg"
+      ]
+    }
+  ],
+  "tagRenderings": [
+    "images",
+    {
+      "question": {
+        "en": "What's the name of this shrine?"
+      },
+      "id": "shrine_name",
+      "freeform": {
+        "key": "name",
+        "type": "string"
+      },
+      "render": {
+        "en": "The name of this shrine is <b>{name}</b>"
+      }
+    },
+    {
+      "question": {
+        "en": "To which religion is this shrine dedicated?"
+      },
+      "id": "religion",
+      "mappings": [
+        {
+          "if": "religion=christian",
+          "then": {
+            "en": "This is a Christian shrine"
+          }
+        },
+        {
+          "if": "religion=buddhist",
+          "then": {
+            "en": "This is a Buddhist shrine"
+          }
+        },
+        {
+          "if": "religion=hindu",
+          "then": {
+            "en": "This is a Hindu shrine"
+          }
+        },
+        {
+          "if": "religion=jain",
+          "then": {
+            "en": "This is a Jain shrine"
+          }
+        },
+        {
+          "if": "religion=jewish",
+          "then": {
+            "en": "This is a Jewish shrine"
+          }
+        },
+        {
+          "if": "religion=muslim",
+          "then": {
+            "en": "This is an Islamic shrine"
+          }
+        },
+        {
+          "if": "religion=pagan",
+          "then": {
+            "en": "This is a Pagan shrine"
+          }
+        },
+        {
+          "if": "religion=shinto",
+          "then": {
+            "en": "This is a Shinto shrine"
+          }
+        },
+        {
+          "if": "religion=sikh",
+          "then": {
+            "en": "This is a Sikh shrine"
+          }
+        },
+        {
+          "if": "religion=taoist",
+          "then": {
+            "en": "This is a Taoist shrine"
+          }
+        },
+        {
+          "if": "religion=zoroastrian",
+          "then": {
+            "en": "This is a Zoroastrian shrine"
+          }
+        }
+      ],
+      "multiAnswer": false,
+      "freeform": {
+        "key": "religion",
+        "type": "string"
+      },
+      "render": {
+        "en": "This shrine is {religion}"
+      }
+    },
+    {
+      "question": {
+        "en": "What's the Christian denomination of the shrine?"
+      },
+      "id": "denomination_christian",
+      "condition": "religion=christian",
+      "mappings": [
+        {
+          "if": "denomination=catholic",
+          "then": {
+            "en": "It's denomination is: Catholic"
+          }
+        },
+        {
+          "if": "denomination=roman_catholic",
+          "then": {
+            "en": "It's denomination is: Roman Catholic"
+          }
+        },
+        {
+          "if": "denomination=orthodox",
+          "then": {
+            "en": "It's denomination is Orthodox"
+          }
+        },
+        {
+          "if": "denomination=greek_orthodox",
+          "then": {
+            "en": "It's denomination is Greek-Orthodox"
+          }
+        },
+        {
+          "if": "denomination=russian_orthodox",
+          "then": {
+            "en": "It's denomination is Russian-Orthodox"
+          }
+        },
+        {
+          "if": "denomination=serbian_orthodox",
+          "then": {
+            "en": "It's denomination is Serbian Orthodox"
+          }
+        },
+        {
+          "if": "denomination=protestant",
+          "then": {
+            "en": "It's denomination is Protestant"
+          }
+        },
+        {
+          "if": "denomination=anglican",
+          "then": {
+            "en": "It's denomination is Anglican"
+          }
+        },
+        {
+          "if": "denomination=adventist",
+          "then": {
+            "en": "It's denomination is Adventist"
+          }
+        },
+        {
+          "if": "denomination=evangelical",
+          "then": {
+            "en": "It's denomination is evangelical"
+          }
+        }
+      ],
+      "render": {
+        "en": "Other denomination: {denomination}"
+      },
+      "freeform": {
+        "key": "denomination"
+      }
+    },
+    {
+      "mappings": [
+        {
+          "if": "denomination=shia",
+          "then": {
+            "en": "It's denomination is Shia"
+          }
+        },
+        {
+          "if": "denomination=sunni",
+          "then": {
+            "en": "It's denomination is Sunni"
+          }
+        },
+        {
+          "if": "denomination=sufi",
+          "then": {
+            "en": "It's denomination is Sufi"
+          }
+        }
+      ],
+      "id": "denomination_muslim",
+      "freeform": {
+        "key": "denomination"
+      },
+      "render": {
+        "en": "It's denomination is {denomination}"
+      },
+      "question": {
+        "en": "What's the Muslim denomination of this shrine?"
+      },
+      "condition": "religion=muslim"
+    },
+    {
+      "mappings": [
+        {
+          "if": "denomination=conservative",
+          "then": {
+            "en": "It's denomination is Conservative"
+          }
+        },
+        {
+          "if": "denomination=orthodox",
+          "then": {
+            "en": "It's denomination is Orthodox"
+          }
+        },
+        {
+          "if": "denomination=hasidic",
+          "then": {
+            "en": "It's denomination is Hasidic"
+          }
+        },
+        {
+          "if": "denomination=reform",
+          "then": {
+            "en": "It's denomination is Reform"
+          }
+        }
+      ],
+      "id": "denomination_jewish",
+      "freeform": {
+        "key": "denomination"
+      },
+      "render": {
+        "en": "It's denomination is {denomination}"
+      },
+      "question": {
+        "en": "What's the Jewish denomination of this shrine?"
+      },
+      "condition": "religion=jewish"
+    },
+    {
+      "question": {
+        "en": "What's the denomination of this shrine?"
+      },
+      "id": "denomination_other",
+      "render": {
+        "en": "The denomination of this shrine is: {denomination}"
+      },
+      "freeform": {
+        "key": "denomination"
+      },
+      "condition": {
+        "and": [
+          "religion!=christian",
+          "religion!=muslim",
+          "religion!=jewish"
+        ]
+      }
+    }
+  ],
+  "deletion": {
+    "softDeletionTags": {
+      "and": [
+        "disused:historic:={historic}",
+        "historic="
+      ]
+    },
+    "neededChangesets": 1
+  },
+  "credits": "Bastian Greshake Tzovaras",
+  "credits:uid": 20617622
+}
diff --git a/assets/themes/wayside_shrines/shrine.svg b/assets/themes/wayside_shrines/shrine.svg
new file mode 100644
index 0000000000..1d13b2ef28
--- /dev/null
+++ b/assets/themes/wayside_shrines/shrine.svg
@@ -0,0 +1,31 @@
+<?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"
+   id="svg109"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14">
+  <metadata
+     id="metadata115">
+    <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="defs113" />
+  <path
+     id="rect816"
+     d="M 7 0 L 5 3 L 5 12 L 9 12 L 9 3 L 7 0 z M 7 3.9980469 A 1 1 0 0 1 8 4.9980469 A 1 1 0 0 0 8 5 L 8 8 L 6 8 L 6 5 A 1 1 0 0 0 6 4.9980469 A 1 1 0 0 1 7 3.9980469 z M 4 13 L 4 14 L 10 14 L 10 13 L 4 13 z "
+     style="opacity:1;fill:#555;fill-opacity:1;stroke:none;stroke-width:0.21650636;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
+</svg>
diff --git a/assets/themes/wayside_shrines/shrine.svg.license b/assets/themes/wayside_shrines/shrine.svg.license
new file mode 100644
index 0000000000..547f873e6c
--- /dev/null
+++ b/assets/themes/wayside_shrines/shrine.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Wanderwütiger
+SPDX-License-Identifier: CC0-1.0
diff --git a/assets/themes/wayside_shrines/wayside_shrines.json b/assets/themes/wayside_shrines/wayside_shrines.json
new file mode 100644
index 0000000000..8c1a249a3f
--- /dev/null
+++ b/assets/themes/wayside_shrines/wayside_shrines.json
@@ -0,0 +1,13 @@
+{
+  "id": "wayside_shrines",
+  "title": {
+    "en": "Wayside shrines"
+  },
+  "description": {
+    "en": "This map shows shrines found on the side of roads and paths, and allows adding new ones"
+  },
+  "icon": "./assets/themes/wayside_shrines/shrine.svg",
+  "layers": [
+    "wayside_shrines"
+  ]
+}