diff --git a/assets/layers/route_marker/license_info.json b/assets/layers/route_marker/license_info.json
new file mode 100644
index 000000000..e8f5acb07
--- /dev/null
+++ b/assets/layers/route_marker/license_info.json
@@ -0,0 +1,10 @@
+[
+  {
+    "path": "route_marker.svg",
+    "license": "CC0-1.0",
+    "authors": [
+      "Robin van der Linde"
+    ],
+    "sources": []
+  }
+]
\ No newline at end of file
diff --git a/assets/layers/route_marker/route_marker.json b/assets/layers/route_marker/route_marker.json
new file mode 100644
index 000000000..b30833a93
--- /dev/null
+++ b/assets/layers/route_marker/route_marker.json
@@ -0,0 +1,93 @@
+{
+  "id": "route_marker",
+  "name": {
+    "en": "Route markers"
+  },
+  "description": {
+    "en": "Route markers are small markers often found along official hiking/cycling/riding/skiing routes to indicate the direction of the route."
+  },
+  "source": {
+    "osmTags": "information=route_marker"
+  },
+  "minzoom": 14,
+  "presets": [
+    {
+      "title": {
+        "en": "a route marker"
+      },
+      "tags": [
+        "tourism=information",
+        "information=route_marker"
+      ],
+      "description": {
+        "en": "A route marker is a small marker often found along official hiking/cycling/riding/skiing routes to indicate the direction of the route."
+      }
+    }
+  ],
+  "deletion": true,
+  "allowMove": {
+    "enableImproveAccuracy": true,
+    "enableRelocation": false
+  },
+  "title": {
+    "render": {
+      "en": "Route marker"
+    }
+  },
+  "mapRendering": [
+    {
+      "location": [
+        "centroid",
+        "point"
+      ],
+      "icon": "./assets/layers/route_marker/route_marker.svg"
+    }
+  ],
+  "tagRenderings": [
+    "images",
+    {
+      "id": "type",
+      "question": {
+        "en": "For what kind of route is this marker?"
+      },
+      "multiAnswer": true,
+      "mappings": [
+        {
+          "if": "bicycle=yes",
+          "ifnot": "biycle=no",
+          "then": {
+            "en": "This is a route marker for a bicycle route."
+          }
+        },
+        {
+          "if": "hiking=yes",
+          "ifnot": "hiking=no",
+          "then": {
+            "en": "This is a route marker for a hiking route."
+          }
+        },
+        {
+          "if": "mtb=yes",
+          "ifnot": "mtb=no",
+          "then": {
+            "en": "This is a route marker for a mountain bike route."
+          }
+        },
+        {
+          "if": "horse=yes",
+          "ifnot": "horse=no",
+          "then": {
+            "en": "This is a route marker for a horse riding route."
+          }
+        },
+        {
+          "if": "ski=yes",
+          "ifnot": "ski=no",
+          "then": {
+            "en": "This is a route marker for a ski route."
+          }
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/assets/layers/route_marker/route_marker.svg b/assets/layers/route_marker/route_marker.svg
new file mode 100644
index 000000000..7dd5e4a1b
--- /dev/null
+++ b/assets/layers/route_marker/route_marker.svg
@@ -0,0 +1,6 @@
+<svg width="500" height="500" viewBox="0 0 500 500" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="500" height="500" rx="50" fill="#D9D9D9"/>
+<rect x="32.5" y="32.5" width="435" height="435" rx="42.5" stroke="black" stroke-width="15"/>
+<circle cx="250" cy="250" r="172.5" stroke="black" stroke-width="15"/>
+<path d="M125 235C116.716 235 110 241.716 110 250C110 258.284 116.716 265 125 265V235ZM385.607 260.607C391.464 254.749 391.464 245.251 385.607 239.393L290.147 143.934C284.289 138.076 274.792 138.076 268.934 143.934C263.076 149.792 263.076 159.289 268.934 165.147L353.787 250L268.934 334.853C263.076 340.711 263.076 350.208 268.934 356.066C274.792 361.924 284.289 361.924 290.147 356.066L385.607 260.607ZM125 265H375V235H125V265Z" fill="black"/>
+</svg>
diff --git a/assets/layers/route_marker/route_marker.svg.license b/assets/layers/route_marker/route_marker.svg.license
new file mode 100644
index 000000000..75299f884
--- /dev/null
+++ b/assets/layers/route_marker/route_marker.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Robin van der Linde
+SPDX-License-Identifier: CC0-1.0
\ No newline at end of file
diff --git a/assets/layers/vending_machine/vending_machine.json b/assets/layers/vending_machine/vending_machine.json
index 8bb4e740b..ca193086e 100644
--- a/assets/layers/vending_machine/vending_machine.json
+++ b/assets/layers/vending_machine/vending_machine.json
@@ -525,15 +525,15 @@
           },
           {
             "if": "vending=meat",
-            "then": "./assets/layers/id_presets/temaki-meat.svg"
+            "then": "circle:white;./assets/layers/id_presets/temaki-meat.svg"
           },
           {
             "if": "vending=fruit",
-            "then": "./assets/layers/vending_machine/fruits.svg"
+            "then": "circle:white;./assets/layers/vending_machine/fruits.svg"
           },
           {
             "if": "vending=strawberries",
-            "then": "./assets/layers/vending_machine/strawberry.svg"
+            "then": "circle:white;./assets/layers/vending_machine/strawberry.svg"
           },
           {
             "if": "vending=flowers",
@@ -678,7 +678,7 @@
               "vending~.*meat.*"
             ]
           },
-          "then": "./assets/layers/id_presets/temaki-meat.svg"
+          "then": "circle:white;./assets/layers/id_presets/temaki-meat.svg"
         },
         {
           "if": {
@@ -687,7 +687,7 @@
               "vending~.*fruit.*"
             ]
           },
-          "then": "./assets/layers/vending_machine/fruits.svg"
+          "then": "circle:white;./assets/layers/vending_machine/fruits.svg"
         },
         {
           "if": {
@@ -696,7 +696,7 @@
               "vending~.*strawberries.*"
             ]
           },
-          "then": "./assets/layers/vending_machine/strawberry.svg"
+          "then": "circle:white;./assets/layers/vending_machine/strawberry.svg"
         },
         {
           "if": {
diff --git a/assets/svg/cross.svg.license b/assets/svg/cross.svg.license
index 2452bee1e..ed0288300 100644
--- a/assets/svg/cross.svg.license
+++ b/assets/svg/cross.svg.license
@@ -1,2 +1,2 @@
 SPDX-FileCopyrightText: Pieter Vander Vennet
-SPDX-License-Identifier: CC0
\ No newline at end of file
+SPDX-License-Identifier: CC0-1.0
\ No newline at end of file
diff --git a/assets/themes/cyclenodes/cyclenodes.json b/assets/themes/cyclenodes/cyclenodes.json
index 5789a55cc..5d208d1c7 100644
--- a/assets/themes/cyclenodes/cyclenodes.json
+++ b/assets/themes/cyclenodes/cyclenodes.json
@@ -27,19 +27,14 @@
   "startLat": 51.755515,
   "startLon": 14.327545,
   "startZoom": 11,
-  "widenFactor": 0.05,
-  "clustering": {
-    "maxZoom": 11,
-    "minNeededElements": 1000000
-  },
   "layers": [
     {
       "id": "node2node",
       "name": {
-        "en": "node to node links",
+        "en": "Node to node links",
         "de": "Knotenpunktverbindungen",
         "es": "enlaces nodo a nodo",
-        "nl": "verbindingen van node naar node",
+        "nl": "Verbindingen van node naar node",
         "fr": "liens noeud à noeud",
         "ca": "enllaços node a node",
         "cs": "propojení mezi uzly",
@@ -57,10 +52,10 @@
       "minzoom": 12,
       "title": {
         "render": {
-          "en": "node to node link",
+          "en": "Node to node link",
           "de": "Knotenpunktverbindung",
           "es": "enlace nodo a nodo",
-          "nl": "node-naar-node verbinding",
+          "nl": "Node-naar-node verbinding",
           "fr": "lien noeud à noeud",
           "ca": "Enllaç node a node",
           "cs": "propojení mezi uzly",
@@ -70,10 +65,10 @@
           {
             "if": "ref~*",
             "then": {
-              "en": "node to node link <strong>{ref}</strong>",
+              "en": "Node to node link <strong>{ref}</strong>",
               "de": "Knotenpunktverbindung <strong>{ref}</strong>",
               "es": "enlace nodo a nodo <strong>{ref}</strong>",
-              "nl": "node-naar-node verbinding <strong>{ref}</strong>",
+              "nl": "Node-naar-node verbinding <strong>{ref}</strong>",
               "fr": "lien noeud à noeud <strong>{ref}</strong>",
               "ca": "Enllaç node a node <strong>{ref}</strong>",
               "cs": "propojení mezi uzly <strong>{ref}</strong>",
@@ -90,36 +85,29 @@
       ],
       "tagRenderings": [
         {
-          "question": {
-            "en": "When was this node to node link last surveyed?",
-            "de": "Wann wurde diese Knotenpunktverbindung zuletzt überprüft?",
-            "es": "¿Cuándo se sondeó este enlace nodo a nodo por última vez?",
-            "nl": "Wanneer werd deze node-naar-node verbinding het laast gesurveyed?",
-            "fr": "Quand cette liaison de nœud à nœud a-t-elle été contrôlée sur le terrain pour la dernière fois ?",
-            "ca": "Quan es va comprovar per última vegada aquest enllaç node a node presencialment?",
-            "cs": "Kdy bylo toto propojení mezi uzly naposledy zkontrolováno?",
-            "pl": "Kiedy ostatnio badano to połączenie węzła z węzłem?"
-          },
-          "render": {
-            "en": "This node to node link was last surveyed on {survey:date}",
-            "de": "Diese Knotenpunktverbindung wurde zuletzt am {survey:date} überprüft",
-            "es": "Este enlace nodo a nodo se sondeó por última vez el {survey:date}",
-            "nl": "Deze node-naar-node verbinding werd het laast gesurveyed op {survey:date}",
-            "fr": "Cette lien de nœud à nœud a été vérifié sur le terrain le {survey:date}",
-            "ca": "Aquest enllaç node a node es va sondejar per última vegada el {survey:date}",
-            "cs": "Toto propojení mezi uzly bylo naposledy zkontrolováno dne {survey:date}",
-            "pl": "To połączenie węzła z węzłem było ostatnio sprawdzane w dniu {survey:date}"
-          },
-          "freeform": {
-            "key": "survey:date",
-            "type": "date"
-          },
-          "mappings": [
-            {
-              "if": "survey:date:={_now:date}",
-              "then": "Surveyed today!"
+          "builtin": "survey_date",
+          "override": {
+            "question": {
+              "en": "When was this node to node link last surveyed?",
+              "de": "Wann wurde diese Knotenpunktverbindung zuletzt überprüft?",
+              "es": "¿Cuándo se sondeó este enlace nodo a nodo por última vez?",
+              "nl": "Wanneer werd deze node-naar-node verbinding het laast gesurveyed?",
+              "fr": "Quand cette liaison de nœud à nœud a-t-elle été contrôlée sur le terrain pour la dernière fois ?",
+              "ca": "Quan es va comprovar per última vegada aquest enllaç node a node presencialment?",
+              "cs": "Kdy bylo toto propojení mezi uzly naposledy zkontrolováno?",
+              "pl": "Kiedy ostatnio badano to połączenie węzła z węzłem?"
+            },
+            "render": {
+              "en": "This node to node link was last surveyed on {survey:date}",
+              "de": "Diese Knotenpunktverbindung wurde zuletzt am {survey:date} überprüft",
+              "es": "Este enlace nodo a nodo se sondeó por última vez el {survey:date}",
+              "nl": "Deze node-naar-node verbinding werd het laast gesurveyed op {survey:date}",
+              "fr": "Cette lien de nœud à nœud a été vérifié sur le terrain le {survey:date}",
+              "ca": "Aquest enllaç node a node es va sondejar per última vegada el {survey:date}",
+              "cs": "Toto propojení mezi uzly bylo naposledy zkontrolováno dne {survey:date}",
+              "pl": "To połączenie węzła z węzłem było ostatnio sprawdzane w dniu {survey:date}"
             }
-          ],
+          },
           "id": "node2node-survey:date"
         },
         "export_as_gpx"
@@ -128,12 +116,12 @@
     {
       "id": "node",
       "name": {
-        "en": "nodes",
+        "en": "Nodes",
         "de": "Knotenpunkte",
         "ca": "nodes",
         "es": "nodos",
         "nb_NO": "noder",
-        "nl": "knooppunten",
+        "nl": "Knooppunten",
         "fr": "noeuds",
         "pa_PK": "نوڈ",
         "cs": "uzly",
@@ -157,11 +145,11 @@
             "mappings": [
               {
                 "if": "rcn_ref~*",
-                "then": "<div style='position: absolute; top: 10px; right: 10px; color: white; background-color: #00a703; width: 20px; height: 20px; border-radius: 100%'>{rcn_ref}</div>"
+                "then": "<div style='position: absolute; top: -10px; right: -10px; color: white; background-color: #00a703; width: 20px; height: 20px; border-radius: 100%'>{rcn_ref}</div>"
               },
               {
                 "if": "rcn_ref=",
-                "then": "<div style='position: absolute; top: 10px; right: 10px; color: white; background-color: #00a703; width: 20px; height: 20px; border-radius: 100%'>?</div>"
+                "then": "<div style='position: absolute; top: -10px; right: -10px; color: white; background-color: #00a703; width: 20px; height: 20px; border-radius: 100%'>?</div>"
               }
             ]
           }
@@ -170,11 +158,11 @@
       "minzoom": 12,
       "title": {
         "render": {
-          "en": "cycle node <strong>{rcn_ref}</strong>",
+          "en": "Cycle node <strong>{rcn_ref}</strong>",
           "de": "Knotenpunkt <strong>{rcn_ref}</strong>",
           "es": "nodo ciclista <strong>{rcn_ref}</strong>",
           "nb_NO": "sykkelnode <strong>{rcn_ref}</strong>",
-          "nl": "fietsknooppunt <strong>{rcn_ref}</strong>",
+          "nl": "Fietsknooppunt <strong>{rcn_ref}</strong>",
           "fr": "nœud cycliste <strong>{rcn_ref}</strong>",
           "ca": "node ciclista <strong>{rcn_ref}</strong>",
           "cs": "uzel cyklu <strong>{rcn_ref}</strong>",
@@ -183,36 +171,48 @@
       },
       "tagRenderings": [
         {
+          "id": "node-rxn_ref",
           "question": {
-            "en": "When was this cycle node last surveyed?",
-            "de": "Wann wurde dieser Fahrradknotenpunkt zuletzt überprüft?",
-            "es": "¿Cuándo fue sondeado este nodo ciclista por última vez?",
-            "nl": "Wanneer is dit fietsknooppunt voor het laatst gecontroleerd?",
-            "fr": "Quand ce nœud cyclable a-t-il été vérifié sur le terrain pour la dernière fois ?",
-            "ca": "Quan va ser sondejat aquest node ciclista per última vegada?",
-            "cs": "Kdy byl tento uzel cyklu naposledy zkontrolován?",
-            "pl": "Kiedy ostatni raz badano ten węzeł rowerowy?"
-          },
-          "render": {
-            "en": "This cycle node was last surveyed on {survey:date}",
-            "de": "Dieser Fahrradknoten wurde zuletzt überprüft am {survey:date}",
-            "es": "Este nodo ciclista se sondeó por última vez el {survey:date}",
-            "nl": "Dit fietsknooppunt is voor het laatst gecontroleerd op {survey:date}",
-            "fr": "Ce nœud cycliste a été verifié pour la dernière fois le {survey:date}",
-            "ca": "Aquest node ciclista es va sondejar per última vegada el {survey:date}",
-            "cs": "Tento uzel cyklu byl naposledy zkontrolován dne {survey:date}",
-            "pl": "Ten węzeł rowerowy był ostatnio badany w dniu {survey:date}"
+            "en": "What is the reference number of this cycling node?",
+            "nl": "Wat is het referentienummer van dit fietsknooppunt?"
           },
           "freeform": {
-            "key": "survey:date",
-            "type": "date"
-          },
-          "mappings": [
-            {
-              "if": "survey:date:={_now:date}",
-              "then": "Surveyed today!"
+            "key": "rcn_ref",
+            "type": "int",
+            "placeholder": {
+              "en": "e.g. 1",
+              "nl": "bijv. 1"
             }
-          ],
+          },
+          "render": {
+            "en": "This cycling node has reference number {rcn_ref}",
+            "nl": "Dit fietsknooppunt heeft referentienummer {rcn_ref}"
+          }
+        },
+        {
+          "builtin": "survey_date",
+          "override": {
+            "question": {
+              "en": "When was this cycle node last surveyed?",
+              "de": "Wann wurde dieser Fahrradknotenpunkt zuletzt überprüft?",
+              "es": "¿Cuándo fue sondeado este nodo ciclista por última vez?",
+              "nl": "Wanneer is dit fietsknooppunt voor het laatst gecontroleerd?",
+              "fr": "Quand ce nœud cyclable a-t-il été vérifié sur le terrain pour la dernière fois ?",
+              "ca": "Quan va ser sondejat aquest node ciclista per última vegada?",
+              "cs": "Kdy byl tento uzel cyklu naposledy zkontrolován?",
+              "pl": "Kiedy ostatni raz badano ten węzeł rowerowy?"
+            },
+            "render": {
+              "en": "This cycle node was last surveyed on {survey:date}",
+              "de": "Dieser Fahrradknoten wurde zuletzt überprüft am {survey:date}",
+              "es": "Este nodo ciclista se sondeó por última vez el {survey:date}",
+              "nl": "Dit fietsknooppunt is voor het laatst gecontroleerd op {survey:date}",
+              "fr": "Ce nœud cycliste a été verifié pour la dernière fois le {survey:date}",
+              "ca": "Aquest node ciclista es va sondejar per última vegada el {survey:date}",
+              "cs": "Tento uzel cyklu byl naposledy zkontrolován dne {survey:date}",
+              "pl": "Ten węzeł rowerowy był ostatnio badany w dniu {survey:date}"
+            }
+          },
           "id": "node-survey:date"
         },
         {
@@ -238,12 +238,70 @@
           },
           "freeform": {
             "key": "expected_rcn_route_relations",
-            "type": "int"
+            "type": "int",
+            "placeholder": {
+              "en": "e.g. 3",
+              "nl": "bijv. 3"
+            }
           },
           "id": "node-expected_rcn_route_relations"
         },
         "images"
+      ],
+      "presets": [
+        {
+          "tags": [
+            "rcn_ref=?",
+            "network:type=node_network"
+          ],
+          "title": {
+            "en": "a cycling node",
+            "nl": "een fietsknooppunt"
+          },
+          "snapToLayer": [
+            "cycleways_and_roads"
+          ]
+        }
       ]
+    },
+    {
+      "builtin": [
+        "guidepost"
+      ],
+      "override": {
+        "minzoom": 16
+      }
+    },
+    {
+      "builtin": "route_marker",
+      "override": {
+        "minzoom": 16,
+        "mapRendering": [
+          {
+            "icon": "./assets/themes/cyclenodes/route_marker.svg"
+          }
+        ],
+        "presets": [
+          {
+            "tags": [
+              "tourism=information",
+              "information=route_marker",
+              "network:type=node_network",
+              "bicycle=yes"
+            ],
+            "title": {
+              "en": "a route marker for a node to node link"
+            }
+          }
+        ]
+      }
+    },
+    {
+      "builtin": "cycleways_and_roads",
+      "override": {
+        "name": null,
+        "shownByDefault": false
+      }
     }
   ],
   "credits": "Sebastian Kürten"
diff --git a/assets/themes/cyclenodes/license_info.json b/assets/themes/cyclenodes/license_info.json
index 469e824d7..faf7743b7 100644
--- a/assets/themes/cyclenodes/license_info.json
+++ b/assets/themes/cyclenodes/license_info.json
@@ -8,5 +8,16 @@
     "sources": [
       "https://github.com/mobanisto/MapComplete/commit/1aeb1fdb5b09908d67907f3c816152bfebfdcc79"
     ]
+  },
+  {
+    "path": "route_marker.svg",
+    "license": "CC0-1.0",
+    "authors": [
+      "Robin van der Linde",
+      "MarianSigler"
+    ],
+    "sources": [
+      "https://commons.wikimedia.org/wiki/File:Sinnbild_Radfahrer,_StVO_1992.svg"
+    ]
   }
 ]
\ No newline at end of file
diff --git a/assets/themes/cyclenodes/logo.svg b/assets/themes/cyclenodes/logo.svg
index 6a860858a..3d44d5d96 100644
--- a/assets/themes/cyclenodes/logo.svg
+++ b/assets/themes/cyclenodes/logo.svg
@@ -15,13 +15,13 @@
   </defs>
   <g id="surface1">
     <path style=" stroke:none;fill-rule:nonzero;fill:rgb(66.666669%,66.666669%,66.666669%);fill-opacity:1;" d="M 171.210938 241.640625 L 203.789062 241.640625 L 203.789062 375 L 171.210938 375 Z M 171.210938 241.640625 "/>
-    <path style="fill:none;stroke-width:2.645833;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(66.666669%,0%,0%);stroke-opacity:1;stroke-miterlimit:4;" d="M 55.107742 115.305972 L 12.351349 115.478227 L 5.899374 106.073116 L 12.297606 96.628042 L 55.055376 96.455787 Z M 55.107742 115.305972 " transform="matrix(2.834646,0,0,2.834646,0.0000216266,0)"/>
-    <path style="fill:none;stroke-width:2.645833;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(66.666669%,0%,0%);stroke-opacity:1;stroke-miterlimit:4;" d="M 77.183915 96.628042 L 119.940307 96.455787 L 126.392282 105.860898 L 119.994051 115.305972 L 77.23628 115.478227 Z M 77.183915 96.628042 " transform="matrix(2.834646,0,0,2.834646,0.0000216266,0)"/>
-    <path style=" stroke:none;fill-rule:nonzero;fill:rgb(66.666669%,0%,0%);fill-opacity:1;" d="M 97.707031 25.722656 L 277.292969 25.722656 C 287.296875 25.722656 295.40625 33.832031 295.40625 43.835938 L 295.40625 223.527344 C 295.40625 233.53125 287.296875 241.640625 277.292969 241.640625 L 97.707031 241.640625 C 87.703125 241.640625 79.59375 233.53125 79.59375 223.527344 L 79.59375 43.835938 C 79.59375 33.832031 87.703125 25.722656 97.707031 25.722656 Z M 97.707031 25.722656 "/>
+    <path style="fill:none;stroke-width:2.645833;stroke-linecap:round;stroke-linejoin:round;stroke:#00a703;stroke-opacity:1;stroke-miterlimit:4;" d="M 55.107742 115.305972 L 12.351349 115.478227 L 5.899374 106.073116 L 12.297606 96.628042 L 55.055376 96.455787 Z M 55.107742 115.305972 " transform="matrix(2.834646,0,0,2.834646,0.0000216266,0)"/>
+    <path style="fill:none;stroke-width:2.645833;stroke-linecap:round;stroke-linejoin:round;stroke:#00a703;stroke-opacity:1;stroke-miterlimit:4;" d="M 77.183915 96.628042 L 119.940307 96.455787 L 126.392282 105.860898 L 119.994051 115.305972 L 77.23628 115.478227 Z M 77.183915 96.628042 " transform="matrix(2.834646,0,0,2.834646,0.0000216266,0)"/>
+    <path style=" stroke:none;fill-rule:nonzero;fill:#00a703;fill-opacity:1;" d="M 97.707031 25.722656 L 277.292969 25.722656 C 287.296875 25.722656 295.40625 33.832031 295.40625 43.835938 L 295.40625 223.527344 C 295.40625 233.53125 287.296875 241.640625 277.292969 241.640625 L 97.707031 241.640625 C 87.703125 241.640625 79.59375 233.53125 79.59375 223.527344 L 79.59375 43.835938 C 79.59375 33.832031 87.703125 25.722656 97.707031 25.722656 Z M 97.707031 25.722656 "/>
     <path style="fill:none;stroke-width:1.314561;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(94.509804%,94.509804%,94.509804%);stroke-opacity:1;stroke-miterlimit:4;" d="M 79.472401 210.601225 C 79.472401 220.491246 71.454946 228.508701 61.564925 228.508701 C 51.674905 228.508701 43.657449 220.491246 43.657449 210.601225 C 43.657449 200.71206 51.674905 192.694605 61.564925 192.694605 C 71.454946 192.694605 79.472401 200.71206 79.472401 210.601225 Z M 79.472401 210.601225 " transform="matrix(4.56426,0,0,4.56426,-93.49832,-827.55904)"/>
     <g style="fill:rgb(100%,100%,100%);fill-opacity:1;">
       <use xlink:href="#glyph0-1" x="135.285156" y="167.144332"/>
       <use xlink:href="#glyph0-2" x="190.056275" y="167.144332"/>
     </g>
   </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/assets/themes/cyclenodes/route_marker.svg b/assets/themes/cyclenodes/route_marker.svg
new file mode 100644
index 000000000..c5c49be16
--- /dev/null
+++ b/assets/themes/cyclenodes/route_marker.svg
@@ -0,0 +1,8 @@
+<svg width="500" height="700" viewBox="0 0 500 700" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="500" height="700" rx="50" fill="#D9D9D9"/>
+<rect x="32.5" y="32.5" width="435" height="635" rx="42.5" stroke="#00A703" stroke-width="15"/>
+<path d="M125 185C116.716 185 110 191.716 110 200C110 208.284 116.716 215 125 215V185ZM385.607 210.607C391.464 204.749 391.464 195.251 385.607 189.393L290.147 93.934C284.289 88.0761 274.792 88.0761 268.934 93.934C263.076 99.7918 263.076 109.289 268.934 115.147L353.787 200L268.934 284.853C263.076 290.711 263.076 300.208 268.934 306.066C274.792 311.924 284.289 311.924 290.147 306.066L385.607 210.607ZM125 215H375V185H125V215Z" fill="#00A703"/>
+<path d="M150.25 599.5C181.371 599.5 206.6 574.271 206.6 543.15C206.6 512.029 181.371 486.8 150.25 486.8C119.129 486.8 93.9 512.029 93.9 543.15C93.9 574.271 119.129 599.5 150.25 599.5Z" stroke="#00A703" stroke-width="14"/>
+<path d="M351.5 598.45C382.621 598.45 407.85 573.221 407.85 542.1C407.85 510.979 382.621 485.75 351.5 485.75C320.379 485.75 295.15 510.979 295.15 542.1C295.15 573.221 320.379 598.45 351.5 598.45Z" stroke="#00A703" stroke-width="14"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M225.32 405.413C178.921 405.866 186.79 400.62 161.827 480.845C141.491 544.944 143.706 537.954 143.6 542.45C143.525 545.943 146.345 548.713 149.888 548.95C157.257 548.205 154.158 549.747 179.705 470.413C273.054 568.888 238.032 552.919 288.269 554.919C354.294 554.286 359.66 558.356 360.444 548.678C360.354 545.392 358.816 543.432 313.503 442.586L317.845 430.648L332.768 430.376L332.225 417.895H276.602C271.688 424.618 278.592 424.588 303.464 430.105L299.123 442.315L188.147 442.586C195.623 416.478 191.403 418.106 225.048 418.166L225.32 405.413ZM184.94 455.969L293.532 455.776L262.148 540.108L184.94 455.969ZM306.625 460.975L275.819 541.841L343.207 542.034L306.625 460.975Z" fill="#00A703"/>
+</svg>
diff --git a/assets/themes/cyclenodes/route_marker.svg.license b/assets/themes/cyclenodes/route_marker.svg.license
new file mode 100644
index 000000000..234c11e02
--- /dev/null
+++ b/assets/themes/cyclenodes/route_marker.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Robin van der Linde; MarianSigler
+SPDX-License-Identifier: CC0-1.0
\ No newline at end of file
diff --git a/assets/themes/walkingnodes/license_info.json b/assets/themes/walkingnodes/license_info.json
new file mode 100644
index 000000000..ab0fef0f1
--- /dev/null
+++ b/assets/themes/walkingnodes/license_info.json
@@ -0,0 +1,20 @@
+[
+  {
+    "path": "logo.svg",
+    "license": "GPL-3.0-only",
+    "authors": [
+      "sebkur"
+    ],
+    "sources": [
+      "https://github.com/mobanisto/MapComplete/commit/1aeb1fdb5b09908d67907f3c816152bfebfdcc79"
+    ]
+  },
+  {
+    "path": "route_marker.svg",
+    "license": "CC0-1.0",
+    "authors": [
+      "Robin van der Linde"
+    ],
+    "sources": []
+  }
+]
\ No newline at end of file
diff --git a/assets/themes/walkingnodes/logo.svg b/assets/themes/walkingnodes/logo.svg
new file mode 100644
index 000000000..b68593076
--- /dev/null
+++ b/assets/themes/walkingnodes/logo.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="375px" height="375px" viewBox="0 0 375 375" version="1.1">
+  <defs>
+    <g>
+      <symbol overflow="visible" id="glyph0-0">
+        <path style="stroke:none;" d="M 9.484375 -65.171875 L 61.515625 -65.171875 L 61.515625 0 L 9.484375 0 Z M 13 -61.65625 L 13 -3.515625 L 58 -3.515625 L 58 -61.65625 Z M 13 -61.65625 "/>
+      </symbol>
+      <symbol overflow="visible" id="glyph0-1">
+        <path style="stroke:none;" d="M 4.765625 0 L 4.765625 -5.875 C 6.335938 -9.476562 8.253906 -12.660156 10.515625 -15.421875 C 12.785156 -18.179688 15.171875 -20.679688 17.671875 -22.921875 C 20.171875 -25.160156 22.644531 -27.234375 25.09375 -29.140625 C 27.539062 -31.054688 29.75 -32.96875 31.71875 -34.875 C 33.695312 -36.789062 35.296875 -38.796875 36.515625 -40.890625 C 37.734375 -42.984375 38.34375 -45.359375 38.34375 -48.015625 C 38.34375 -51.585938 37.296875 -54.359375 35.203125 -56.328125 C 33.109375 -58.304688 30.191406 -59.296875 26.453125 -59.296875 C 22.910156 -59.296875 19.988281 -58.332031 17.6875 -56.40625 C 15.394531 -54.476562 14.046875 -51.773438 13.640625 -48.296875 L 5.140625 -49.078125 C 5.753906 -54.285156 7.960938 -58.429688 11.765625 -61.515625 C 15.578125 -64.597656 20.472656 -66.140625 26.453125 -66.140625 C 33.023438 -66.140625 38.078125 -64.585938 41.609375 -61.484375 C 45.140625 -58.390625 46.90625 -53.992188 46.90625 -48.296875 C 46.90625 -45.765625 46.328125 -43.25 45.171875 -40.75 C 44.015625 -38.25 42.296875 -35.75 40.015625 -33.25 C 37.734375 -30.757812 33.367188 -26.890625 26.921875 -21.640625 C 23.378906 -18.742188 20.554688 -16.128906 18.453125 -13.796875 C 16.359375 -11.472656 14.847656 -9.234375 13.921875 -7.078125 L 47.921875 -7.078125 L 47.921875 0 Z M 4.765625 0 "/>
+      </symbol>
+      <symbol overflow="visible" id="glyph0-2">
+        <path style="stroke:none;" d="M 48.703125 -21.234375 C 48.703125 -14.359375 46.660156 -8.945312 42.578125 -5 C 38.492188 -1.050781 32.828125 0.921875 25.578125 0.921875 C 19.503906 0.921875 14.597656 -0.398438 10.859375 -3.046875 C 7.128906 -5.703125 4.773438 -9.546875 3.796875 -14.578125 L 12.21875 -15.546875 C 13.96875 -9.097656 18.484375 -5.875 25.765625 -5.875 C 30.234375 -5.875 33.734375 -7.222656 36.265625 -9.921875 C 38.796875 -12.617188 40.0625 -16.328125 40.0625 -21.046875 C 40.0625 -25.148438 38.785156 -28.460938 36.234375 -30.984375 C 33.691406 -33.515625 30.265625 -34.78125 25.953125 -34.78125 C 23.703125 -34.78125 21.601562 -34.425781 19.65625 -33.71875 C 17.71875 -33.007812 15.773438 -31.804688 13.828125 -30.109375 L 5.6875 -30.109375 L 7.859375 -65.171875 L 44.921875 -65.171875 L 44.921875 -58.09375 L 15.453125 -58.09375 L 14.203125 -37.421875 C 17.804688 -40.191406 22.289062 -41.578125 27.65625 -41.578125 C 34.070312 -41.578125 39.179688 -39.695312 42.984375 -35.9375 C 46.796875 -32.175781 48.703125 -27.273438 48.703125 -21.234375 Z M 48.703125 -21.234375 "/>
+      </symbol>
+    </g>
+  </defs>
+  <g id="surface1">
+    <path style=" stroke:none;fill-rule:nonzero;fill:rgb(66.666669%,66.666669%,66.666669%);fill-opacity:1;" d="M 171.210938 241.640625 L 203.789062 241.640625 L 203.789062 375 L 171.210938 375 Z M 171.210938 241.640625 "/>
+    <path style="fill:none;stroke-width:2.645833;stroke-linecap:round;stroke-linejoin:round;stroke:#452b29;stroke-opacity:1;stroke-miterlimit:4;" d="M 55.107742 115.305972 L 12.351349 115.478227 L 5.899374 106.073116 L 12.297606 96.628042 L 55.055376 96.455787 Z M 55.107742 115.305972 " transform="matrix(2.834646,0,0,2.834646,0.0000216266,0)"/>
+    <path style="fill:none;stroke-width:2.645833;stroke-linecap:round;stroke-linejoin:round;stroke:#452b29;stroke-opacity:1;stroke-miterlimit:4;" d="M 77.183915 96.628042 L 119.940307 96.455787 L 126.392282 105.860898 L 119.994051 115.305972 L 77.23628 115.478227 Z M 77.183915 96.628042 " transform="matrix(2.834646,0,0,2.834646,0.0000216266,0)"/>
+    <path style=" stroke:none;fill-rule:nonzero;fill:#452b29;fill-opacity:1;" d="M 97.707031 25.722656 L 277.292969 25.722656 C 287.296875 25.722656 295.40625 33.832031 295.40625 43.835938 L 295.40625 223.527344 C 295.40625 233.53125 287.296875 241.640625 277.292969 241.640625 L 97.707031 241.640625 C 87.703125 241.640625 79.59375 233.53125 79.59375 223.527344 L 79.59375 43.835938 C 79.59375 33.832031 87.703125 25.722656 97.707031 25.722656 Z M 97.707031 25.722656 "/>
+    <path style="fill:none;stroke-width:1.314561;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(94.509804%,94.509804%,94.509804%);stroke-opacity:1;stroke-miterlimit:4;" d="M 79.472401 210.601225 C 79.472401 220.491246 71.454946 228.508701 61.564925 228.508701 C 51.674905 228.508701 43.657449 220.491246 43.657449 210.601225 C 43.657449 200.71206 51.674905 192.694605 61.564925 192.694605 C 71.454946 192.694605 79.472401 200.71206 79.472401 210.601225 Z M 79.472401 210.601225 " transform="matrix(4.56426,0,0,4.56426,-93.49832,-827.55904)"/>
+    <g style="fill:rgb(100%,100%,100%);fill-opacity:1;">
+      <use xlink:href="#glyph0-1" x="135.285156" y="167.144332"/>
+      <use xlink:href="#glyph0-2" x="190.056275" y="167.144332"/>
+    </g>
+  </g>
+</svg>
diff --git a/assets/themes/walkingnodes/logo.svg.license b/assets/themes/walkingnodes/logo.svg.license
new file mode 100644
index 000000000..3176633b8
--- /dev/null
+++ b/assets/themes/walkingnodes/logo.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: sebkur
+SPDX-License-Identifier: GPL-3.0-only
\ No newline at end of file
diff --git a/assets/themes/walkingnodes/route_marker.svg b/assets/themes/walkingnodes/route_marker.svg
new file mode 100644
index 000000000..4679b9285
--- /dev/null
+++ b/assets/themes/walkingnodes/route_marker.svg
@@ -0,0 +1,6 @@
+<svg width="500" height="500" viewBox="0 0 500 500" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="500" height="500" rx="50" fill="#D9D9D9"/>
+<rect x="32.5" y="32.5" width="435" height="435" rx="42.5" stroke="#452B29" stroke-width="15"/>
+<circle cx="250" cy="250" r="172.5" stroke="#452B29" stroke-width="15"/>
+<path d="M125 235C116.716 235 110 241.716 110 250C110 258.284 116.716 265 125 265V235ZM385.607 260.607C391.464 254.749 391.464 245.251 385.607 239.393L290.147 143.934C284.289 138.076 274.792 138.076 268.934 143.934C263.076 149.792 263.076 159.289 268.934 165.147L353.787 250L268.934 334.853C263.076 340.711 263.076 350.208 268.934 356.066C274.792 361.924 284.289 361.924 290.147 356.066L385.607 260.607ZM125 265H375V235H125V265Z" fill="#452B29"/>
+</svg>
diff --git a/assets/themes/walkingnodes/route_marker.svg.license b/assets/themes/walkingnodes/route_marker.svg.license
new file mode 100644
index 000000000..75299f884
--- /dev/null
+++ b/assets/themes/walkingnodes/route_marker.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Robin van der Linde
+SPDX-License-Identifier: CC0-1.0
\ No newline at end of file
diff --git a/assets/themes/walkingnodes/walkingnodes.json b/assets/themes/walkingnodes/walkingnodes.json
new file mode 100644
index 000000000..b433bc3fa
--- /dev/null
+++ b/assets/themes/walkingnodes/walkingnodes.json
@@ -0,0 +1,262 @@
+{
+  "id": "walkingnodes",
+  "title": {
+    "en": "Walking Node Networks",
+    "nl": "Wandelknooppuntnetwerken"
+  },
+  "description": {
+    "en": "This map shows walking node networks and allows you to add new nodes easily",
+    "nl": "Deze kaart toont wandelknooppunten en laat je toe om eenvoudigweg nieuwe knooppunten toe te voegen"
+  },
+  "icon": "./assets/themes/walkingnodes/logo.svg",
+  "hideFromOverview": true,
+  "startLat": 51.755515,
+  "startLon": 14.327545,
+  "startZoom": 11,
+  "layers": [
+    {
+      "id": "node2node",
+      "name": {
+        "en": "Node to node links",
+        "de": "Knotenpunktverbindungen",
+        "es": "enlaces nodo a nodo",
+        "nl": "Verbindingen van node naar node",
+        "fr": "liens noeud à noeud",
+        "ca": "enllaços node a node",
+        "cs": "propojení mezi uzly",
+        "pl": "łącza węzeł do węzła"
+      },
+      "source": {
+        "osmTags": {
+          "and": [
+            "network=rwn",
+            "network:type=node_network",
+            "route=foot"
+          ]
+        }
+      },
+      "minzoom": 12,
+      "title": {
+        "render": {
+          "en": "Node to node link",
+          "de": "Knotenpunktverbindung",
+          "es": "enlace nodo a nodo",
+          "nl": "Node-naar-node verbinding",
+          "fr": "lien noeud à noeud",
+          "ca": "Enllaç node a node",
+          "cs": "propojení mezi uzly",
+          "pl": "połączenie węzła z węzłem"
+        },
+        "mappings": [
+          {
+            "if": "ref~*",
+            "then": {
+              "en": "node to node link <strong>{ref}</strong>",
+              "de": "Knotenpunktverbindung <strong>{ref}</strong>",
+              "es": "enlace nodo a nodo <strong>{ref}</strong>",
+              "nl": "node-naar-node verbinding <strong>{ref}</strong>",
+              "fr": "lien noeud à noeud <strong>{ref}</strong>",
+              "ca": "Enllaç node a node <strong>{ref}</strong>",
+              "cs": "propojení mezi uzly <strong>{ref}</strong>",
+              "pl": "połączenie węzła z węzłem <strong>{ref}</strong>"
+            }
+          }
+        ]
+      },
+      "mapRendering": [
+        {
+          "width": "4",
+          "color": "#452b29"
+        }
+      ],
+      "tagRenderings": [
+        {
+          "builtin": "survey_date",
+          "override": {
+            "question": {
+              "en": "When was this node to node link last surveyed?",
+              "de": "Wann wurde diese Knotenpunktverbindung zuletzt überprüft?",
+              "es": "¿Cuándo se sondeó este enlace nodo a nodo por última vez?",
+              "nl": "Wanneer werd deze node-naar-node verbinding het laast gesurveyed?",
+              "fr": "Quand cette liaison de nœud à nœud a-t-elle été contrôlée sur le terrain pour la dernière fois ?",
+              "ca": "Quan es va comprovar per última vegada aquest enllaç node a node presencialment?",
+              "cs": "Kdy bylo toto propojení mezi uzly naposledy zkontrolováno?",
+              "pl": "Kiedy ostatnio badano to połączenie węzła z węzłem?"
+            },
+            "render": {
+              "en": "This node to node link was last surveyed on {survey:date}",
+              "de": "Diese Knotenpunktverbindung wurde zuletzt am {survey:date} überprüft",
+              "es": "Este enlace nodo a nodo se sondeó por última vez el {survey:date}",
+              "nl": "Deze node-naar-node verbinding werd het laast gesurveyed op {survey:date}",
+              "fr": "Cette lien de nœud à nœud a été vérifié sur le terrain le {survey:date}",
+              "ca": "Aquest enllaç node a node es va sondejar per última vegada el {survey:date}",
+              "cs": "Toto propojení mezi uzly bylo naposledy zkontrolováno dne {survey:date}",
+              "pl": "To połączenie węzła z węzłem było ostatnio sprawdzane w dniu {survey:date}"
+            }
+          },
+          "id": "node2node-survey:date"
+        },
+        "export_as_gpx"
+      ]
+    },
+    {
+      "id": "node",
+      "name": {
+        "en": "Nodes",
+        "de": "Knotenpunkte",
+        "ca": "nodes",
+        "es": "nodos",
+        "nb_NO": "noder",
+        "nl": "Knooppunten",
+        "fr": "noeuds",
+        "pa_PK": "نوڈ",
+        "cs": "uzly",
+        "eu": "nodoak",
+        "pl": "węzły"
+      },
+      "source": {
+        "osmTags": {
+          "and": [
+            "rwn_ref~*"
+          ]
+        }
+      },
+      "mapRendering": [
+        {
+          "location": [
+            "point",
+            "centroid"
+          ],
+          "label": {
+            "mappings": [
+              {
+                "if": "rwn_ref~*",
+                "then": "<div style='position: absolute; top: -10px; right: -10px; color: white; background-color: #452b29; width: 20px; height: 20px; border-radius: 100%'>{rwn_ref}</div>"
+              },
+              {
+                "if": "rwn_ref=",
+                "then": "<div style='position: absolute; top: -10px; right: -10px; color: white; background-color: #452b29; width: 20px; height: 20px; border-radius: 100%'>?</div>"
+              }
+            ]
+          }
+        }
+      ],
+      "minzoom": 12,
+      "title": {
+        "render": {
+          "en": "Walking node <strong>{rwn_ref}</strong>",
+          "nl": "Wandelknooppunt <strong>{rwn_ref}</strong>"
+        }
+      },
+      "tagRenderings": [
+        {
+          "id": "node-rwn_ref",
+          "question": {
+            "en": "What is the reference number of this walking node?",
+            "nl": "Wat is het referentienummer van dit wandelknooppunt?"
+          },
+          "freeform": {
+            "key": "rwn_ref",
+            "type": "int",
+            "placeholder": {
+              "en": "e.g. 1",
+              "nl": "bijv. 1"
+            }
+          },
+          "render": {
+            "en": "This walking node has reference number {rwn_ref}",
+            "nl": "Dit wandelknooppunt heeft referentienummer {rwn_ref}"
+          }
+        },
+        {
+          "builtin": "survey_date",
+          "override": {
+            "question": {
+              "en": "When was this walking node last surveyed?",
+              "nl": "Wanneer is dit wandelknooppunt het laatst gesurveyed?"
+            },
+            "render": {
+              "en": "This walking node was last surveyed on {survey:date}",
+              "nl": "Dit wandelknooppunt werd het laatst gesurveyed op {survey:date}"
+            }
+          }
+        },
+        {
+          "question": {
+            "en": "How many other walking nodes does this node link to?",
+            "nl": "Met hoeveel andere wandelknooppunten heeft dit knooppunt een verbinding?"
+          },
+          "render": {
+            "en": "This node links to {expected_rwn_route_relations} other walking nodes.",
+            "nl": "Dit knooppunt verbindt met {expected_rwn_route_relations} andere wandelknooppunten."
+          },
+          "freeform": {
+            "key": "expected_rwn_route_relations",
+            "type": "int",
+            "placeholder": {
+              "en": "e.g. 3",
+              "nl": "bijv. 3"
+            }
+          },
+          "id": "node-expected_rwn_route_relations"
+        },
+        "images"
+      ],
+      "presets": [
+        {
+          "tags": [
+            "rwn_ref=?",
+            "network:type=node_network"
+          ],
+          "title": {
+            "en": "a walking node",
+            "nl": "een wandelknooppunt"
+          },
+          "snapToLayer": [
+            "cycleways_and_roads"
+          ]
+        }
+      ]
+    },
+    {
+      "builtin": [
+        "guidepost"
+      ],
+      "override": {
+        "minzoom": 16
+      }
+    },
+    {
+      "builtin": "route_marker",
+      "override": {
+        "minzoom": 16,
+        "mapRendering": [
+          {
+            "icon": "./assets/themes/walkingnodes/route_marker.svg"
+          }
+        ],
+        "presets": [
+          {
+            "tags": [
+              "tourism=information",
+              "information=route_marker",
+              "network:type=node_network",
+              "hiking=yes"
+            ],
+            "title": {
+              "en": "a route marker for a node to node link"
+            }
+          }
+        ]
+      }
+    },
+    {
+      "builtin": "cycleways_and_roads",
+      "override": {
+        "name": null,
+        "shownByDefault": false
+      }
+    }
+  ],
+  "credits": "Sebastian Kürten"
+}
\ No newline at end of file
diff --git a/src/Models/ThemeConfig/LayerConfig.ts b/src/Models/ThemeConfig/LayerConfig.ts
index 13e0b84ef..42feb0ebf 100644
--- a/src/Models/ThemeConfig/LayerConfig.ts
+++ b/src/Models/ThemeConfig/LayerConfig.ts
@@ -229,7 +229,11 @@ export default class LayerConfig extends WithContextLoader {
                 maxSnapDistance: undefined,
             }
             if (pr["preciseInput"] !== undefined) {
-                throw "Layer " + this.id + " still uses the old 'preciseInput'-field"
+                throw (
+                    "Layer " +
+                    this.id +
+                    " still uses the old 'preciseInput'-field. For snapping to layers, use 'snapToLayer' instead"
+                )
             }
             if (pr.snapToLayer !== undefined) {
                 let snapToLayers: string[]
@@ -520,7 +524,7 @@ export default class LayerConfig extends WithContextLoader {
             neededTags = this.source.osmTags["and"]
         }
 
-        let tableRows = Utils.NoNull(
+        const tableRows = Utils.NoNull(
             this.tagRenderings
                 .map((tr) => tr.FreeformValues())
                 .map((values) => {